Conflicts: app/javascript/styles/mastodon-light.scss config/themes.yml Removed config/themes.yml, took upstream's mastodon-light.scssmaster
Thibaut Girka
7 years ago
commit
11cc2e099a
File diff suppressed because one or more lines are too long
@ -0,0 +1,157 @@ |
||||
// Notes! |
||||
// Sass color functions, "darken" and "lighten" are automatically replaced. |
||||
|
||||
// Change the colors of button texts |
||||
.button { |
||||
color: $white; |
||||
|
||||
&.button-alternative-2 { |
||||
color: $white; |
||||
} |
||||
} |
||||
|
||||
// Change default background colors of columns |
||||
.column { |
||||
> .scrollable { |
||||
background: $white; |
||||
} |
||||
} |
||||
|
||||
.drawer__inner { |
||||
background: $ui-base-color; |
||||
} |
||||
|
||||
.drawer__inner__mastodon { |
||||
background: $ui-base-color url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 234.80078 31.757813" width="234.80078" height="31.757812"><path d="M19.599609 0c-1.05 0-2.10039.375-2.90039 1.125L0 16.925781v14.832031h234.80078V17.025391l-16.5-15.900391c-1.6-1.5-4.20078-1.5-5.80078 0l-13.80078 13.099609c-1.6 1.5-4.19883 1.5-5.79883 0L179.09961 1.125c-1.6-1.5-4.19883-1.5-5.79883 0L159.5 14.224609c-1.6 1.5-4.20078 1.5-5.80078 0L139.90039 1.125c-1.6-1.5-4.20078-1.5-5.80078 0l-13.79883 13.099609c-1.6 1.5-4.20078 1.5-5.80078 0L100.69922 1.125c-1.600001-1.5-4.198829-1.5-5.798829 0l-13.59961 13.099609c-1.6 1.5-4.200781 1.5-5.800781 0L61.699219 1.125c-1.6-1.5-4.198828-1.5-5.798828 0L42.099609 14.224609c-1.6 1.5-4.198828 1.5-5.798828 0L22.5 1.125C21.7.375 20.649609 0 19.599609 0z" fill="#{hex-color($white)}"/></svg>') no-repeat bottom / 100% auto; |
||||
} |
||||
|
||||
// Change the colors used in the dropdown menu |
||||
.dropdown-menu { |
||||
background: $ui-base-color; |
||||
} |
||||
|
||||
.dropdown-menu__arrow { |
||||
&.left { |
||||
border-left-color: $ui-base-color; |
||||
} |
||||
|
||||
&.top { |
||||
border-top-color: $ui-base-color; |
||||
} |
||||
|
||||
&.bottom { |
||||
border-bottom-color: $ui-base-color; |
||||
} |
||||
|
||||
&.right { |
||||
border-right-color: $ui-base-color; |
||||
} |
||||
} |
||||
|
||||
.dropdown-menu__item { |
||||
a { |
||||
background: $ui-base-color; |
||||
color: $ui-secondary-color; |
||||
} |
||||
} |
||||
|
||||
// Change the text colors on inverted background |
||||
.privacy-dropdown__option.active .privacy-dropdown__option__content, |
||||
.privacy-dropdown__option.active .privacy-dropdown__option__content strong, |
||||
.privacy-dropdown__option:hover .privacy-dropdown__option__content, |
||||
.privacy-dropdown__option:hover .privacy-dropdown__option__content strong, |
||||
.dropdown-menu__item a:active, |
||||
.dropdown-menu__item a:focus, |
||||
.dropdown-menu__item a:hover, |
||||
.actions-modal ul li:not(:empty) a.active, |
||||
.actions-modal ul li:not(:empty) a.active button, |
||||
.actions-modal ul li:not(:empty) a:active, |
||||
.actions-modal ul li:not(:empty) a:active button, |
||||
.actions-modal ul li:not(:empty) a:focus, |
||||
.actions-modal ul li:not(:empty) a:focus button, |
||||
.actions-modal ul li:not(:empty) a:hover, |
||||
.actions-modal ul li:not(:empty) a:hover button, |
||||
.admin-wrapper .sidebar ul ul a.selected, |
||||
.simple_form .block-button, |
||||
.simple_form .button, |
||||
.simple_form button { |
||||
color: $white; |
||||
} |
||||
|
||||
// Change the background colors of modals |
||||
.actions-modal, |
||||
.boost-modal, |
||||
.confirmation-modal, |
||||
.mute-modal, |
||||
.report-modal { |
||||
background: $ui-secondary-color; |
||||
} |
||||
|
||||
.boost-modal__action-bar, |
||||
.confirmation-modal__action-bar, |
||||
.mute-modal__action-bar { |
||||
background: darken($ui-secondary-color, 6%); |
||||
} |
||||
|
||||
.react-toggle-track { |
||||
background: $ui-base-color; |
||||
} |
||||
|
||||
// Change the default color used for the text in an empty column or on the error column |
||||
.empty-column-indicator, |
||||
.error-column { |
||||
color: $primary-text-color; |
||||
} |
||||
|
||||
// Change the default colors used on some parts of the profile pages |
||||
.activity-stream-tabs { |
||||
background: $account-background-color; |
||||
|
||||
a { |
||||
&.active { |
||||
color: $ui-primary-color; |
||||
} |
||||
} |
||||
} |
||||
|
||||
.activity-stream { |
||||
.entry { |
||||
background: $account-background-color; |
||||
} |
||||
|
||||
.status.light { |
||||
.status__content { |
||||
color: $primary-text-color; |
||||
} |
||||
|
||||
.display-name { |
||||
strong { |
||||
color: $primary-text-color; |
||||
} |
||||
} |
||||
} |
||||
} |
||||
|
||||
.accounts-grid { |
||||
.account-grid-card { |
||||
.controls { |
||||
.icon-button { |
||||
color: $ui-secondary-color; |
||||
} |
||||
} |
||||
|
||||
.name { |
||||
a { |
||||
color: $primary-text-color; |
||||
} |
||||
} |
||||
|
||||
.username { |
||||
color: $ui-secondary-color; |
||||
} |
||||
|
||||
.account__header__content { |
||||
color: $primary-text-color; |
||||
} |
||||
} |
||||
} |
||||
@ -0,0 +1,38 @@ |
||||
// Dependent colors |
||||
$black: #000000; |
||||
$white: #ffffff; |
||||
|
||||
$classic-base-color: #282c37; |
||||
$classic-primary-color: #9baec8; |
||||
$classic-secondary-color: #d9e1e8; |
||||
$classic-highlight-color: #2b90d9; |
||||
|
||||
// Differences |
||||
$base-overlay-background: $white; |
||||
|
||||
$ui-base-color: $classic-secondary-color !default; |
||||
$ui-base-lighter-color: #b0c0cf; |
||||
$ui-primary-color: #9bcbed; |
||||
$ui-secondary-color: $classic-base-color !default; |
||||
$ui-highlight-color: #2b5fd9; |
||||
|
||||
$primary-text-color: $black !default; |
||||
$darker-text-color: $classic-base-color !default; |
||||
$dark-text-color: #444b5d; |
||||
$action-button-color: #606984; |
||||
|
||||
$inverted-text-color: $black !default; |
||||
$lighter-text-color: $classic-base-color !default; |
||||
$light-text-color: #444b5d; |
||||
|
||||
//Newly added colors |
||||
$account-background-color: $white; |
||||
|
||||
//Invert darkened and lightened colors |
||||
@function darken($color, $amount) { |
||||
@return hsl(hue($color), saturation($color), lightness($color) + $amount); |
||||
} |
||||
|
||||
@function lighten($color, $amount) { |
||||
@return hsl(hue($color), saturation($color), lightness($color) - $amount); |
||||
} |
||||
Loading…
Reference in new issue