Unverified Commit f8a2ac1c authored by Lyza Gardner's avatar Lyza Gardner Committed by GitHub

Fix text variable names per conventions (#2317)

Make text-color SASS variable names match conventions
parent c7d2ef4e
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
@include reset.reset-box-model; @include reset.reset-box-model;
@include reset.reset-font; @include reset.reset-font;
background: none; background: none;
color: var.$color-text-light; color: var.$color-text--light;
font-weight: bold; font-weight: bold;
font-family: var.$sans-font-family; font-family: var.$sans-font-family;
font-size: var.$annotator-bucket-bar-font-size; font-size: var.$annotator-bucket-bar-font-size;
......
...@@ -93,11 +93,11 @@ ...@@ -93,11 +93,11 @@
@mixin button--primary { @mixin button--primary {
@include button; @include button;
@include button--labeled; @include button--labeled;
color: var.$grey-1; color: var.$color-text--inverted;
background-color: var.$grey-mid; background-color: var.$grey-mid;
&:hover:not([disabled]) { &:hover:not([disabled]) {
color: var.$grey-1; color: var.$color-text--inverted;
background-color: var.$grey-6; background-color: var.$grey-6;
} }
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
@include focus-outline; @include focus-outline;
@include placeholder { @include placeholder {
color: var.$color-text-light; color: var.$color-text--light;
} }
} }
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
@include utils.border; @include utils.border;
border-radius: var.$border-radius; border-radius: var.$border-radius;
color: var.$color-text-light; color: var.$color-text--light;
background-color: var.$grey-0; background-color: var.$grey-0;
// Tighten up spacing around text in input // Tighten up spacing around text in input
line-height: 1; line-height: 1;
......
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
*/ */
@mixin quoted-text { @mixin quoted-text {
border-left: 3px solid var.$color-border; border-left: 3px solid var.$color-border;
color: var.$color-text-light; color: var.$color-text--light;
font-style: italic; font-style: italic;
padding: 0 var.$layout-space; padding: 0 var.$layout-space;
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
@include utils.border-right; @include utils.border-right;
flex: 1 1; flex: 1 1;
text-align: center; text-align: center;
color: var.$color-text-light; color: var.$color-text--light;
&:last-of-type { &:last-of-type {
border-right: none; border-right: none;
...@@ -162,7 +162,7 @@ ...@@ -162,7 +162,7 @@
} }
&__link { &__link {
color: var.$color-text-light; color: var.$color-text--light;
} }
&__icon { &__icon {
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
&__timestamp-edited { &__timestamp-edited {
@include utils.font--small; @include utils.font--small;
font-style: italic; font-style: italic;
color: var.$color-text-light; color: var.$color-text--light;
} }
&__timestamp-created-link { &__timestamp-created-link {
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
&__highlight-icon { &__highlight-icon {
@include utils.icon--small; @include utils.icon--small;
color: var.$color-text-light; color: var.$color-text--light;
// Pull the icon down a tad for better vertical alignment with other // Pull the icon down a tad for better vertical alignment with other
// items in the same layout row // items in the same layout row
margin-bottom: -1px; margin-bottom: -1px;
......
...@@ -65,6 +65,6 @@ ...@@ -65,6 +65,6 @@
// dropdown arrow which reveals the associated `Menu` when clicked // dropdown arrow which reveals the associated `Menu` when clicked
&__menu-label { &__menu-label {
padding: var.$layout-space--small; padding: var.$layout-space--small;
color: var.$color-text-inverted; color: var.$color-text--inverted;
} }
} }
...@@ -74,7 +74,7 @@ a.menu-item:hover { ...@@ -74,7 +74,7 @@ a.menu-item:hover {
} }
} }
&.is-disabled { &.is-disabled {
color: var.$color-text-light; color: var.$color-text--light;
} }
} }
.menu-item__icon { .menu-item__icon {
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
} }
.menu-section__heading { .menu-section__heading {
color: var.$color-text-light; color: var.$color-text--light;
line-height: 1; line-height: 1;
margin: 1px 1px 0; margin: 1px 1px 0;
margin-bottom: 10px; margin-bottom: 10px;
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
&:disabled { &:disabled {
background: none; background: none;
color: var.$color-text-light; color: var.$color-text--light;
} }
// Expand the search input when focused (triggered by clicking // Expand the search input when focused (triggered by clicking
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
@use "../../mixins/utils"; @use "../../mixins/utils";
.share-annotations-panel { .share-annotations-panel {
color: var.$color-text-light; color: var.$color-text--light;
&__intro { &__intro {
color: var.$color-text; color: var.$color-text;
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
&__link, &__link,
&__text { &__text {
text-decoration: none; text-decoration: none;
color: var.$color-text-light; color: var.$color-text--light;
} }
&__link { &__link {
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
} }
&__value { &__value {
color: var.$color-text-light; color: var.$color-text--light;
} }
@media only screen and (min-width: 20em) { @media only screen and (min-width: 20em) {
......
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
@include utils.font--medium; @include utils.font--medium;
border-left: 3px solid var.$grey-3; border-left: 3px solid var.$grey-3;
color: var.$color-text-light; color: var.$color-text--light;
font-family: sans-serif; font-family: sans-serif;
font-size: 12px; font-size: 12px;
font-style: italic; font-style: italic;
......
...@@ -80,5 +80,5 @@ ...@@ -80,5 +80,5 @@
// Use on elements for a de-emphasized, muted text color // Use on elements for a de-emphasized, muted text color
.u-color-text--muted { .u-color-text--muted {
color: var.$color-text-light; color: var.$color-text--light;
} }
...@@ -36,9 +36,9 @@ $grey-7: #202020; ...@@ -36,9 +36,9 @@ $grey-7: #202020;
// Text colors // Text colors
$color-text: $grey-7; $color-text: $grey-7;
$color-text-light: $grey-5; $color-text--light: $grey-5;
// Text color when used on a dark background // Text color when used on a dark background
$color-text-inverted: $grey-1; $color-text--inverted: $grey-1;
// Other colors // Other colors
$color-success: #00a36d; $color-success: #00a36d;
...@@ -92,10 +92,6 @@ $layout-space--medium: $layout-space; ...@@ -92,10 +92,6 @@ $layout-space--medium: $layout-space;
// This value originated from Apple's Human Interface Guidelines. // This value originated from Apple's Human Interface Guidelines.
$touch-target-size: 44px; $touch-target-size: 44px;
// Z-Index Scale
// -------------------------
$zindex-tooltip: 20;
// Other Variables // Other Variables
// ------------------------- // -------------------------
$bucket-bar-width: 22px; $bucket-bar-width: 22px;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment