moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace $highlight-text-color

This commit is contained in:
Alex Gleason 2020-05-30 21:48:37 -05:00
parent 56540932e1
commit 0491183877
No known key found for this signature in database
GPG Key ID: 7211D1F99744FBB7
12 changed files with 45 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/soapbox/reducers/theme.js
View File

@ -2,14 +2,21 @@ import {
SET_THEME, SET_THEME,
} from '../actions/theme'; } from '../actions/theme';
import { Map as ImmutableMap } from 'immutable'; import { Map as ImmutableMap } from 'immutable';
import { brightness, hue } from 'chromatism'; import { brightness, hue, convert } from 'chromatism';
const initialState = ImmutableMap(); const initialState = ImmutableMap();
const cssrgba = (color, a) => {
const { r, g, b } = convert(color).rgb;
return `rgba(${[r, g, b, a].join(',')})`;
};
const populate = themeData => { const populate = themeData => {
const { 'brand-color': brandColor } = themeData.toObject(); const { 'brand-color': brandColor } = themeData.toObject();
return ImmutableMap({ return ImmutableMap({
'nav-ui-highlight-color': brightness(10, hue(-3, brandColor).hex).hex, 'nav-ui-highlight-color': brightness(10, hue(-3, brandColor).hex).hex,
'brand-color-faint': cssrgba(brandColor, 0.1),
'highlight-text-color': brandColor,
}).merge(themeData); }).merge(themeData);
}; };

6
app/styles/soapbox/about.scss
View File

@ -32,7 +32,7 @@ $small-breakpoint: 960px;
} }
a { a {
color: $highlight-text-color; color: var(--highlight-text-color);
text-decoration: underline; text-decoration: underline;
} }
@ -50,7 +50,7 @@ $small-breakpoint: 960px;
color: $darker-text-color; color: $darker-text-color;
a { a {
color: $highlight-text-color; color: var(--highlight-text-color);
text-decoration: underline; text-decoration: underline;
} }
} }
@ -304,7 +304,7 @@ $small-breakpoint: 960px;
color: $darker-text-color; color: $darker-text-color;
a { a {
color: $highlight-text-color; color: var(--highlight-text-color);
text-decoration: underline; text-decoration: underline;
} }
} }

2
app/styles/soapbox/accounts.scss
View File

