From 58569e05b20303671a47dd94f38cfc907a279be8 Mon Sep 17 00:00:00 2001
From: Paul Kaplan <pkaplan@media.mit.edu>
Date: Wed, 16 Aug 2017 10:59:13 -0400
Subject: [PATCH] Update info font colors
---
src/components/forms/input.css | 1 +
src/components/library-item/library-item.css | 3 ++-
src/components/sound-editor/sound-editor.css | 2 +-
src/components/sprite-info/sprite-info.css | 2 +-
src/components/stage-selector/stage-selector.css | 10 +++++-----
src/css/colors.css | 2 ++
6 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/components/forms/input.css b/src/components/forms/input.css
index bd6959636..6d5eefa52 100644
--- a/src/components/forms/input.css
+++ b/src/components/forms/input.css
@@ -8,6 +8,7 @@
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 0.625rem;
font-weight: bold;
+ color: $text-primary;
border-width: 1px;
border-style: solid;
diff --git a/src/components/library-item/library-item.css b/src/components/library-item/library-item.css
index 12253a552..067b2c1af 100644
--- a/src/components/library-item/library-item.css
+++ b/src/components/library-item/library-item.css
@@ -1,3 +1,4 @@
+@import "../../css/colors.css";
@import "../../css/units.css";
.library-item {
@@ -11,7 +12,7 @@
margin: $space;
padding: 1rem 1rem 0 1rem;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
- color: #575e75;
+ color: $text-primary;
background: white;
border-width: 2px;
border-style: solid;
diff --git a/src/components/sound-editor/sound-editor.css b/src/components/sound-editor/sound-editor.css
index 0af2f011d..257c59d65 100644
--- a/src/components/sound-editor/sound-editor.css
+++ b/src/components/sound-editor/sound-editor.css
@@ -78,7 +78,7 @@ $border-radius: 0.25rem;
.effect-button {
flex-basis: 150px;
- color: #575e75; /* @todo discuss the multiple font colors with Carl, move to variable */
+ color: $text-primary;
}
.effect-button + .effect-button {
diff --git a/src/components/sprite-info/sprite-info.css b/src/components/sprite-info/sprite-info.css
index 27f243dbc..200aedaf7 100644
--- a/src/components/sprite-info/sprite-info.css
+++ b/src/components/sprite-info/sprite-info.css
@@ -6,7 +6,7 @@
padding: 0.75rem;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
background-color: white;
- color: #575e75;
+ color: $text-primary;
border-top-left-radius: $space;
border-top-right-radius: $space;
border-bottom: 1px solid #eaeaea;
diff --git a/src/components/stage-selector/stage-selector.css b/src/components/stage-selector/stage-selector.css
index 9d3149625..450580930 100644
--- a/src/components/stage-selector/stage-selector.css
+++ b/src/components/stage-selector/stage-selector.css
@@ -11,7 +11,7 @@ $header-height: calc($stage-menu-height - 2px);
flex-grow: 1;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
background-color: #f9f9f9;
- color: #575e75;
+ color: $text-primary;
border-top-left-radius: $space;
border-top-right-radius: $space;
border-color: #dbdbdb;
@@ -34,7 +34,7 @@ $header-height: calc($stage-menu-height - 2px);
justify-content: center;
height: $header-height;
background-color: white;
- color: #575e75;
+ color: $text-primary;
border-top-left-radius: $space;
border-top-right-radius: $space;
border-bottom: 1px solid #eaeaea;
@@ -44,7 +44,7 @@ $header-height: calc($stage-menu-height - 2px);
.header-title {
font-size: 0.625rem;
font-weight: bold;
- color: #575e75;
+ color: $text-primary;
/* @todo: make this a mixin for all UI text labels */
user-select: none;
@@ -53,7 +53,7 @@ $header-height: calc($stage-menu-height - 2px);
.count {
padding: 0.3rem 0.75rem;
font-size: 0.625rem;
- color: #575e75;
+ color: $text-primary;
background: white;
border: 1px solid #eaeaea;
border-radius: 0.25rem;
@@ -63,7 +63,7 @@ $header-height: calc($stage-menu-height - 2px);
.label {
margin: 0.75rem 0 0.25rem;
font-size: 0.6rem;
- color: #575e75;
+ color: $text-primary;
user-select: none;
}
diff --git a/src/css/colors.css b/src/css/colors.css
index bde9f339f..d1dd5690e 100644
--- a/src/css/colors.css
+++ b/src/css/colors.css
@@ -2,6 +2,8 @@ $ui-pane-border: #D9D9D9;
$ui-pane-gray: #F9F9F9;
$ui-background-blue: #e8edf1;
+$text-primary: #575e75;
+
$motion-primary: #4C97FF;
$motion-tertiary: #3373CC;
$motion-transparent: rgba(76, 151, 255, 0.25);
--
GitLab