tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Glitch] Add color variables of texts for better accesibility

Browse Source 
Port 74dae9458d and related to glitch-soc
This commit is contained in:
Thibaut Girka
2018-05-05 17:58:46 +02:00
parent 390cfdef2e
commit b3a236637e
27 changed files with 293 additions and 328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
app/javascript/flavours/glitch/styles/components/accounts.scss
View File

@ -7,7 +7,7 @@
.account__display-name {
flex: 1 1 auto;
display: block;
color: $ui-primary-color;
color: $darker-text-color;
overflow: hidden;
text-decoration: none;
font-size: 14px;
@ -102,7 +102,7 @@
}
.account__header__username {
color: $ui-primary-color;
color: $secondary-text-color;
}
}
@ -112,7 +112,7 @@
}
.account__header__content {
color: $ui-secondary-color;
color: $secondary-text-color;
}
.account__header__display-name {
@ -127,7 +127,7 @@
}
.account__header__username {
color: $ui-highlight-color;
color: $highlight-text-color;
font-size: 14px;
font-weight: 400;
display: block;
@ -140,7 +140,7 @@
.account__disclaimer {
padding: 10px;
border-top: 1px solid lighten($ui-base-color, 8%);
color: $ui-base-lighter-color;
color: $dark-text-color;
strong {
font-weight: 500;
@ -166,7 +166,7 @@
}
.account__header__content {
color: $ui-primary-color;
color: $darker-text-color;
font-size: 14px;
font-weight: 400;
overflow: hidden;
@ -243,7 +243,7 @@
display: block;
text-transform: uppercase;
font-size: 11px;
color: $ui-primary-color;
color: $darker-text-color;
}
strong {
@ -260,7 +260,7 @@
}
abbr {
color: $ui-base-lighter-color;
color: $highlight-text-color;
}
}
@ -292,12 +292,12 @@
margin-left: 42px;
padding: 8px 0 0 26px;
cursor: default;
color: $ui-primary-color;
color: $darker-text-color;
font-size: 15px;
position: relative;
.fa {
color: $ui-highlight-color;
color: $highlight-text-color;
}
> span {
@ -328,7 +328,7 @@
}
.column-settings__section {
color: $ui-primary-color;
color: $darker-text-color;
cursor: default;
display: block;
font-weight: 500;
@ -439,7 +439,7 @@
a {
display: block;
flex: 1 1 auto;
color: $ui-primary-color;
color: $darker-text-color;
padding: 15px 0;
font-size: 14px;
font-weight: 500;
@ -448,7 +448,7 @@
position: relative;
&.active {
color: $ui-secondary-color;
color: $secondary-text-color;
&::before,
&::after {
@ -483,7 +483,7 @@
&__message {
position: relative;
margin-left: 58px;
color: $ui-base-lighter-color;
color: $dark-text-color;
padding: 8px 0;
padding-top: 0;
padding-bottom: 4px;

8
app/javascript/flavours/glitch/styles/components/boost.scss
View File

File diff suppressed because one or more lines are too long

38
app/javascript/flavours/glitch/styles/components/columns.scss
View File

@ -4,22 +4,6 @@
position: relative;
}
.column-icon {
background: lighten($ui-base-color, 4%);
color: $ui-primary-color;
cursor: pointer;
font-size: 16px;
padding: 15px;
position: absolute;
right: 0;
top: -48px;
z-index: 3;
&:hover {
color: lighten($ui-primary-color, 7%);
}
}
.columns-area {
display: flex;
flex: 1 1 auto;
@ -136,7 +120,7 @@
.column-back-button {
background: lighten($ui-base-color, 4%);
color: $ui-highlight-color;
color: $highlight-text-color;
cursor: pointer;
flex: 0 0 auto;
font-size: 16px;
@ -155,7 +139,7 @@
background: lighten($ui-base-color, 4%);
border: 0;
font-family: inherit;
color: $ui-highlight-color;
color: $highlight-text-color;
cursor: pointer;
flex: 0 0 auto;
font-size: 16px;
@ -210,7 +194,7 @@
.column-subheading {
background: $ui-base-color;
color: $ui-base-lighter-color;
color: $dark-text-color;
padding: 8px 20px;
font-size: 12px;
font-weight: 500;
@ -266,14 +250,14 @@
}
& > .column-header__back-button {
color: $ui-highlight-color;
color: $highlight-text-color;
}
&.active {
box-shadow: 0 1px 0 rgba($ui-highlight-color, 0.3);
.column-header__icon {
color: $ui-highlight-color;
color: $highlight-text-color;
text-shadow: 0 0 10px rgba($ui-highlight-color, 0.4);
}
}
@ -316,13 +300,13 @@
.column-header__button {
background: lighten($ui-base-color, 4%);
border: 0;
color: $ui-primary-color;
color: $darker-text-color;
cursor: pointer;
font-size: 16px;
padding: 0 15px;
&:hover {
color: lighten($ui-primary-color, 7%);
color: lighten($darker-text-color, 7%);
}
&.active {
@ -368,7 +352,7 @@
max-height: 70vh;
overflow: hidden;
overflow-y: auto;
color: $ui-primary-color;
color: $darker-text-color;
transition: max-height 150ms ease-in-out, opacity 300ms linear;
opacity: 1;
@ -406,7 +390,7 @@
.column-header__setting-btn {
&:hover {
color: lighten($ui-primary-color, 4%);
color: $darker-text-color;
text-decoration: underline;
}
}
@ -438,7 +422,7 @@
.empty-column-indicator,
.error-column {
color: lighten($ui-base-color, 20%);
color: $dark-text-color;
background: $ui-base-color;
text-align: center;
padding: 20px;
@ -454,7 +438,7 @@
}
a {
color: $ui-highlight-color;
color: $highlight-text-color;
text-decoration: none;
&:hover {

34
app/javascript/flavours/glitch/styles/components/composer.scss
View File

@ -12,7 +12,7 @@
padding: 10px;
width: 100%;
outline: 0;
color: $ui-base-color;
color: $inverted-text-color;
background: $simple-background-color;
font-size: 14px;
font-family: inherit;
@ -24,7 +24,7 @@
}
.composer--warning {
color: darken($ui-secondary-color, 65%);
color: $inverted-text-color;
margin-bottom: 15px;
background: $ui-primary-color;
box-shadow: 0 2px 6px rgba($base-shadow-color, 0.3);
@ -34,7 +34,7 @@
font-weight: 400;
a {
color: darken($ui-primary-color, 33%);
color: $lighter-text-color;
font-weight: 500;
text-decoration: underline;
@ -54,7 +54,7 @@
margin-bottom: 5px;
overflow: hidden;
& > .account.small { color: $ui-base-color }
& > .account.small { color: $inverted-text-color; }
& > .cancel {
float: right;
@ -68,7 +68,7 @@
padding: 0 12px;
font-size: 14px;
line-height: 20px;
color: $ui-base-color;
color: $inverted-text-color;
word-wrap: break-word;
font-weight: 400;
overflow: visible;
@ -82,7 +82,7 @@
}
a {
color: lighten($ui-base-color, 20%);
color: $lighter-text-color;
text-decoration: none;
&:hover { text-decoration: underline }
@ -129,7 +129,7 @@
width: 100%;
min-height: 100px;
outline: 0;
color: $ui-base-color;
color: $inverted-text-color;
background: $simple-background-color;
font-size: 14px;
font-family: inherit;
@ -160,7 +160,7 @@
margin: 2px 0 0 2px;
width: 24px;
height: 24px;
color: darken($ui-primary-color, 24%);
color: $lighter-text-color;
font-size: 18px;
line-height: 24px;
text-align: center;
@ -176,7 +176,7 @@
border-radius: 0 0 4px 4px;
padding: 6px;
width: 100%;
color: $ui-base-color;
color: $inverted-text-color;
background: $ui-secondary-color;
box-shadow: 4px 4px 6px rgba($base-shadow-color, 0.4);
font-size: 14px;
@ -214,14 +214,14 @@
& > .account.small {
.display-name {
& > span { color: lighten($ui-base-color, 36%) }
& > span { color: $lighter-text-color }
}
}
}
.composer--upload_form {
padding: 5px;
color: $ui-base-color;
color: $inverted-text-color;
background: $simple-background-color;
font-size: 14px;
@ -258,7 +258,7 @@
border: 0;
padding: 10px;
width: 100%;
color: $ui-secondary-color;
color: $secondary-text-color;
background: linear-gradient(0deg, rgba($base-shadow-color, 0.8) 0, rgba($base-shadow-color, 0.35) 80%, transparent);
font-size: 14px;
font-family: inherit;
@ -271,7 +271,7 @@
&::placeholder {
opacity: 0.54;
color: $ui-secondary-color;
color: $secondary-text-color;
}
}
@ -288,7 +288,7 @@
.composer--upload_form--progress {
display: flex;
padding: 10px;
color: $ui-base-lighter-color;
color: $darker-text-color;
overflow: hidden;
& > .fa {
@ -380,18 +380,18 @@
display: flex;
align-items: center;
padding: 10px;
color: $ui-base-color;
color: $inverted-text-color;
cursor: pointer;
& > .content {
flex: 1 1 auto;
color: darken($ui-primary-color, 24%);
color: $lighter-text-color;
&:not(:first-child) { margin-left: 10px }
strong {
display: block;
color: $ui-base-color;
color: $inverted-text-color;
font-weight: 500;
}
}

22
app/javascript/flavours/glitch/styles/components/drawer.scss
View File

@ -92,7 +92,7 @@
padding: 15px 5px 13px;
height: 48px;
flex: 1 1 auto;
color: $ui-primary-color;
color: $darker-text-color;
text-align: center;
text-decoration: none;
cursor: pointer;
@ -127,7 +127,7 @@
width: 100%;
height: 36px;
outline: 0;
color: $ui-primary-color;
color: $darker-text-color;
background: $ui-base-color;
font-size: 14px;
font-family: inherit;
@ -146,7 +146,7 @@
right: 10px;
width: 18px;
height: 18px;
color: $ui-secondary-color;
color: $secondary-text-color;
font-size: 18px;
line-height: 18px;
z-index: 2;
@ -199,12 +199,12 @@
border-radius: 4px;
padding: 10px 14px 14px 14px;
box-shadow: 2px 4px 15px rgba($base-shadow-color, 0.4);
color: $ui-primary-color;
color: $light-text-color;
background: $simple-background-color;
h4 {
margin-bottom: 10px;
color: $ui-primary-color;
color: $light-text-color;
font-size: 13px;
font-weight: 500;
text-transform: uppercase;
@ -214,14 +214,14 @@
li { padding: 4px 0 }
em {
color: $ui-base-color;
color: $inverted-text-color;
font-weight: 500;
}
}
.drawer--account {
padding: 10px;
color: $ui-primary-color;
color: $darker-text-color;
& > a {
color: inherit;
@ -235,7 +235,7 @@
& > .acct {
display: block;
color: $primary-text-color;
color: $secondary-text-color;
font-weight: 500;
white-space: nowrap;
overflow: hidden;
@ -258,7 +258,7 @@
& > header {
border-bottom: 1px solid darken($ui-base-color, 4%);
padding: 15px 10px;
color: $ui-base-lighter-color;
color: $dark-text-color;
background: lighten($ui-base-color, 2%);
font-size: 14px;
font-weight: 500;
@ -270,13 +270,13 @@
& > .hashtag {
display: block;
padding: 10px;
color: $ui-secondary-color;
color: $secondary-text-color;
text-decoration: none;
&:hover,
&:active,
&:focus {
color: lighten($ui-secondary-color, 4%);
color: lighten($secondary-text-color, 4%);
text-decoration: underline;
}
}

14
app/javascript/flavours/glitch/styles/components/emoji_picker.scss
View File

@ -7,7 +7,7 @@
font-size: 13px;
display: inline-block;
color: $ui-base-color;
color: $inverted-text-color;
.emoji-mart-emoji {
padding: 6px;
@ -36,7 +36,7 @@
display: flex;
justify-content: space-between;
padding: 0 6px;
color: $ui-primary-color;
color: $lighter-text-color;
line-height: 0;
}
@ -50,15 +50,15 @@
cursor: pointer;
&:hover {
color: darken($ui-primary-color, 4%);
color: darken($lighter-text-color, 4%);
}
}
.emoji-mart-anchor-selected {
color: darken($ui-highlight-color, 3%);
color: $highlight-text-color;
&:hover {
color: darken($ui-highlight-color, 3%);
color: darken($highlight-text-color, 4%);
}
.emoji-mart-anchor-bar {
@ -115,7 +115,7 @@
display: block;
width: 100%;
background: rgba($ui-secondary-color, 0.3);
color: $ui-primary-color;
color: $inverted-text-color;
border: 1px solid $ui-secondary-color;
border-radius: 4px;
@ -184,7 +184,7 @@
font-size: 14px;
text-align: center;
padding-top: 70px;
color: $ui-primary-color;
color: $light-text-color;
.emoji-mart-category-label {
display: none;

96
app/javascript/flavours/glitch/styles/components/index.scss
View File

@ -52,7 +52,7 @@
}
&.button-alternative {
color: $ui-base-color;
color: $inverted-text-color;
background: $ui-primary-color;
&:active,
@ -76,7 +76,7 @@
font-size: 16px;
line-height: 36px;
height: auto;
color: $ui-primary-color;
color: $darker-text-color;
text-transform: none;
background: transparent;
padding: 3px 15px;
@ -87,7 +87,7 @@
&:focus,
&:hover {
border-color: lighten($ui-primary-color, 4%);
color: lighten($ui-primary-color, 4%);
color: lighten($darker-text-color, 4%);
}
}
@ -100,7 +100,7 @@
.icon-button {
display: inline-block;
padding: 0;
color: $ui-base-lighter-color;
color: $action-button-color;
border: none;
background: transparent;
cursor: pointer;
@ -109,17 +109,17 @@
&:hover,
&:active,
&:focus {
color: lighten($ui-base-color, 33%);
color: lighten($action-button-color, 7%);
transition: color 200ms ease-out;
}
&.disabled {
color: lighten($ui-base-color, 13%);
color: darken($action-button-color, 13%);
cursor: default;
}
&.active {
color: $ui-highlight-color;
color: $highlight-text-color;
}
&::-moz-focus-inner {
@ -133,23 +133,23 @@
}
&.inverted {
color: lighten($ui-base-color, 33%);
color: $lighter-text-color;
&:hover,
&:active,
&:focus {
color: $ui-base-lighter-color;
color: darken($lighter-text-color, 7%);
}
&.disabled {
color: $ui-primary-color;
color: lighten($lighter-text-color, 7%);
}
&.active {
color: $ui-highlight-color;
color: $highlight-text-color;
&.disabled {
color: lighten($ui-highlight-color, 13%);
color: lighten($highlight-text-color, 13%);
}
}
}
@ -168,7 +168,7 @@
}
.text-icon-button {
color: lighten($ui-base-color, 33%);
color: $lighter-text-color;
border: none;
background: transparent;
cursor: pointer;
@ -182,17 +182,17 @@
&:hover,
&:active,
&:focus {
color: $ui-base-lighter-color;
color: darken($lighter-text-color, 7%);
transition: color 200ms ease-out;
}
&.disabled {
color: lighten($ui-base-color, 13%);
color: lighten($lighter-text-color, 20%);
cursor: default;
}
&.active {
color: $ui-highlight-color;
color: $highlight-text-color;
}
&::-moz-focus-inner {
@ -211,25 +211,6 @@
transform-origin: 50% 0;
}
.dropdown--active .icon-button {
color: $ui-highlight-color;
}
.dropdown--active::after {
@media screen and (min-width: 631px) {
content: "";
display: block;
position: absolute;
width: 0;
height: 0;
border-style: solid;
border-width: 0 4.5px 7.8px;
border-color: transparent transparent $ui-secondary-color;
bottom: 8px;
right: 104px;
}
}
.invisible {
font-size: 0;
line-height: 0;
@ -254,10 +235,6 @@
}
}
.lightbox .icon-button {
color: $ui-base-color;
}
.notification__favourite-icon-wrapper {
left: 0;
position: absolute;
@ -462,7 +439,7 @@
box-sizing: border-box;
text-decoration: none;
background: $ui-secondary-color;
color: $ui-base-color;
color: $inverted-text-color;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
@ -471,7 +448,7 @@
&:hover,
&:active {
background: $ui-highlight-color;
color: $ui-secondary-color;
color: $secondary-text-color;
outline: 0;
}
}
@ -513,7 +490,7 @@
box-sizing: border-box;
text-decoration: none;
background: $ui-secondary-color;
color: $ui-base-color;
color: $inverted-text-color;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
@ -524,7 +501,7 @@
&:hover {
background: $ui-highlight-color;
color: $ui-secondary-color;
color: $secondary-text-color;
}
}
}
@ -536,7 +513,7 @@
.static-content {
padding: 10px;
padding-top: 20px;
color: $ui-base-lighter-color;
color: $dark-text-color;
h1 {
font-size: 16px;
@ -577,7 +554,7 @@
&.active {
border-bottom: 2px solid $ui-highlight-color;
color: $ui-highlight-color;
color: $highlight-text-color;
}
&:hover,
@ -752,11 +729,11 @@
flex: 1 0 auto;
p {
color: $ui-secondary-color;
color: $secondary-text-color;
}
a {
color: $ui-base-lighter-color;
color: $dark-text-color;
}
}
@ -793,7 +770,7 @@
}
.setting-text {
color: $ui-primary-color;
color: $darker-text-color;
background: transparent;
border: none;
border-bottom: 2px solid $ui-primary-color;
@ -815,12 +792,12 @@
}
&.light {
color: $ui-base-color;
color: $inverted-text-color;
border-bottom: 2px solid lighten($ui-base-color, 27%);
&:focus,
&:active {
color: $ui-base-color;
color: $inverted-text-color;
border-bottom-color: $ui-highlight-color;
}
}
@ -845,17 +822,17 @@
}
.reduce-motion button.icon-button i.fa-retweet {
color: $ui-base-lighter-color;
color: $action-button-color;
transition: color 100ms ease-in;
}
.reduce-motion button.icon-button.active i.fa-retweet {
color: $ui-highlight-color;
color: $highlight-text-color;
}
.load-more {
display: block;
color: $ui-base-lighter-color;
color: $dark-text-color;
background-color: transparent;
border: 0;
font-size: inherit;
@ -917,7 +894,7 @@
width: 30px;
height: 30px;
font-size: 20px;
color: $ui-primary-color;
color: $inverted-text-color;
text-shadow: 0 0 5px black;
display: flex;
justify-content: center;
@ -945,7 +922,7 @@
}
.loading-indicator {
color: lighten($ui-base-color, 26%);
color: $dark-text-color;
font-size: 12px;
font-weight: 400;
text-transform: uppercase;
@ -1033,7 +1010,7 @@
.setting-toggle__label,
.setting-meta__label {
color: $ui-primary-color;
color: $darker-text-color;
display: inline-block;
margin-bottom: 14px;
margin-left: 8px;
@ -1041,7 +1018,6 @@
}
.setting-meta__label {
color: $ui-primary-color;
float: right;
}
@ -1122,7 +1098,7 @@
display: flex;
align-items: center;
justify-content: center;
color: $ui-secondary-color;
color: $secondary-text-color;
font-size: 18px;
font-weight: 500;
border: 2px dashed $ui-base-lighter-color;
@ -1158,11 +1134,11 @@ noscript {
div {
font-size: 14px;
margin: 30px auto;
color: $ui-secondary-color;
color: $secondary-text-color;
max-width: 400px;
a {
color: $ui-highlight-color;
color: $highlight-text-color;
text-decoration: underline;
&:hover {

6
app/javascript/flavours/glitch/styles/components/lists.scss
View File

@ -8,7 +8,7 @@
&__icon {
flex: 0 0 auto;
color: $ui-base-lighter-color;
color: $dark-text-color;
padding: 8px 18px;
cursor: default;
border-right: 1px solid lighten($ui-base-color, 8%);
@ -38,7 +38,7 @@
a {
text-decoration: none;
color: $ui-base-lighter-color;
color: $dark-text-color;
font-weight: 500;
&:hover {
@ -57,7 +57,7 @@
}
.fa {
color: $ui-base-lighter-color;
color: $dark-text-color;
}
}
}

6
app/javascript/flavours/glitch/styles/components/local_settings.scss
View File

@ -3,7 +3,7 @@
display: flex;
flex-direction: row;
background: $ui-secondary-color;
color: $ui-base-color;
color: $inverted-text-color;
border-radius: 8px;
height: 80vh;
width: 80vw;
@ -58,8 +58,8 @@
}
.glitch.local-settings__navigation {
background: $primary-text-color;
color: $ui-base-color;
background: $simple-background-color;
color: $inverted-text-color;
width: 200px;
font-size: 15px;
line-height: 20px;

8
app/javascript/flavours/glitch/styles/components/media.scss
View File

@ -15,7 +15,7 @@
.media-spoiler {
background: $base-overlay-background;
color: $ui-primary-color;
color: $darker-text-color;
border: 0;
width: 100%;
height: 100%;
@ -23,7 +23,7 @@
&:hover,
&:active,
&:focus {
color: lighten($ui-primary-color, 8%);
color: lighten($darker-text-color, 8%);
}
.status__content > & {
@ -350,7 +350,7 @@
z-index: 4;
border: 0;
background: $base-shadow-color;
color: $ui-primary-color;
color: $darker-text-color;
transition: none;
pointer-events: none;
@ -361,7 +361,7 @@
&:hover,
&:active,
&:focus {
color: lighten($ui-primary-color, 8%);
color: lighten($darker-text-color, 7%);
}
}

4
app/javascript/flavours/glitch/styles/components/metadata.scss
View File

@ -31,7 +31,7 @@
}
th {
color: $ui-primary-color;
color: $darker-text-color;
background: lighten($ui-base-color, 13%);
max-width: 120px;
@ -46,7 +46,7 @@
background: $ui-base-color;
a {
color: $ui-highlight-color;
color: $highlight-text-color;
}
}
}

47
app/javascript/flavours/glitch/styles/components/modal.scss
View File

@ -44,7 +44,7 @@
.error-modal,
.embed-modal {
background: $ui-secondary-color;
color: $ui-base-color;
color: $inverted-text-color;
border-radius: 8px;
overflow: hidden;
display: flex;
@ -132,7 +132,7 @@
.onboarding-modal__nav,
.error-modal__nav {
color: darken($ui-secondary-color, 34%);
color: $lighter-text-color;
border: 0;
font-size: 14px;
font-weight: 500;
@ -146,18 +146,18 @@
&:hover,
&:focus,
&:active {
color: darken($ui-secondary-color, 38%);
color: darken($lighter-text-color, 4%);
background-color: darken($ui-secondary-color, 16%);
}
&.onboarding-modal__done,
&.onboarding-modal__next {
color: $ui-base-color;
color: $inverted-text-color;
&:hover,
&:focus,
&:active {
color: darken($ui-base-color, 4%);
color: lighten($inverted-text-color, 4%);
}
}
}
@ -209,17 +209,17 @@
h1 {
font-size: 18px;
font-weight: 500;
color: $ui-base-color;
color: $inverted-text-color;
margin-bottom: 20px;
}
a {
color: $ui-highlight-color;
color: $highlight-text-color;
&:hover,
&:focus,
&:active {
color: lighten($ui-highlight-color, 4%);
color: lighten($highlight-text-color, 4%);
}
}
@ -229,7 +229,7 @@
p {
font-size: 16px;
color: lighten($ui-base-color, 8%);
color: $lighter-text-color;
margin-top: 10px;
margin-bottom: 10px;
@ -240,7 +240,7 @@
strong {
font-weight: 500;
background: $ui-base-color;
color: $ui-secondary-color;
color: $secondary-text-color;
border-radius: 4px;
font-size: 14px;
padding: 3px 6px;
@ -292,7 +292,7 @@
&__label {
font-weight: 500;
color: $ui-base-color;
color: $inverted-text-color;
margin-bottom: 5px;
text-transform: uppercase;
font-size: 12px;
@ -300,7 +300,7 @@
&__case {
background: $ui-base-color;
color: $ui-secondary-color;
color: $secondary-text-color;
font-weight: 500;
padding: 10px;
border-radius: 4px;
@ -317,7 +317,7 @@
.figure {
background: darken($ui-base-color, 8%);
color: $ui-secondary-color;
color: $secondary-text-color;
margin-bottom: 20px;
border-radius: 4px;
padding: 10px;
@ -407,7 +407,7 @@
.actions-modal,
.mute-modal {
background: lighten($ui-secondary-color, 8%);
color: $ui-base-color;
color: $inverted-text-color;
border-radius: 8px;
overflow: hidden;
max-width: 90vw;
@ -464,7 +464,7 @@
& > div {
flex: 1 1 auto;
text-align: right;
color: lighten($ui-base-color, 33%);
color: $lighter-text-color;
padding-right: 10px;
}
@ -553,7 +553,7 @@
box-sizing: border-box;
width: 100%;
margin: 0;
color: $ui-base-color;
color: $inverted-text-color;
background: $white;
padding: 10px;
font-family: inherit;
@ -575,7 +575,7 @@
margin-bottom: 24px;
&__label {
color: $ui-base-color;
color: $inverted-text-color;
font-size: 14px;
}
}
@ -628,7 +628,7 @@
li:not(:empty) {
a {
color: $ui-base-color;
color: $inverted-text-color;
display: flex;
padding: 12px 16px;
font-size: 15px;
@ -646,8 +646,8 @@
&:focus {
&,
button {
background: $ui-highlight-color;
color: $primary-text-color;
background: $ui-highlight-color;
color: $primary-text-color;
}
}
@ -666,14 +666,14 @@
.confirmation-modal__cancel-button,
.mute-modal__cancel-button {
background-color: transparent;
color: darken($ui-secondary-color, 34%);
color: $lighter-text-color;
font-size: 14px;
font-weight: 500;
&:hover,
&:focus,
&:active {
color: darken($ui-secondary-color, 38%);
color: darken($lighter-text-color, 4%);
}
}
}
@ -715,7 +715,6 @@
}
.embed-modal__html {
color: $ui-secondary-color;
outline: 0;
box-sizing: border-box;
display: block;
@ -724,7 +723,7 @@
padding: 10px;
font-family: 'mastodon-font-monospace', monospace;
background: $ui-base-color;
color: $ui-primary-color;
color: $primary-text-color;
font-size: 14px;
margin: 0;
margin-bottom: 15px;

4
app/javascript/flavours/glitch/styles/components/regeneration_indicator.scss
View File

@ -2,7 +2,7 @@
text-align: center;
font-size: 16px;
font-weight: 500;
color: lighten($ui-base-color, 16%);
color: $dark-text-color;
background: $ui-base-color;
cursor: default;
display: flex;
@ -42,7 +42,7 @@
strong {
display: block;
margin-bottom: 10px;
color: lighten($ui-base-color, 34%);
color: $dark-text-color;
}
span {

10
app/javascript/flavours/glitch/styles/components/search.scss
View File

@ -12,7 +12,7 @@
padding-right: 30px;
font-family: inherit;
background: $ui-base-color;
color: $ui-primary-color;
color: $darker-text-color;
font-size: 14px;
margin: 0;
@ -47,7 +47,7 @@
font-size: 18px;
width: 18px;
height: 18px;
color: $ui-secondary-color;
color: $secondary-text-color;
cursor: default;
pointer-events: none;
@ -82,7 +82,7 @@
}
.search-results__header {
color: $ui-base-lighter-color;
color: $dark-text-color;
background: lighten($ui-base-color, 2%);
border-bottom: 1px solid darken($ui-base-color, 4%);
padding: 15px 10px;
@ -93,13 +93,13 @@
.search-results__hashtag {
display: block;
padding: 10px;
color: $ui-secondary-color;
color: $secondary-text-color;
text-decoration: none;
&:hover,
&:active,
&:focus {
color: lighten($ui-secondary-color, 4%);
color: lighten($secondary-text-color, 4%);
text-decoration: underline;
}
}

52
app/javascript/flavours/glitch/styles/components/status.scss
View File

@ -33,14 +33,14 @@
}
a {
color: $ui-secondary-color;
color: $secondary-text-color;
text-decoration: none;
&:hover {
text-decoration: underline;
.fa {
color: lighten($ui-base-color, 40%);
color: lighten($dark-text-color, 7%);
}
}
@ -55,7 +55,7 @@
}
.fa {
color: lighten($ui-base-color, 30%);
color: $dark-text-color;
}
}
@ -82,7 +82,7 @@
border-radius: 2px;
background: lighten($ui-base-color, 30%);
border: none;
color: lighten($ui-base-color, 8%);
color: $inverted-text-color;
font-weight: 500;
font-size: 11px;
padding: 0 5px;
@ -177,36 +177,32 @@
&.status-direct {
background: lighten($ui-base-color, 8%);
.icon-button.disabled {
color: lighten($ui-base-color, 16%);
}
}
&.light {
.status__relative-time {
color: $ui-primary-color;
color: $lighter-text-color;
}
.status__display-name {
color: $ui-base-color;
color: $inverted-text-color;
}
.display-name {
strong {
color: $ui-base-color;
color: $inverted-text-color;
}
span {
color: $ui-primary-color;
color: $lighter-text-color;
}
}
.status__content {
color: $ui-base-color;
color: $inverted-text-color;
a {
color: $ui-highlight-color;
color: $highlight-text-color;
}
a.status__content__spoiler-link {
@ -285,7 +281,7 @@
background: transparent;
.icon-button.disabled {
color: lighten($ui-base-color, 13%);
color: lighten($action-button-color, 13%);
}
}
}
@ -295,7 +291,7 @@
margin-left: auto;
padding-left: 18px;
width: 120px;
color: $ui-base-lighter-color;
color: $dark-text-color;
font-size: 14px;
text-align: right;
white-space: nowrap;
@ -305,7 +301,7 @@
.status__display-name {
margin: 0 auto 0 0;
color: $ui-base-lighter-color;
color: $dark-text-color;
overflow: hidden;
}
@ -333,7 +329,7 @@
display: flex;
align-items: center;
height: 1em;
color: lighten($ui-base-color, 26%);
color: transparentize($lighter-text-color, 0.1);
.status__visibility-icon {
padding-left: 6px;
@ -382,13 +378,13 @@
.status__prepend {
margin: -10px -10px 10px;
color: $ui-base-lighter-color;
color: $dark-text-color;
padding: 8px 10px 0 68px;
font-size: 14px;
position: relative;
.status__display-name strong {
color: $ui-base-lighter-color;
color: $dark-text-color;
}
> span {
@ -445,7 +441,7 @@
.detailed-status__meta {
margin-top: 15px;
color: $ui-base-lighter-color;
color: $dark-text-color;
font-size: 14px;
line-height: 18px;
}
@ -515,7 +511,7 @@
}
.detailed-status__display-name {
color: $ui-secondary-color;
color: $secondary-text-color;
display: block;
line-height: 24px;
margin-bottom: 15px;
@ -549,11 +545,11 @@
.muted {
.status__content p,
.status__content a {
color: $ui-base-lighter-color;
color: $dark-text-color;
}
.status__display-name strong {
color: $ui-base-lighter-color;
color: $dark-text-color;
}
.status__avatar {
@ -562,7 +558,7 @@
a.status__content__spoiler-link {
background: $ui-base-lighter-color;
color: lighten($ui-base-color, 4%);
color: $inverted-text-color;
&:hover {
background: lighten($ui-base-color, 29%);
@ -584,7 +580,7 @@
font-size: 14px;
border: 1px solid lighten($ui-base-color, 8%);
border-radius: 4px;
color: $ui-base-lighter-color;
color: $dark-text-color;
margin-top: 14px;
text-decoration: none;
overflow: hidden;
@ -626,7 +622,7 @@
display: block;
font-weight: 500;
margin-bottom: 5px;
color: $ui-primary-color;
color: $darker-text-color;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
@ -639,7 +635,7 @@
}
.status-card__description {
color: $ui-primary-color;
color: $darker-text-color;
}
.status-card__host {