Merge branch 'asonix/changes' into asonix/downstream

app/javascript/styles/pop-light-wider.scss

@@ -0,0 +1,2 @@
+@import 'wide';
+@import 'pop-light';

app/javascript/styles/pop-light.scss

@@ -0,0 +1,55 @@
+// Commonly used web colors
+$black: #3b3633;            // Black
+$white: #fafafa;            // White
+
+$classic-base-color: #49423e;         // Midnight Express
+$classic-primary-color: #c9c7c5;      // Echo Blue
+$classic-secondary-color: #ebe9e8;    // Pattens Blue
+$classic-highlight-color: #48b9c7;    // Summer Sky
+
+// Differences
+$success-green: #3e935b;    // Padua
+
+$base-overlay-background: $white !default;
+$valid-value-color: $success-green !default;
+
+$ui-base-color: $classic-secondary-color !default;         // Midnight Express
+$ui-base-lighter-color: #ababab;
+$ui-primary-color: #9a938e;      // Echo Blue
+$ui-secondary-color: $classic-base-color !default;    // Pattens Blue
+$ui-highlight-color: #48b9c7;    // Summer Sky
+
+$primary-text-color: $black !default;
+$darker-text-color: $classic-base-color !default;
+$dark-text-color: #0c0c0c;
+$action-button-color: #635d58;
+
+$error-red: #a3360a;        // Cerise
+$warning-red: #f9dfb6;      // Sunset Orange
+$gold-star: #faa41a;        // Dark Goldenrod
+
+$inverted-text-color: $black !default;
+$lighter-text-color: $classic-base-color !default;
+$light-text-color: #444b5d;
+
+$base-shadow-color: #3b3633;
+$base-overlay-background: #3b3633;
+$base-border-color: #fafafa;
+$simple-background-color: #fafafa;
+$valid-value-color: #3e935b;
+$error-value-color: #a3360a;
+
+//Newly added colors
+$account-background-color: $white !default;
+
+//Invert darkened and lightened colors
+@function darken($color, $amount) {
+  @return hsl(hue($color), saturation($color), lightness($color) + $amount);
+}
+
+@function lighten($color, $amount) {
+  @return hsl(hue($color), saturation($color), lightness($color) - $amount);
+}
+
+@import 'application';
+@import 'mastodon-light/diff';

config/locales/dog.yml

@@ -813,6 +813,8 @@ dog:
     contrast-wider: High contrast (wider)
     pop: Pop
     pop-wider: Pop (wider)
+    pop-light: Pop (light)
+    pop-light-wider: Pop (light, wider)
     mastodon: Mastodon
     mastodon-wider: Mastodon (wider)
     mastodon-light: Mastodon (light)

config/locales/en.yml

@@ -813,6 +813,8 @@ en:
     contrast-wider: High contrast (wider)
     pop: Pop
     pop-wider: Pop (wider)
+    pop-light: Pop (light)
+    pop-light-wider: Pop (light, wider)
     mastodon: Mastodon
     mastodon-wider: Mastodon (wider)
     mastodon-light: Mastodon (light)

config/locales/lion.yml

@@ -812,6 +812,8 @@ lion:
     contrast-wider: High contrast (wider)
     pop: Pop
     pop-wider: Pop (wider)
+    pop-light: Pop (light)
+    pop-light-wider: Pop (light, wider)
     mastodon: Mastodon
     mastodon-wider: Mastodon (wider)
     mastodon-light: Mastodon (light)

config/locales/squeak.yml

@@ -811,8 +811,10 @@ squeak:
   themes:
     contrast: High contrast
     contrast-wider: High contrast (wider)
-    pop: Pop
-    pop-wider: Pop (wider)
+    pop: Inflate
+    pop-wider: Inflate (wider)
+    pop-light: Inflate (light)
+    pop-light-wider: Inflate (light, wider)
     mastodon: Mastodon
     mastodon-wider: Mastodon (wider)
     mastodon-light: Mastodon (light)

config/themes.yml

@@ -1,7 +1,9 @@
 contrast: styles/contrast.scss
 contrast-wider: styles/contrast-wider.scss
-pop-wider: styles/pop-wider.scss
 pop: styles/pop.scss
+pop-wider: styles/pop-wider.scss
+pop-light: styles/pop-light.scss
+pop-light-wider: styles/pop-light-wider.scss
 mastodon: styles/application.scss
 mastodon-wider: styles/mastodon-wider.scss
 mastodon-light: styles/mastodon-light.scss