random-mirrors
/
gab-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'styling/patch_fixes_for_theme_colors' into 'develop' 

More CSS fixes

See merge request gab/social/gab-social!2
This commit is contained in:
Rob Colbert 2019-07-03 18:26:20 +00:00
parent 7f3f321639 9842cc5557
commit 2f918b6101
3 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/javascript/styles/gabsocial-light/diff.scss
View File

@ -210,7 +210,7 @@
} }
.react-toggle.react-toggle--checked:hover:not(.react-toggle--disabled) .react-toggle-track { .react-toggle.react-toggle--checked:hover:not(.react-toggle--disabled) .react-toggle-track {
background: lighten($ui-highlight-color, 10%); background: lighten($gab-brand-default, 10%);
} }
// Change the default color used for the text in an empty column or on the error column // Change the default color used for the text in an empty column or on the error column
@ -278,13 +278,6 @@
} }
} }
.status__content,
.reply-indicator__content {
a {
color: $highlight-text-color;
}
}
.button.logo-button { .button.logo-button {
color: $white; color: $white;

25
app/javascript/styles/gabsocial/components.scss
View File

@ -377,7 +377,7 @@
} }
a { a {
color: $secondary-text-color; color: $gab-brand-default;
text-decoration: none; text-decoration: none;
&:hover { &:hover {
@ -439,12 +439,11 @@
display: block; display: block;
font-size: 15px; font-size: 15px;
line-height: 20px; line-height: 20px;
color: lighten($ui-highlight-color, 8%); color: $gab-brand-default;
border: 0; border: 0;
background: transparent; background: transparent;
padding: 0; padding: 0;
padding-top: 8px; padding-top: 8px;
&:hover, &:hover,
&:active { &:active {
text-decoration: underline; text-decoration: underline;
@ -1639,14 +1638,10 @@ a.account__display-name {
box-sizing: border-box; box-sizing: border-box;
left: -16px; left: -16px;
top: -14px; top: -14px;
@media screen and (max-width: $nav-breakpoint-1) {
left: 27px;
// @media screen and (max-width: 970px) { top: 0;
// left: 27px; }
// top: 0;
// }
min-width: 16px; min-width: 16px;
height: 16px; height: 16px;
padding: 1px 3px 0; padding: 1px 3px 0;
@ -1881,11 +1876,11 @@ a.account__display-name {
} }
.react-toggle--checked .react-toggle-track { .react-toggle--checked .react-toggle-track {
background-color: $ui-highlight-color; background-color: $gab-brand-default;
} }
.react-toggle--checked:hover:not(.react-toggle--disabled) .react-toggle-track { .react-toggle--checked:hover:not(.react-toggle--disabled) .react-toggle-track {
background-color: lighten($ui-highlight-color, 10%); background-color: lighten($gab-brand-default, 10%);
} }
.react-toggle-track-check { .react-toggle-track-check {
@ -1941,7 +1936,7 @@ a.account__display-name {
.react-toggle--checked .react-toggle-thumb { .react-toggle--checked .react-toggle-thumb {
left: 27px; left: 27px;
border-color: $ui-highlight-color; border-color: $gab-brand-default;
} }
.column-link { .column-link {
@ -2576,7 +2571,7 @@ a.status-card.compact:hover {
} }
.column-header__collapsible-inner { .column-header__collapsible-inner {
background: lighten($ui-base-color, 8%); background: #e6e6e6;
padding: 15px; padding: 15px;
} }

10
app/javascript/styles/gabsocial/variables.scss
View File

@ -7,27 +7,35 @@
// NOTE - will eventually create a systematic approach of setting color variables to easily change instance themes // NOTE - will eventually create a systematic approach of setting color variables to easily change instance themes
// STATIC COLORS // STATIC COLORS
$gab-brand-default: #21cf7a; $gab-brand-default: #21cf7a;
$gab-alert-red: #cc6643; $gab-alert-red: #cc6643;
$gab-secondary-text: #999; $gab-secondary-text: #999;
$gab-text-highlight: $gab-brand-default; $gab-text-highlight: $gab-brand-default;
// THEME COLORS // THEME COLORS
// default theme (dark) // default theme (dark)
$gab-background-base: #333; $gab-background-base: #333;
$gab-background-container: #222; $gab-background-container: #222;
$gab-placeholder-accent: #666; $gab-placeholder-accent: #666;
// light theme // light theme
$gab-background-base-light: #f2f3f6; $gab-background-base-light: #f2f3f6;
$gab-background-container-light: #fff; $gab-background-container-light: #fff;
$gab-default-text-light: #6c6c6c; $gab-default-text-light: #6c6c6c;
// THEME MIXINS
// theme mixins
@mixin light-theme-shadow() {box-shadow: 0 0 6px 0 rgba(0,0,0,0.1);} @mixin light-theme-shadow() {box-shadow: 0 0 6px 0 rgba(0,0,0,0.1);}
// BREAKPOINT SETS // BREAKPOINT SETS
// navigation breakpoints - by default show all elements and link names along with icons // navigation breakpoints - by default show all elements and link names along with icons
// turns navigation links into icon-only buttons // turns navigation links into icon-only buttons
$nav-breakpoint-1: 850px; $nav-breakpoint-1: 850px;
// search field hidden and replaced with search icon link // search field hidden and replaced with search icon link