@ -261,7 +261,7 @@
} }
a { a {
color: $highlight-text-color; color: var(--highlight-text-color);
text-decoration: none; text-decoration: none;
&:hover, &:hover,

6
app/styles/soapbox/admin.scss
View File

@ -208,7 +208,7 @@ $content-width: 840px;
color: $gab-secondary-text; color: $gab-secondary-text;
a { a {
color: $highlight-text-color; color: var(--highlight-text-color);
} }
} }
@ -297,7 +297,7 @@ $content-width: 840px;
} }
&.selected { &.selected {
color: $highlight-text-color; color: var(--highlight-text-color);
border-bottom: 2px solid $ui-highlight-color; border-bottom: 2px solid $ui-highlight-color;
} }
} }
@ -401,7 +401,7 @@ $content-width: 840px;
font-size: 14px; font-size: 14px;
a { a {
color: $highlight-text-color; color: var(--highlight-text-color);
text-decoration: none; text-decoration: none;
&:hover { &:hover {

4
app/styles/soapbox/basics.scss
View File

@ -168,7 +168,7 @@ button {
color: $primary-text-color; color: $primary-text-color;
padding: 15px 20px; padding: 15px 20px;
font-size: 14px; font-size: 14px;
background-color: rgba($highlight-text-color, .1); background-color: var(--brand-color-faint);
margin: 5px 20px; margin: 5px 20px;
border-radius: 8px; border-radius: 8px;
@ -186,7 +186,7 @@ button {
} }
a { a {
color: $highlight-text-color; color: var(--highlight-text-color);
text-decoration: none; text-decoration: none;
&:hover { &:hover {

30
app/styles/soapbox/components.scss
View File

@ -139,7 +139,7 @@
} }
&.active { &.active {
color: $highlight-text-color; color: var(--highlight-text-color);
} }
&::-moz-focus-inner { &::-moz-focus-inner {
@ -166,7 +166,7 @@
} }
&.active { &.active {
color: $highlight-text-color; color: var(--highlight-text-color);
&.disabled { &.disabled {
color: lighten($highlight-text-color, 13%); color: lighten($highlight-text-color, 13%);
@ -212,7 +212,7 @@
} }
&.active { &.active {
color: $highlight-text-color; color: var(--highlight-text-color);
} }
&::-moz-focus-inner { &::-moz-focus-inner {
@ -573,7 +573,7 @@
color: $inverted-text-color; color: $inverted-text-color;
a { a {
color: $highlight-text-color; color: var(--highlight-text-color);
} }
a.status__content__spoiler-link { a.status__content__spoiler-link {
@ -1095,7 +1095,7 @@ a.account__display-name {
position: relative; position: relative;
.fa { .fa {
color: $highlight-text-color; color: var(--highlight-text-color);
} }
> span { > span {
@ -1769,7 +1769,7 @@ a.account__display-name {
.column-back-button { .column-back-button {
background: lighten($ui-base-color, 4%); background: lighten($ui-base-color, 4%);
color: $highlight-text-color; color: var(--highlight-text-color);
cursor: pointer; cursor: pointer;
flex: 0 0 auto; flex: 0 0 auto;
font-size: 16px; font-size: 16px;
@ -1790,7 +1790,7 @@ a.account__display-name {
background: lighten($ui-base-color, 4%); background: lighten($ui-base-color, 4%);
border: 0; border: 0;
font-family: inherit; font-family: inherit;
color: $highlight-text-color; color: var(--highlight-text-color);
cursor: pointer; cursor: pointer;
white-space: nowrap; white-space: nowrap;
font-size: 16px; font-size: 16px;
@ -2083,7 +2083,7 @@ a.account__display-name {
&:focus, &:focus,
&:active { &:active {
color: $primary-text-color; color: $primary-text-color;
border-bottom-color: $highlight-text-color; border-bottom-color: var(--highlight-text-color);
} }
@media screen and (max-width: 600px) { @media screen and (max-width: 600px) {
@ -2116,7 +2116,7 @@ a.account__display-name {
} }
.reduce-motion button.icon-button.active i.fa-retweet { .reduce-motion button.icon-button.active i.fa-retweet {
color: $highlight-text-color; color: var(--highlight-text-color);
} }
.status-card { .status-card {
@ -2441,7 +2441,7 @@ a.status-card.compact:hover {
&.active { &.active {
color: $primary-text-color; color: $primary-text-color;
border-radius: 10px; border-radius: 10px;
background-color: rgba($highlight-text-color, .1); background-color: var(--brand-color-faint);
} }
@media screen and (max-width: $nav-breakpoint-2) { @media screen and (max-width: $nav-breakpoint-2) {
@ -2459,14 +2459,14 @@ a.status-card.compact:hover {
} }
& > .column-header__back-button { & > .column-header__back-button {
color: $highlight-text-color; color: var(--highlight-text-color);
} }
&.active { &.active {
box-shadow: 0 1px 0 rgba($highlight-text-color, 0.3); box-shadow: 0 1px 0 rgba($highlight-text-color, 0.3);
.column-header__icon { .column-header__icon {
color: $highlight-text-color; color: var(--highlight-text-color);
text-shadow: 0 0 10px rgba($highlight-text-color, 0.4); text-shadow: 0 0 10px rgba($highlight-text-color, 0.4);
} }
} }
@ -2928,7 +2928,7 @@ a.status-card.compact:hover {
} }
a { a {
color: $highlight-text-color; color: var(--highlight-text-color);
text-decoration: none; text-decoration: none;
&:hover { &:hover {
@ -3407,7 +3407,7 @@ a.status-card.compact:hover {
.loading-bar { .loading-bar {
background-color: $highlight-text-color; background-color: var(--highlight-text-color);
height: 3px; height: 3px;
position: absolute; position: absolute;
top: 0; top: 0;
@ -4117,7 +4117,7 @@ noscript {
max-width: 400px; max-width: 400px;
a { a {
color: $highlight-text-color; color: var(--highlight-text-color);
text-decoration: underline; text-decoration: underline;
&:hover { &:hover {

6
app/styles/soapbox/components/compose-form.scss
View File

@ -6,7 +6,7 @@
padding-top: 0; padding-top: 0;
font-size: 14px; font-size: 14px;
font-weight: 500; font-weight: 500;
&.active {color: $highlight-text-color;} &.active {color: var(--highlight-text-color);}
input[type=checkbox] {display: none;} input[type=checkbox] {display: none;}
.checkbox { .checkbox {
@ -23,8 +23,8 @@
vertical-align: middle; vertical-align: middle;
&.active { &.active {
border-color: $highlight-text-color; border-color: var(--highlight-text-color);
background: $highlight-text-color; background: var(--highlight-text-color);
} }
} }
} }

4
app/styles/soapbox/components/modal.scss
View File

@ -169,7 +169,7 @@
} }
.media-modal__button--active { .media-modal__button--active {
background-color: $highlight-text-color; background-color: var(--highlight-text-color);
} }
.media-modal__close { .media-modal__close {
@ -435,7 +435,7 @@
overflow-x: hidden; overflow-x: hidden;
.status__content a { .status__content a {
color: $highlight-text-color; color: var(--highlight-text-color);
} }
.status__content, .status__content,

4
app/styles/soapbox/emoji_picker.scss
View File

@ -55,7 +55,7 @@
} }
.emoji-mart-anchor-selected { .emoji-mart-anchor-selected {
color: $highlight-text-color; color: var(--highlight-text-color);
&:hover { &:hover {
color: darken($highlight-text-color, 4%); color: darken($highlight-text-color, 4%);
@ -72,7 +72,7 @@
left: 0; left: 0;
width: 100%; width: 100%;
height: 4px; height: 4px;
background-color: $highlight-text-color; background-color: var(--highlight-text-color);
} }
.emoji-mart-anchors { .emoji-mart-anchors {

8
app/styles/soapbox/forms.scss
View File

@ -70,7 +70,7 @@ code {
} }
label a { label a {
color: $highlight-text-color; color: var(--highlight-text-color);
text-decoration: underline; text-decoration: underline;
&:hover, &:hover,
@ -98,7 +98,7 @@ code {
color: $gab-secondary-text; color: $gab-secondary-text;
a { a {
color: $highlight-text-color; color: var(--highlight-text-color);
} }
code { code {
@ -341,7 +341,7 @@ code {
&:active, &:active,
&:focus { &:focus {
border-color: $highlight-text-color; border-color: var(--highlight-text-color);
background: darken($ui-base-color, 8%); background: darken($ui-base-color, 8%);
} }
} }
@ -627,7 +627,7 @@ code {
} }
a { a {
color: $highlight-text-color; color: var(--highlight-text-color);
text-transform: uppercase; text-transform: uppercase;
text-decoration: none; text-decoration: none;
font-weight: 700; font-weight: 700;

2
app/styles/soapbox/polls.scss
View File

@ -57,7 +57,7 @@
padding: 6px 10px; padding: 6px 10px;
&:focus { &:focus {
border-color: $highlight-text-color; border-color: var(--highlight-text-color);
} }
} }

2
app/styles/soapbox/tables.scss
View File

@ -31,7 +31,7 @@
} }
a { a {
color: $highlight-text-color; color: var(--highlight-text-color);
text-decoration: underline; text-decoration: underline;
&:hover { &:hover {