From f3f647961e0115752ad241b08edb398772238e92 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sun, 31 May 2020 21:16:32 -0500 Subject: [PATCH] --primary-color-faint -> --primary-text-color-faint --- app/styles/soapbox-light/diff.scss | 8 +-- app/styles/soapbox/_mixins.scss | 4 +- app/styles/soapbox/about.scss | 20 ++++---- app/styles/soapbox/accounts.scss | 8 +-- app/styles/soapbox/basics.scss | 2 +- app/styles/soapbox/compact_header.scss | 2 +- app/styles/soapbox/components.scss | 50 +++++++++---------- .../soapbox/components/account-header.scss | 2 +- .../soapbox/components/compose-form.scss | 10 ++-- app/styles/soapbox/components/group-card.scss | 2 +- app/styles/soapbox/components/group-form.scss | 2 +- .../components/group-sidebar-panel.scss | 2 +- app/styles/soapbox/components/modal.scss | 6 +-- app/styles/soapbox/components/user-panel.scss | 4 +- app/styles/soapbox/containers.scss | 10 ++-- app/styles/soapbox/dashboard.scss | 2 +- app/styles/soapbox/footer.scss | 2 +- app/styles/soapbox/forms.scss | 14 +++--- app/styles/soapbox/introduction.scss | 2 +- app/styles/soapbox/tables.scss | 2 +- app/styles/soapbox/widgets.scss | 22 ++++---- 21 files changed, 88 insertions(+), 88 deletions(-) diff --git a/app/styles/soapbox-light/diff.scss b/app/styles/soapbox-light/diff.scss index ecfd000bd..eac696bf8 100644 --- a/app/styles/soapbox-light/diff.scss +++ b/app/styles/soapbox-light/diff.scss @@ -87,7 +87,7 @@ // .dropdown-menu { // &__item { // a { -// color: var(--primary-color-faint); +// color: var(--primary-text-color-faint); // } // } // } @@ -219,7 +219,7 @@ // } // // .username { -// color: var(--primary-color-faint); +// color: var(--primary-text-color-faint); // } // // .account__header__content { @@ -251,7 +251,7 @@ // // .simple_form select, // .admin select.dropdown { -// border-color: var(--primary-color-faint); +// border-color: var(--primary-text-color-faint); // } // // .button.logo-button { @@ -342,7 +342,7 @@ // &.standard { // @include input-placeholder($gab-secondary-text); // color: $gab-placeholder-accent; -// border-color: var(--primary-color-faint); +// border-color: var(--primary-text-color-faint); // background: $gab-background-base-light; // } // } diff --git a/app/styles/soapbox/_mixins.scss b/app/styles/soapbox/_mixins.scss index aceaae121..ea2e30969 100644 --- a/app/styles/soapbox/_mixins.scss +++ b/app/styles/soapbox/_mixins.scss @@ -42,7 +42,7 @@ border: 1px $gab-placeholder-accent solid; box-shadow: none; font-family: inherit; - background: $nav-ui-search-bg-color; + background: var(--background-color); color: var(--highlight-text-color); margin: 0; border-radius: 4px; @@ -72,7 +72,7 @@ border: 1px solid $gab-placeholder-accent; padding: 8px 10px 17px; margin: 4px 0 0; - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.5); h4 { diff --git a/app/styles/soapbox/about.scss b/app/styles/soapbox/about.scss index e24368a53..7e6c3d21b 100644 --- a/app/styles/soapbox/about.scss +++ b/app/styles/soapbox/about.scss @@ -21,7 +21,7 @@ $small-breakpoint: 960px; font-weight: 400; font-size: 16px; line-height: 30px; - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); max-width: 600px; padding: 15px 30px; @@ -47,7 +47,7 @@ $small-breakpoint: 960px; font-weight: 400; font-size: 16px; line-height: 30px; - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); a { color: var(--highlight-text-color); @@ -232,7 +232,7 @@ $small-breakpoint: 960px; font-size: 14px; line-height: 24px; font-weight: 500; - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); padding-bottom: 5px; margin-bottom: 15px; border-bottom: 1px solid var(--brand-color-faint); @@ -286,7 +286,7 @@ $small-breakpoint: 960px; .username { display: block; - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); } } } @@ -301,7 +301,7 @@ $small-breakpoint: 960px; font-size: 16px; line-height: 30px; margin-bottom: 12px; - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); a { color: var(--highlight-text-color); @@ -590,7 +590,7 @@ $small-breakpoint: 960px; margin-bottom: 0; small { - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); span { color: var(--primary-text-color-faint); @@ -812,7 +812,7 @@ $small-breakpoint: 960px; text-transform: uppercase; font-weight: 700; font-size: 13px; - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); } &__text { @@ -859,18 +859,18 @@ $small-breakpoint: 960px; span { font-size: 14px; - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); } } } .simple_form .user_agreement .label_input > label { font-weight: 400; - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); } .simple_form p.lead { - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); font-size: 15px; line-height: 20px; font-weight: 400; diff --git a/app/styles/soapbox/accounts.scss b/app/styles/soapbox/accounts.scss index b7d130979..75d4ae122 100644 --- a/app/styles/soapbox/accounts.scss +++ b/app/styles/soapbox/accounts.scss @@ -87,7 +87,7 @@ span { display: block; font-size: 14px; - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); font-weight: 400; overflow: hidden; text-overflow: ellipsis; @@ -175,7 +175,7 @@ .nothing-here { background: var(--brand-color-med); box-shadow: 0 0 15px rgba($base-shadow-color, 0.2); - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); font-size: 14px; font-weight: 500; text-align: center; @@ -257,7 +257,7 @@ dd { flex: 1 1 auto; - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); } a { @@ -296,7 +296,7 @@ .pending-account { &__header { - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); a { color: $ui-secondary-color; diff --git a/app/styles/soapbox/basics.scss b/app/styles/soapbox/basics.scss index 454b35d79..a012f6622 100644 --- a/app/styles/soapbox/basics.scss +++ b/app/styles/soapbox/basics.scss @@ -95,7 +95,7 @@ body { &.error { position: absolute; text-align: center; - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); background: var(--brand-color-med); width: 100%; height: 100%; diff --git a/app/styles/soapbox/compact_header.scss b/app/styles/soapbox/compact_header.scss index 5357ced5c..71d5f9eb9 100644 --- a/app/styles/soapbox/compact_header.scss +++ b/app/styles/soapbox/compact_header.scss @@ -2,7 +2,7 @@ h1 { font-size: 24px; line-height: 28px; - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); font-weight: 500; margin-bottom: 20px; padding: 0 10px; diff --git a/app/styles/soapbox/components.scss b/app/styles/soapbox/components.scss index 4685e4cd4..811464208 100644 --- a/app/styles/soapbox/components.scss +++ b/app/styles/soapbox/components.scss @@ -89,7 +89,7 @@ } &.button-secondary { - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); background: transparent; padding: 3px 15px; border: 1px solid $ui-primary-color; @@ -121,7 +121,7 @@ .icon-button { display: inline-block; padding: 0; - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); border: 0; background: transparent; cursor: pointer; @@ -158,7 +158,7 @@ } &.inverted { - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); &:hover, &:active, @@ -193,7 +193,7 @@ } .text-icon-button { - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); border: 0; background: transparent; cursor: pointer; @@ -598,7 +598,7 @@ &__meta { font-size: 14px; - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); a { color: var(--brand-color); @@ -786,7 +786,7 @@ .account__display-name { flex: 1 1 auto; display: block; - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); overflow: hidden; text-decoration: none; font-size: 14px; @@ -862,7 +862,7 @@ a .account__avatar { .account__reciprocal_follow_message { padding: 0 5px; - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); text-align: center; } @@ -948,7 +948,7 @@ a .account__avatar { display: block; text-transform: uppercase; font-size: 11px; - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); } strong { @@ -1098,7 +1098,7 @@ a.account__display-name { margin: 0 10px 0 68px; padding: 8px 0 0; cursor: default; - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); font-size: 15px; line-height: 22px; position: relative; @@ -1223,7 +1223,7 @@ a.account__display-name { align-items: center; flex-shrink: 0; cursor: default; - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); strong { color: var(--primary-text-color-faint); @@ -1392,7 +1392,7 @@ a.account__display-name { display: block; flex: 1 1 auto; padding: 15px 5px 13px; - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); text-decoration: none; text-align: center; font-size: 16px; @@ -2078,7 +2078,7 @@ a.account__display-name { } .setting-text { - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); background: transparent; border: 0; border-bottom: 2px solid $ui-primary-color; @@ -2212,7 +2212,7 @@ a.status-card { display: block; font-weight: 500; margin-bottom: 5px; - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); overflow: hidden; text-overflow: ellipsis; white-space: nowrap; @@ -2226,7 +2226,7 @@ a.status-card { } .status-card__description { - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); } .status-card__host { @@ -2502,11 +2502,11 @@ a.status-card.compact:hover { border: 0; padding: 0 15px; font-size: 16px; - color: #fff; + color: var(--primary-text-color); background: transparent; &:hover { - color: lighten($darker-text-color, 7%); + color: var(--primary-text-color-faint); } &.active { @@ -2524,7 +2524,7 @@ a.status-card.compact:hover { max-height: 70vh; overflow: hidden; overflow-y: auto; - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); transition: max-height 150ms ease-in-out, opacity 300ms linear; opacity: 1; @@ -2561,7 +2561,7 @@ a.status-card.compact:hover { } &:hover { - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); text-decoration: underline; } } @@ -2694,7 +2694,7 @@ a.status-card.compact:hover { .media-spoiler { background: var(--background-color); - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); border: 0; padding: 0; width: 100%; @@ -2793,7 +2793,7 @@ a.status-card.compact:hover { } .column-settings__section { - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); cursor: default; display: block; font-weight: 500; @@ -2837,7 +2837,7 @@ a.status-card.compact:hover { &__multi-value__label, &__input { - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); } &__clear-indicator, @@ -2910,7 +2910,7 @@ a.status-card.compact:hover { } .setting-toggle__label { - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); display: inline-block; margin-bottom: 14px; margin-left: 8px; @@ -3778,7 +3778,7 @@ a.status-card.compact:hover { z-index: 4; border: 0; background: var(--background-color); - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); transition: none; pointer-events: none; @@ -4533,7 +4533,7 @@ noscript { } .account__header__content { - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); font-size: 14px; font-weight: 400; overflow: hidden; @@ -4597,7 +4597,7 @@ noscript { } a { - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); text-decoration: none; font-size: 14px; font-weight: 500; diff --git a/app/styles/soapbox/components/account-header.scss b/app/styles/soapbox/components/account-header.scss index c0702b301..d5b081ad3 100644 --- a/app/styles/soapbox/components/account-header.scss +++ b/app/styles/soapbox/components/account-header.scss @@ -115,7 +115,7 @@ &__links { display: flex; font-size: 14px; - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); @media screen and (max-width: 895px) { justify-content: center; flex-wrap: wrap; diff --git a/app/styles/soapbox/components/compose-form.scss b/app/styles/soapbox/components/compose-form.scss index 05e43be4f..f97dadc50 100644 --- a/app/styles/soapbox/components/compose-form.scss +++ b/app/styles/soapbox/components/compose-form.scss @@ -219,7 +219,7 @@ .icon-button { flex: 0 1 auto; - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); font-size: 14px; font-weight: 500; padding: 10px; @@ -250,8 +250,8 @@ background: rgba(0, 0, 0, 0.3); box-sizing: border-box; background: transparent; - color: var(--primary-color-faint); - border: 1px solid var(--primary-color-faint); + color: var(--primary-text-color-faint); + border: 1px solid var(--primary-text-color-faint); outline: none; padding: 10px; margin: 0; @@ -263,7 +263,7 @@ &:focus {color: #fff;} &::placeholder { - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); } } &.active {opacity: 1;} @@ -314,7 +314,7 @@ font-family: $font-sans-serif, sans-serif; font-size: 14px; font-weight: 600; - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); &.character-counter--over {color: $warning-red;} } } diff --git a/app/styles/soapbox/components/group-card.scss b/app/styles/soapbox/components/group-card.scss index a846da2f6..fb4cad7c1 100644 --- a/app/styles/soapbox/components/group-card.scss +++ b/app/styles/soapbox/components/group-card.scss @@ -53,7 +53,7 @@ } .group-card__meta { - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); font-size: 14px; margin-top: 5px; margin-bottom: 10px; diff --git a/app/styles/soapbox/components/group-form.scss b/app/styles/soapbox/components/group-form.scss index 41fce791d..9bfe325d4 100644 --- a/app/styles/soapbox/components/group-form.scss +++ b/app/styles/soapbox/components/group-form.scss @@ -31,7 +31,7 @@ float: left; height: 20px; padding: 3px 0 0 33px; - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); background-repeat: no-repeat; background-image: url('../images/sprite-post-functions.png'); background-size: 100px 1200px; diff --git a/app/styles/soapbox/components/group-sidebar-panel.scss b/app/styles/soapbox/components/group-sidebar-panel.scss index e8d84d8cd..aee27a8e1 100644 --- a/app/styles/soapbox/components/group-sidebar-panel.scss +++ b/app/styles/soapbox/components/group-sidebar-panel.scss @@ -23,7 +23,7 @@ &__meta { font-size: 0.8em; - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); &__unread { color: var(--brand-color); diff --git a/app/styles/soapbox/components/modal.scss b/app/styles/soapbox/components/modal.scss index 9d48af78d..f8dbb43cd 100644 --- a/app/styles/soapbox/components/modal.scss +++ b/app/styles/soapbox/components/modal.scss @@ -316,7 +316,7 @@ max-width: 90vw; border-radius: 4px; border: 1px solid $gab-placeholder-accent; - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); background: $gab-background-container; .status__display-name { @@ -440,7 +440,7 @@ .status__content, .status__content p { - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); } @media screen and (max-width: 480px) { @@ -532,7 +532,7 @@ align-items: center; padding: 13px 10px 12px; @inclide font-size(14); - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); text-decoration: none; &, diff --git a/app/styles/soapbox/components/user-panel.scss b/app/styles/soapbox/components/user-panel.scss index 80edc0ab9..6ec6aefda 100644 --- a/app/styles/soapbox/components/user-panel.scss +++ b/app/styles/soapbox/components/user-panel.scss @@ -64,7 +64,7 @@ display: block; font-size: 14px; line-height: 16px; - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); text-decoration: none !important; } } @@ -103,7 +103,7 @@ &__label { display: block; width: 100%; - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); font-size: 12px; line-height: 14px; } diff --git a/app/styles/soapbox/containers.scss b/app/styles/soapbox/containers.scss index 410b2b3cd..135f06635 100644 --- a/app/styles/soapbox/containers.scss +++ b/app/styles/soapbox/containers.scss @@ -612,7 +612,7 @@ text-shadow: none; small { - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); } } } @@ -640,7 +640,7 @@ width: 33.3%; box-sizing: border-box; flex: 0 0 auto; - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); padding: 10px; border-right: 1px solid var(--brand-color-faint); cursor: default; @@ -737,11 +737,11 @@ &__links { margin-top: -15px; font-size: 14px; - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); a { display: inline-block; - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); text-decoration: none; padding: 15px; font-weight: 500; @@ -812,7 +812,7 @@ .roles { padding: 20px; font-size: 14px; - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); } .roles { diff --git a/app/styles/soapbox/dashboard.scss b/app/styles/soapbox/dashboard.scss index 5da8419cf..51b9810e2 100644 --- a/app/styles/soapbox/dashboard.scss +++ b/app/styles/soapbox/dashboard.scss @@ -48,7 +48,7 @@ &__label { font-size: 14px; - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); text-align: center; font-weight: 500; } diff --git a/app/styles/soapbox/footer.scss b/app/styles/soapbox/footer.scss index e1695bcdf..29e6f32db 100644 --- a/app/styles/soapbox/footer.scss +++ b/app/styles/soapbox/footer.scss @@ -34,7 +34,7 @@ text-transform: uppercase; font-weight: 700; margin-bottom: 8px; - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); font-size: 1.6rem; line-height: 1.5; diff --git a/app/styles/soapbox/forms.scss b/app/styles/soapbox/forms.scss index e7dd7dee6..5a84ec2cb 100644 --- a/app/styles/soapbox/forms.scss +++ b/app/styles/soapbox/forms.scss @@ -95,7 +95,7 @@ code { } .hint { - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); a { color: var(--highlight-text-color); @@ -116,7 +116,7 @@ code { p.hint { margin-bottom: 15px; - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); &.subtle-hint { text-align: center; @@ -519,7 +519,7 @@ code { .flash-message { background: var(--brand-color-med); - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); border-radius: 4px; padding: 15px 10px; margin-bottom: 30px; @@ -539,7 +539,7 @@ code { a { display: inline-block; - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); text-decoration: none; &:hover { @@ -600,7 +600,7 @@ code { text-align: center; a { - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); text-decoration: none; &:hover { @@ -636,7 +636,7 @@ code { .oauth-prompt, .follow-prompt { margin-bottom: 30px; - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); h2 { font-size: 16px; @@ -767,7 +767,7 @@ code { .post-follow-actions { text-align: center; - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); div { margin-bottom: 4px; diff --git a/app/styles/soapbox/introduction.scss b/app/styles/soapbox/introduction.scss index aad322e60..dd9b46101 100644 --- a/app/styles/soapbox/introduction.scss +++ b/app/styles/soapbox/introduction.scss @@ -92,7 +92,7 @@ font-size: 16px; line-height: 24px; font-weight: 400; - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); code { display: inline-block; diff --git a/app/styles/soapbox/tables.scss b/app/styles/soapbox/tables.scss index f498cfec2..d0036a81d 100644 --- a/app/styles/soapbox/tables.scss +++ b/app/styles/soapbox/tables.scss @@ -109,7 +109,7 @@ a.table-action-link { display: inline-block; margin-right: 5px; padding: 0 10px; - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); font-weight: 500; &:hover { diff --git a/app/styles/soapbox/widgets.scss b/app/styles/soapbox/widgets.scss index c51a8cca2..df236d003 100644 --- a/app/styles/soapbox/widgets.scss +++ b/app/styles/soapbox/widgets.scss @@ -24,7 +24,7 @@ padding: 20px; border-radius: 0 0 4px 4px; font-size: 15px; - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); line-height: 20px; word-wrap: break-word; font-weight: 400; @@ -79,7 +79,7 @@ text-transform: uppercase; font-weight: 700; font-size: 13px; - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); } .account { @@ -121,7 +121,7 @@ .contact-widget { font-size: 15px; - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); line-height: 20px; word-wrap: break-word; font-weight: 400; @@ -197,7 +197,7 @@ .fa { margin-right: 5px; - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); } } @@ -224,7 +224,7 @@ background: $base-shadow-color; box-shadow: 0 0 15px rgba($base-shadow-color, 0.2); font-size: 14px; - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); margin-bottom: 10px; } @@ -246,7 +246,7 @@ p { font-size: 15px; - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); } @media screen and (max-width: $no-gap-breakpoint) { @@ -309,7 +309,7 @@ text-overflow: ellipsis; .fa { - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); } small { @@ -317,7 +317,7 @@ font-weight: 400; font-size: 15px; margin-top: 8px; - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); } } @@ -383,7 +383,7 @@ thead th { text-align: center; text-transform: uppercase; - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); font-weight: 700; padding: 10px; @@ -411,7 +411,7 @@ small { display: block; - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); font-weight: 400; font-size: 14px; } @@ -508,7 +508,7 @@ $fluid-breakpoint: $maximum-width + 20px; .notice-widget { margin-bottom: 10px; - color: var(--primary-color-faint); + color: var(--primary-text-color-faint); p { margin-bottom: 10px;