about summary refs log tree commit diff
path: root/app/javascript/styles/basics.scss
diff options
context:
space:
mode:
authorMatt Jankowski <mjankowski@thoughtbot.com>2017-05-08 09:57:49 -0400
committerEugen Rochko <eugen@zeonfederated.com>2017-05-08 15:57:49 +0200
commitb85dec2b976e0bea9f7a3ede832f3c8e16c8e2ef (patch)
treec33e5e6ba9e9badf164d721e048925db0eb66127 /app/javascript/styles/basics.scss
parentcbd673601c5f762d71f65404c3b7ad5b3751ee8c (diff)
Improve scss color variables (#2912)
- Updates scss variables file to use better-named variables for black/white/etc
- Arranges the "mastodon classic" colors into variables
- Remove all references to `$color-*` naming, replacing with new

This does not in itself introduce "theme" support, but:

- It would probably be easier to start working on theme support after this
  change and others
- Even without the goal of themes, these changes make it more clear how the
  colors are being used.

There is almost definitely some edge case in here where I've guessed the
intent/context of some color usage incorrectly, but it still seems like a net
improvement.
Diffstat (limited to 'app/javascript/styles/basics.scss')
-rw-r--r--app/javascript/styles/basics.scss8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/javascript/styles/basics.scss b/app/javascript/styles/basics.scss
index e49c2214a..08121f03e 100644
--- a/app/javascript/styles/basics.scss
+++ b/app/javascript/styles/basics.scss
@@ -1,12 +1,12 @@
 body {
   font-family: 'mastodon-font-sans-serif', sans-serif;
-  background: $color1 url('../images/background-photo.jpg');
+  background: $ui-base-color url('../images/background-photo.jpg');
   background-size: cover;
   background-attachment: fixed;
   font-size: 13px;
   line-height: 18px;
   font-weight: 400;
-  color: $color5;
+  color: $primary-text-color;
   padding-bottom: 140px;
   text-rendering: optimizelegibility;
   font-feature-settings: "kern";
@@ -17,7 +17,7 @@ body {
     width: 100%;
     height: 100%;
     padding: 0;
-    background: $color1;
+    background: $ui-base-color;
   }
 
   &.embed {
@@ -33,7 +33,7 @@ body {
   }
 
   &.admin {
-    background: darken($color1, 4%);
+    background: darken($ui-base-color, 4%);
     position: fixed;
     width: 100%;
     height: 100%;