mirror/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon synced 2024-11-28 23:08:25 +09:00
Code

Add color variables of texts for better accesibility (#7125)

Browse Source 
* Add variables for text colors

* Change variables in sass files

* Apply text color variables for recently added colors

* Fix text colors of emoji mart anchors

* Fix text colors of search__input

* Fix text colors of text area of compose-form

* Fix icon colors of privacy dropdown and modal

* Inverted icon colors by classname

* Change variables in boost.scss

* Change action-button-color

* Fix text colors of pre-header
This commit is contained in:
Lynx Kotoura 2018-04-18 23:52:15 +09:00 committed by Eugen Rochko
parent 0ba49eca8b
commit 74dae9458d
16 changed files with 285 additions and 340 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/mastodon/features/ui/components/actions_modal.js
View File

@ -27,7 +27,7 @@ export default class ActionsModal extends ImmutablePureComponent {
return ( return (
<li key={`${text}-${i}`}> <li key={`${text}-${i}`}>
<a href={href} target='_blank' rel='noopener' onClick={this.props.onClick} data-index={i} className={classNames({ active })}> <a href={href} target='_blank' rel='noopener' onClick={this.props.onClick} data-index={i} className={classNames({ active })}>
{icon && <IconButton title={text} icon={icon} role='presentation' tabIndex='-1' />} {icon && <IconButton title={text} icon={icon} role='presentation' tabIndex='-1' inverted />}
<div> <div>
<div className={classNames({ 'actions-modal__item-label': !!meta })}>{text}</div> <div className={classNames({ 'actions-modal__item-label': !!meta })}>{text}</div>
<div>{meta}</div> <div>{meta}</div>

64
app/javascript/styles/mastodon/about.scss
View File

@ -169,7 +169,7 @@ $small-breakpoint: 960px;
background: $ui-base-color; background: $ui-base-color;
font-size: 12px; font-size: 12px;
font-weight: 500; font-weight: 500;
color: $ui-primary-color; color: $darker-text-color;
text-transform: uppercase; text-transform: uppercase;
position: relative; position: relative;
z-index: 1; z-index: 1;
@ -186,10 +186,10 @@ $small-breakpoint: 960px;
font-size: 16px; font-size: 16px;
line-height: 30px; line-height: 30px;
margin-bottom: 12px; margin-bottom: 12px;
color: $ui-primary-color; color: $darker-text-color;
a { a {
color: $ui-highlight-color; color: $highlight-text-color;
text-decoration: underline; text-decoration: underline;
} }
} }
@ -202,11 +202,11 @@ $small-breakpoint: 960px;
text-align: center; text-align: center;
font-size: 12px; font-size: 12px;
line-height: 18px; line-height: 18px;
color: $ui-primary-color; color: $darker-text-color;
margin-bottom: 0; margin-bottom: 0;
a { a {
color: $ui-highlight-color; color: $highlight-text-color;
text-decoration: underline; text-decoration: underline;
} }
} }
@ -225,7 +225,7 @@ $small-breakpoint: 960px;
font-family: inherit; font-family: inherit;
font-size: inherit; font-size: inherit;
line-height: inherit; line-height: inherit;
color: lighten($ui-primary-color, 10%); color: transparentize($darker-text-color, 0.1);
} }
h1 { h1 {
@ -234,14 +234,14 @@ $small-breakpoint: 960px;
line-height: 30px; line-height: 30px;
font-weight: 500; font-weight: 500;
margin-bottom: 20px; margin-bottom: 20px;
color: $ui-secondary-color; color: $primary-text-color;
small { small {
font-family: 'mastodon-font-sans-serif', sans-serif; font-family: 'mastodon-font-sans-serif', sans-serif;
display: block; display: block;
font-size: 18px; font-size: 18px;
font-weight: 400; font-weight: 400;
color: $ui-base-lighter-color; color: opacify($darker-text-color, 0.1);
} }
} }
@ -251,7 +251,7 @@ $small-breakpoint: 960px;
line-height: 26px; line-height: 26px;
font-weight: 500; font-weight: 500;
margin-bottom: 20px; margin-bottom: 20px;
color: $ui-secondary-color; color: $primary-text-color;
} }
h3 { h3 {
@ -260,7 +260,7 @@ $small-breakpoint: 960px;
line-height: 24px; line-height: 24px;
font-weight: 500; font-weight: 500;
margin-bottom: 20px; margin-bottom: 20px;
color: $ui-secondary-color; color: $primary-text-color;
} }
h4 { h4 {
@ -269,7 +269,7 @@ $small-breakpoint: 960px;
line-height: 24px; line-height: 24px;
font-weight: 500; font-weight: 500;
margin-bottom: 20px; margin-bottom: 20px;
color: $ui-secondary-color; color: $primary-text-color;
} }
h5 { h5 {
@ -278,7 +278,7 @@ $small-breakpoint: 960px;
line-height: 24px; line-height: 24px;
font-weight: 500; font-weight: 500;
margin-bottom: 20px; margin-bottom: 20px;
color: $ui-secondary-color; color: $primary-text-color;
} }
h6 { h6 {
@ -287,7 +287,7 @@ $small-breakpoint: 960px;
line-height: 24px; line-height: 24px;
font-weight: 500; font-weight: 500;
margin-bottom: 20px; margin-bottom: 20px;
color: $ui-secondary-color; color: $primary-text-color;
} }
ul, ul,
@ -354,10 +354,10 @@ $small-breakpoint: 960px;
font-weight: 400; font-weight: 400;
font-size: 16px; font-size: 16px;
line-height: 30px; line-height: 30px;
color: $ui-primary-color; color: $darker-text-color;
a { a {
color: $ui-highlight-color; color: $highlight-text-color;
text-decoration: underline; text-decoration: underline;
} }
} }
@ -405,7 +405,7 @@ $small-breakpoint: 960px;
font-size: 14px; font-size: 14px;
&:hover { &:hover {
color: $ui-secondary-color; color: $darker-text-color;
} }
} }
@ -478,10 +478,10 @@ $small-breakpoint: 960px;
font-weight: 400; font-weight: 400;
font-size: 16px; font-size: 16px;
line-height: 30px; line-height: 30px;
color: $ui-primary-color; color: $darker-text-color;
a { a {
color: $ui-highlight-color; color: $highlight-text-color;
text-decoration: underline; text-decoration: underline;
} }
} }
@ -517,7 +517,7 @@ $small-breakpoint: 960px;
span { span {
&:last-child { &:last-child {
color: $ui-secondary-color; color: $darker-text-color;
} }
} }
@ -548,7 +548,7 @@ $small-breakpoint: 960px;
font-size: 14px; font-size: 14px;
line-height: 24px; line-height: 24px;
font-weight: 500; font-weight: 500;
color: $ui-primary-color; color: $darker-text-color;
padding-bottom: 5px; padding-bottom: 5px;
margin-bottom: 15px; margin-bottom: 15px;
border-bottom: 1px solid lighten($ui-base-color, 4%); border-bottom: 1px solid lighten($ui-base-color, 4%);
@ -559,7 +559,7 @@ $small-breakpoint: 960px;
a, a,
span { span {
font-weight: 400; font-weight: 400;
color: darken($ui-primary-color, 10%); color: opacify($darker-text-color, 0.1);
} }
a { a {
@ -602,7 +602,7 @@ $small-breakpoint: 960px;
.username { .username {
display: block; display: block;
color: $ui-primary-color; color: $darker-text-color;
} }
} }
} }
@ -775,7 +775,7 @@ $small-breakpoint: 960px;
} }
p a { p a {
color: $ui-secondary-color; color: $darker-text-color;
} }
h1 { h1 {
@ -784,10 +784,10 @@ $small-breakpoint: 960px;
margin-bottom: 0; margin-bottom: 0;
small { small {
color: $ui-primary-color; color: $darker-text-color;
span { span {
color: $ui-secondary-color; color: $darker-text-color;
} }
} }
} }
@ -896,7 +896,7 @@ $small-breakpoint: 960px;
} }
a { a {
color: $ui-secondary-color; color: $darker-text-color;
text-decoration: none; text-decoration: none;
} }
} }
@ -935,7 +935,7 @@ $small-breakpoint: 960px;
.fa { .fa {
display: block; display: block;
color: $ui-primary-color; color: $darker-text-color;
font-size: 48px; font-size: 48px;
} }
} }
@ -943,7 +943,7 @@ $small-breakpoint: 960px;
.text { .text {
font-size: 16px; font-size: 16px;
line-height: 30px; line-height: 30px;
color: $ui-primary-color; color: $darker-text-color;
h6 { h6 {
font-size: inherit; font-size: inherit;
@ -969,10 +969,10 @@ $small-breakpoint: 960px;
font-weight: 400; font-weight: 400;
font-size: 16px; font-size: 16px;
line-height: 30px; line-height: 30px;
color: $ui-primary-color; color: $darker-text-color;
a { a {
color: $ui-highlight-color; color: $highlight-text-color;
text-decoration: underline; text-decoration: underline;
} }
} }
@ -980,7 +980,7 @@ $small-breakpoint: 960px;
.footer-links { .footer-links {
padding-bottom: 50px; padding-bottom: 50px;
text-align: right; text-align: right;
color: $ui-base-lighter-color; color: $darker-text-color;
p { p {
font-size: 14px; font-size: 14px;
@ -995,7 +995,7 @@ $small-breakpoint: 960px;
&__footer { &__footer {
margin-top: 10px; margin-top: 10px;
text-align: center; text-align: center;
color: $ui-base-lighter-color; color: $darker-text-color;
p { p {
font-size: 14px; font-size: 14px;

42
app/javascript/styles/mastodon/accounts.scss
View File

@ -75,7 +75,7 @@
small { small {
display: block; display: block;
font-size: 14px; font-size: 14px;
color: $ui-highlight-color; color: $highlight-text-color;
font-weight: 400; font-weight: 400;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
@ -113,7 +113,7 @@
width: 33.3%; width: 33.3%;
box-sizing: border-box; box-sizing: border-box;
flex: 0 0 auto; flex: 0 0 auto;
color: $ui-primary-color; color: $darker-text-color;
padding: 5px 10px 0; padding: 5px 10px 0;
margin-bottom: 10px; margin-bottom: 10px;
border-right: 1px solid lighten($ui-base-color, 4%); border-right: 1px solid lighten($ui-base-color, 4%);
@ -143,7 +143,7 @@
&.active { &.active {
&::after { &::after {
border-bottom: 4px solid $ui-highlight-color; border-bottom: 4px solid $highlight-text-color;
opacity: 1; opacity: 1;
} }
} }
@ -178,7 +178,7 @@
font-size: 14px; font-size: 14px;
line-height: 18px; line-height: 18px;
padding: 0 15px; padding: 0 15px;
color: $ui-secondary-color; color: $darker-text-color;
} }
@media screen and (max-width: 480px) { @media screen and (max-width: 480px) {
@ -256,7 +256,7 @@
.current { .current {
background: $simple-background-color; background: $simple-background-color;
border-radius: 100px; border-radius: 100px;
color: $ui-base-color; color: $lighter-text-color;
cursor: default; cursor: default;
margin: 0 10px; margin: 0 10px;
} }
@ -268,7 +268,7 @@
.older, .older,
.newer { .newer {
text-transform: uppercase; text-transform: uppercase;
color: $ui-secondary-color; color: $primary-text-color;
} }
.older { .older {
@ -293,7 +293,7 @@
.disabled { .disabled {
cursor: default; cursor: default;
color: lighten($ui-base-color, 10%); color: opacify($lighter-text-color, 0.1);
} }
@media screen and (max-width: 700px) { @media screen and (max-width: 700px) {
@ -332,7 +332,7 @@
width: 335px; width: 335px;
background: $simple-background-color; background: $simple-background-color;
border-radius: 4px; border-radius: 4px;
color: $ui-base-color; color: $lighter-text-color;
margin: 0 5px 10px; margin: 0 5px 10px;
position: relative; position: relative;
@ -344,7 +344,7 @@
overflow: hidden; overflow: hidden;
height: 100px; height: 100px;
border-radius: 4px 4px 0 0; border-radius: 4px 4px 0 0;
background-color: lighten($ui-base-color, 4%); background-color: opacify($lighter-text-color, 0.04);
background-size: cover; background-size: cover;
background-position: center; background-position: center;
position: relative; position: relative;
@ -392,7 +392,7 @@
a { a {
display: block; display: block;
color: $ui-base-color; color: $inverted-text-color;
text-decoration: none; text-decoration: none;
text-overflow: ellipsis; text-overflow: ellipsis;
overflow: hidden; overflow: hidden;
@ -414,7 +414,7 @@
} }
.username { .username {
color: lighten($ui-base-color, 34%); color: $lighter-text-color;
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400;
} }
@ -422,7 +422,7 @@
.account__header__content { .account__header__content {
padding: 10px 15px; padding: 10px 15px;
padding-top: 15px; padding-top: 15px;
color: lighten($ui-base-color, 26%); color: transparentize($lighter-text-color, 0.1);
word-wrap: break-word; word-wrap: break-word;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
@ -434,7 +434,7 @@
.nothing-here { .nothing-here {
width: 100%; width: 100%;
display: block; display: block;
color: $ui-primary-color; color: $lighter-text-color;
font-size: 14px; font-size: 14px;
font-weight: 500; font-weight: 500;
text-align: center; text-align: center;
@ -493,7 +493,7 @@
span { span {
font-size: 14px; font-size: 14px;
color: $ui-primary-color; color: $inverted-text-color;
} }
} }
@ -508,7 +508,7 @@
.account__header__content { .account__header__content {
font-size: 14px; font-size: 14px;
color: $ui-base-color; color: $darker-text-color;
} }
} }
@ -522,18 +522,18 @@
display: inline-block; display: inline-block;
padding: 15px; padding: 15px;
text-decoration: none; text-decoration: none;
color: $ui-highlight-color; color: $highlight-text-color;
text-transform: uppercase; text-transform: uppercase;
font-weight: 500; font-weight: 500;
&:hover, &:hover,
&:active, &:active,
&:focus { &:focus {
color: lighten($ui-highlight-color, 8%); color: lighten($highlight-text-color, 8%);
} }
&.active { &.active {
color: $ui-base-color; color: $inverted-text-color;
cursor: default; cursor: default;
} }
} }
@ -586,19 +586,19 @@
font-weight: 500; font-weight: 500;
text-align: center; text-align: center;
width: 94px; width: 94px;
color: $ui-secondary-color; color: opacify($darker-text-color, 0.1);
background: rgba(darken($ui-base-color, 8%), 0.5); background: rgba(darken($ui-base-color, 8%), 0.5);
} }
td { td {
color: $ui-primary-color; color: $darker-text-color;
text-align: center; text-align: center;
width: 100%; width: 100%;
padding-left: 0; padding-left: 0;
} }
a { a {
color: $ui-highlight-color; color: $highlight-text-color;
text-decoration: none; text-decoration: none;
&:hover, &:hover,

42
app/javascript/styles/mastodon/admin.scss
View File

@ -33,7 +33,7 @@
a { a {
display: block; display: block;
padding: 15px; padding: 15px;
color: rgba($primary-text-color, 0.7); color: $darker-text-color;
text-decoration: none; text-decoration: none;
transition: all 200ms linear; transition: all 200ms linear;
border-radius: 4px 0 0 4px; border-radius: 4px 0 0 4px;
@ -90,7 +90,7 @@
padding-left: 25px; padding-left: 25px;
h2 { h2 {
color: $ui-secondary-color; color: $primary-text-color;
font-size: 24px; font-size: 24px;
line-height: 28px; line-height: 28px;
font-weight: 400; font-weight: 400;
@ -98,7 +98,7 @@
} }
h3 { h3 {
color: $ui-secondary-color; color: $primary-text-color;
font-size: 20px; font-size: 20px;
line-height: 28px; line-height: 28px;
font-weight: 400; font-weight: 400;
@ -109,7 +109,7 @@
text-transform: uppercase; text-transform: uppercase;
font-size: 13px; font-size: 13px;
font-weight: 500; font-weight: 500;
color: $ui-primary-color; color: $primary-text-color;
padding-bottom: 8px; padding-bottom: 8px;
margin-bottom: 8px; margin-bottom: 8px;
border-bottom: 1px solid lighten($ui-base-color, 8%); border-bottom: 1px solid lighten($ui-base-color, 8%);
@ -117,7 +117,7 @@
h6 { h6 {
font-size: 16px; font-size: 16px;
color: $ui-secondary-color; color: $primary-text-color;
line-height: 28px; line-height: 28px;
font-weight: 400; font-weight: 400;
} }
@ -125,7 +125,7 @@
& > p { & > p {
font-size: 14px; font-size: 14px;
line-height: 18px; line-height: 18px;
color: $ui-secondary-color; color: $darker-text-color;
margin-bottom: 20px; margin-bottom: 20px;
strong { strong {
@ -153,10 +153,10 @@
} }
.muted-hint { .muted-hint {
color: $ui-primary-color; color: $darker-text-color;
a { a {
color: $ui-highlight-color; color: $highlight-text-color;
} }
} }
@ -253,7 +253,7 @@
a { a {
display: inline-block; display: inline-block;
color: rgba($primary-text-color, 0.7); color: $darker-text-color;
text-decoration: none; text-decoration: none;
text-transform: uppercase; text-transform: uppercase;
font-size: 12px; font-size: 12px;
@ -266,7 +266,7 @@
} }
&.selected { &.selected {
color: $ui-highlight-color; color: $highlight-text-color;
border-bottom: 2px solid $ui-highlight-color; border-bottom: 2px solid $ui-highlight-color;
} }
} }
@ -291,7 +291,7 @@
font-weight: 500; font-weight: 500;
font-size: 14px; font-size: 14px;
line-height: 18px; line-height: 18px;
color: $ui-secondary-color; color: $primary-text-color;
@each $lang in $cjk-langs { @each $lang in $cjk-langs {
&:lang(#{$lang}) { &:lang(#{$lang}) {
@ -348,7 +348,7 @@
padding: 7px 4px; padding: 7px 4px;
margin-bottom: 10px; margin-bottom: 10px;
font-size: 16px; font-size: 16px;
color: $ui-base-color; color: $inverted-text-color;
display: block; display: block;
width: 100%; width: 100%;
outline: 0; outline: 0;
@ -402,7 +402,7 @@
font-size: 14px; font-size: 14px;
a { a {
color: $classic-highlight-color; color: $highlight-text-color;
text-decoration: none; text-decoration: none;
&:hover { &:hover {
@ -425,7 +425,7 @@
align-items: center; align-items: center;
padding: 10px; padding: 10px;
background: $ui-base-color; background: $ui-base-color;
color: $ui-primary-color; color: $darker-text-color;
border-radius: 4px 4px 0 0; border-radius: 4px 4px 0 0;
font-size: 14px; font-size: 14px;
position: relative; position: relative;
@ -452,14 +452,14 @@
} }
&__timestamp { &__timestamp {
color: lighten($ui-base-color, 34%); color: $darker-text-color;
} }
&__extras { &__extras {
background: lighten($ui-base-color, 6%); background: lighten($ui-base-color, 6%);
border-radius: 0 0 4px 4px; border-radius: 0 0 4px 4px;
padding: 10px; padding: 10px;
color: $ui-primary-color; color: $darker-text-color;
font-family: 'mastodon-font-monospace', monospace; font-family: 'mastodon-font-monospace', monospace;
font-size: 12px; font-size: 12px;
word-wrap: break-word; word-wrap: break-word;
@ -469,7 +469,7 @@
&__icon { &__icon {
font-size: 28px; font-size: 28px;
margin-right: 10px; margin-right: 10px;
color: lighten($ui-base-color, 34%); color: $darker-text-color;
} }
&__icon__overlay { &__icon__overlay {
@ -485,7 +485,7 @@
} }
&.negative { &.negative {
background: $error-red; background: lighten($error-red, 12%);
} }
&.neutral { &.neutral {
@ -496,17 +496,17 @@
a, a,
.username, .username,
.target { .target {
color: $ui-secondary-color; color: $primary-text-color;
text-decoration: none; text-decoration: none;
font-weight: 500; font-weight: 500;
} }
.diff-old { .diff-old {
color: $error-red; color: lighten($error-red, 12%);
} }
.diff-neutral { .diff-neutral {
color: $ui-secondary-color; color: $darker-text-color;
} }
.diff-new { .diff-new {

2
app/javascript/styles/mastodon/basics.scss
View File

@ -75,7 +75,7 @@ body {
&.error { &.error {
position: absolute; position: absolute;
text-align: center; text-align: center;
color: $ui-primary-color; color: $darker-text-color;
background: $ui-base-color; background: $ui-base-color;
width: 100%; width: 100%;
height: 100%; height: 100%;

6
app/javascript/styles/mastodon/boost.scss
View File

File diff suppressed because one or more lines are too long

4
app/javascript/styles/mastodon/compact_header.scss
View File

@ -2,7 +2,7 @@
h1 { h1 {
font-size: 24px; font-size: 24px;
line-height: 28px; line-height: 28px;
color: $ui-primary-color; color: $primary-text-color;
font-weight: 500; font-weight: 500;
margin-bottom: 20px; margin-bottom: 20px;
padding: 0 10px; padding: 0 10px;
@ -20,7 +20,7 @@
small { small {
font-weight: 400; font-weight: 400;
color: $ui-secondary-color; color: $darker-text-color;
} }
img { img {

353
app/javascript/styles/mastodon/components.scss
View File

File diff suppressed because it is too large Load Diff

2
app/javascript/styles/mastodon/containers.scss
View File

@ -100,7 +100,7 @@
.name { .name {
flex: 1 1 auto; flex: 1 1 auto;
color: $ui-secondary-color; color: $darker-text-color;
width: calc(100% - 88px); width: calc(100% - 88px);
.username { .username {

16
app/javascript/styles/mastodon/emoji_picker.scss
View File

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

2
app/javascript/styles/mastodon/footer.scss
View File

@ -2,7 +2,7 @@
text-align: center; text-align: center;
margin-top: 30px; margin-top: 30px;
font-size: 12px; font-size: 12px;
color: darken($ui-secondary-color, 25%); color: $darker-text-color;
.domain { .domain {
font-weight: 500; font-weight: 500;

39
app/javascript/styles/mastodon/forms.scss
View File

@ -29,14 +29,14 @@ code {
span.hint { span.hint {
display: block; display: block;
color: $ui-primary-color; color: $darker-text-color;
font-size: 12px; font-size: 12px;
margin-top: 4px; margin-top: 4px;
} }
p.hint { p.hint {
margin-bottom: 15px; margin-bottom: 15px;
color: $ui-primary-color; color: $darker-text-color;
&.subtle-hint { &.subtle-hint {
text-align: center; text-align: center;
@ -44,10 +44,10 @@ code {
line-height: 18px; line-height: 18px;
margin-top: 15px; margin-top: 15px;
margin-bottom: 0; margin-bottom: 0;
color: $ui-primary-color; color: $darker-text-color;
a { a {
color: $ui-highlight-color; color: $highlight-text-color;
} }
} }
} }
@ -244,35 +244,35 @@ code {
} }
&:focus:invalid { &:focus:invalid {
border-bottom-color: $error-value-color; border-bottom-color: lighten($error-red, 12%);
} }
&:required:valid { &:required:valid {
border-bottom-color: $valid-value-color; border-bottom-color: lighten($error-red, 12%);
} }
&:active, &:active,
&:focus { &:focus {
border-bottom-color: $ui-highlight-color; border-bottom-color: $highlight-text-color;
background: rgba($base-overlay-background, 0.1); background: rgba($base-overlay-background, 0.1);
} }
} }
.input.field_with_errors { .input.field_with_errors {
label { label {
color: $error-value-color; color: lighten($error-red, 12%);
} }
input[type=text], input[type=text],
input[type=email], input[type=email],
input[type=password] { input[type=password] {
border-bottom-color: $error-value-color; border-bottom-color: lighten($error-red, 12%);
} }
.error { .error {
display: block; display: block;
font-weight: 500; font-weight: 500;
color: $error-value-color; color: lighten($error-red, 12%);
margin-top: 4px; margin-top: 4px;
} }
} }
@ -356,7 +356,7 @@ code {
padding: 7px 4px; padding: 7px 4px;
padding-bottom: 9px; padding-bottom: 9px;
font-size: 16px; font-size: 16px;
color: $ui-base-lighter-color; color: $darker-text-color;
font-family: inherit; font-family: inherit;
pointer-events: none; pointer-events: none;
cursor: default; cursor: default;
@ -366,7 +366,7 @@ code {
.flash-message { .flash-message {
background: lighten($ui-base-color, 8%); background: lighten($ui-base-color, 8%);
color: $ui-primary-color; color: $darker-text-color;
border-radius: 4px; border-radius: 4px;
padding: 15px 10px; padding: 15px 10px;
margin-bottom: 30px; margin-bottom: 30px;
@ -378,7 +378,6 @@ code {
} }
.oauth-code { .oauth-code {
color: $ui-secondary-color;
outline: 0; outline: 0;
box-sizing: border-box; box-sizing: border-box;
display: block; display: block;
@ -387,7 +386,7 @@ code {
padding: 10px; padding: 10px;
font-family: 'mastodon-font-monospace', monospace; font-family: 'mastodon-font-monospace', monospace;
background: $ui-base-color; background: $ui-base-color;
color: $ui-primary-color; color: $primary-text-color;
font-size: 14px; font-size: 14px;
margin: 0; margin: 0;
@ -426,7 +425,7 @@ code {
text-align: center; text-align: center;
a { a {
color: $ui-primary-color; color: $darker-text-color;
text-decoration: none; text-decoration: none;
&:hover { &:hover {
@ -439,7 +438,7 @@ code {
.follow-prompt { .follow-prompt {
margin-bottom: 30px; margin-bottom: 30px;
text-align: center; text-align: center;
color: $ui-primary-color; color: $darker-text-color;
h2 { h2 {
font-size: 16px; font-size: 16px;
@ -447,7 +446,7 @@ code {
} }
strong { strong {
color: $ui-secondary-color; color: $primary-text-color;
font-weight: 500; font-weight: 500;
@each $lang in $cjk-langs { @each $lang in $cjk-langs {
@ -484,7 +483,7 @@ code {
.qr-alternative { .qr-alternative {
margin-bottom: 20px; margin-bottom: 20px;
color: $ui-secondary-color; color: $darker-text-color;
flex: 150px; flex: 150px;
samp { samp {
@ -569,7 +568,7 @@ code {
.post-follow-actions { .post-follow-actions {
text-align: center; text-align: center;
color: $ui-primary-color; color: $darker-text-color;
div { div {
margin-bottom: 4px; margin-bottom: 4px;
@ -582,7 +581,7 @@ code {
h4 { h4 {
font-size: 16px; font-size: 16px;
color: $ui-base-lighter-color; color: $primary-text-color;
text-align: center; text-align: center;
margin-bottom: 20px; margin-bottom: 20px;
border: 0; border: 0;

8
app/javascript/styles/mastodon/landing_strip.scss
View File

@ -1,7 +1,7 @@
.landing-strip, .landing-strip,
.memoriam-strip { .memoriam-strip {
background: rgba(darken($ui-base-color, 7%), 0.8); background: rgba(darken($ui-base-color, 7%), 0.8);
color: $ui-primary-color; color: $darker-text-color;
font-weight: 400; font-weight: 400;
padding: 14px; padding: 14px;
border-radius: 4px; border-radius: 4px;
@ -45,7 +45,7 @@
padding: 14px; padding: 14px;
border-radius: 4px; border-radius: 4px;
background: rgba(darken($ui-base-color, 7%), 0.8); background: rgba(darken($ui-base-color, 7%), 0.8);
color: $ui-secondary-color; color: $darker-text-color;
font-weight: 400; font-weight: 400;
margin-bottom: 20px; margin-bottom: 20px;
@ -88,7 +88,7 @@
.fa { .fa {
margin-right: 5px; margin-right: 5px;
color: $ui-primary-color; color: $darker-text-color;
} }
} }
@ -103,7 +103,7 @@
text-decoration: none; text-decoration: none;
span { span {
color: $ui-highlight-color; color: $highlight-text-color;
font-weight: 400; font-weight: 400;
} }
} }

32
app/javascript/styles/mastodon/stream_entries.scss
View File

@ -84,7 +84,7 @@
font-size: 14px; font-size: 14px;
.status__relative-time { .status__relative-time {
color: $ui-primary-color; color: $lighter-text-color;
} }
} }
} }
@ -93,7 +93,7 @@
display: block; display: block;
max-width: 100%; max-width: 100%;
padding-right: 25px; padding-right: 25px;
color: $ui-base-color; color: $lighter-text-color;
} }
.status__avatar { .status__avatar {
@ -123,7 +123,7 @@
strong { strong {
font-weight: 500; font-weight: 500;
color: $ui-base-color; color: $inverted-text-color;
@each $lang in $cjk-langs { @each $lang in $cjk-langs {
&:lang(#{$lang}) { &:lang(#{$lang}) {
@ -134,15 +134,15 @@
span { span {
font-size: 14px; font-size: 14px;
color: $ui-primary-color; color: $inverted-text-color;
} }
} }
.status__content { .status__content {
color: $ui-base-color; color: $inverted-text-color;
a { a {
color: $ui-highlight-color; color: $highlight-text-color;
} }
a.status__content__spoiler-link { a.status__content__spoiler-link {
@ -180,7 +180,7 @@
strong { strong {
font-weight: 500; font-weight: 500;
color: $ui-base-color; color: $inverted-text-color;
@each $lang in $cjk-langs { @each $lang in $cjk-langs {
&:lang(#{$lang}) { &:lang(#{$lang}) {
@ -191,7 +191,7 @@
span { span {
font-size: 14px; font-size: 14px;
color: $ui-primary-color; color: $lighter-text-color;
} }
} }
} }
@ -207,10 +207,10 @@
} }
.status__content { .status__content {
color: $ui-base-color; color: $inverted-text-color;
a { a {
color: $ui-highlight-color; color: $highlight-text-color;
} }
a.status__content__spoiler-link { a.status__content__spoiler-link {
@ -225,7 +225,7 @@
.detailed-status__meta { .detailed-status__meta {
margin-top: 15px; margin-top: 15px;
color: $ui-primary-color; color: $lighter-text-color;
font-size: 14px; font-size: 14px;
line-height: 18px; line-height: 18px;
@ -243,7 +243,7 @@
.status-card { .status-card {
border-color: lighten($ui-secondary-color, 4%); border-color: lighten($ui-secondary-color, 4%);
color: darken($ui-primary-color, 4%); color: $lighter-text-color;
&:hover { &:hover {
background: lighten($ui-secondary-color, 4%); background: lighten($ui-secondary-color, 4%);
@ -252,7 +252,7 @@
.status-card__title, .status-card__title,
.status-card__description { .status-card__description {
color: $ui-base-color; color: $inverted-text-color;
} }
.status-card__image { .status-card__image {
@ -262,7 +262,7 @@
.media-spoiler { .media-spoiler {
background: $ui-base-color; background: $ui-base-color;
color: $ui-primary-color; color: $darker-text-color;
} }
.pre-header { .pre-header {
@ -270,7 +270,7 @@
padding-left: (48px + 14px * 2); padding-left: (48px + 14px * 2);
padding-bottom: 0; padding-bottom: 0;
margin-bottom: -4px; margin-bottom: -4px;
color: $ui-primary-color; color: $lighter-text-color;
font-size: 14px; font-size: 14px;
position: relative; position: relative;
@ -280,7 +280,7 @@
} }
.status__display-name.muted strong { .status__display-name.muted strong {
color: $ui-primary-color; color: $lighter-text-color;
} }
} }

4
app/javascript/styles/mastodon/tables.scss
View File

@ -30,7 +30,7 @@
} }
a { a {
color: $ui-highlight-color; color: $highlight-text-color;
text-decoration: underline; text-decoration: underline;
&:hover { &:hover {
@ -68,7 +68,7 @@ a.table-action-link {
display: inline-block; display: inline-block;
margin-right: 5px; margin-right: 5px;
padding: 0 10px; padding: 0 10px;
color: rgba($primary-text-color, 0.7); color: $darker-text-color;
font-weight: 500; font-weight: 500;
&:hover { &:hover {

7
app/javascript/styles/mastodon/variables.scss
View File

@ -18,6 +18,11 @@ $base-overlay-background: $black !default;
$base-border-color: $white !default; $base-border-color: $white !default;
$simple-background-color: $white !default; $simple-background-color: $white !default;
$primary-text-color: $white !default; $primary-text-color: $white !default;
$darker-text-color: rgba($primary-text-color, 0.7) !default;
$highlight-text-color: $classic-highlight-color !default;
$inverted-text-color: $black !default;
$lighter-text-color: rgba($inverted-text-color, 0.7) !default;
$action-button-color: #8d9ac2;
$valid-value-color: $success-green !default; $valid-value-color: $success-green !default;
$error-value-color: $error-red !default; $error-value-color: $error-red !default;
@ -26,7 +31,7 @@ $ui-base-color: $classic-base-color !default; // Darkest
$ui-base-lighter-color: lighten($ui-base-color, 26%) !default; // Lighter darkest $ui-base-lighter-color: lighten($ui-base-color, 26%) !default; // Lighter darkest
$ui-primary-color: $classic-primary-color !default; // Lighter $ui-primary-color: $classic-primary-color !default; // Lighter
$ui-secondary-color: $classic-secondary-color !default; // Lightest $ui-secondary-color: $classic-secondary-color !default; // Lightest
$ui-highlight-color: $classic-highlight-color !default; // Vibrant $ui-highlight-color: #2b5fd9;
// Language codes that uses CJK fonts // Language codes that uses CJK fonts
$cjk-langs: ja, ko, zh-CN, zh-HK, zh-TW; $cjk-langs: ja, ko, zh-CN, zh-HK, zh-TW;