cybrespace
/
mastodon
4
3
Fork 3
Code Issues 7 Pull Requests Releases Activity

Separate high contrast theme (#7213)

This commit is contained in:
Lynx Kotoura 2018-04-22 04:35:55 +09:00 committed by Eugen Rochko
parent d10447c3a8
commit a4a36d994b
16 changed files with 187 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/javascript/styles/contrast.scss Normal file
View File

@ -0,0 +1,3 @@
@import 'contrast/variables';
@import 'application';
@import 'contrast/diff';

14
app/javascript/styles/contrast/diff.scss Normal file
View File

@ -0,0 +1,14 @@
// components.scss
.compose-form {
.compose-form__modifiers {
.compose-form__upload {
&-description {
input {
&::placeholder {
opacity: 1.0;
}
}
}
}
}
}

22
app/javascript/styles/contrast/variables.scss Normal file
View File

@ -0,0 +1,22 @@
// Dependent colors
$black: #000000;
$classic-base-color: #282c37;
$classic-primary-color: #9baec8;
$classic-secondary-color: #d9e1e8;
$ui-base-color: $classic-base-color !default;
$ui-primary-color: $classic-primary-color !default;
$ui-secondary-color: $classic-secondary-color !default;
// Differences
$ui-highlight-color: #2b5fd9;
$darker-text-color: lighten($ui-primary-color, 20%) !default;
$dark-text-color: lighten($ui-primary-color, 12%) !default;
$secondary-text-color: lighten($ui-secondary-color, 6%) !default;
$action-button-color: #8d9ac2;
$inverted-text-color: $black !default;
$lighter-text-color: darken($ui-base-color,6%) !default;
$light-text-color: darken($ui-primary-color, 40%) !default;

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

@ -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: transparentize($darker-text-color, 0.1); color: lighten($darker-text-color, 10%);
} }
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: $primary-text-color; color: $secondary-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: opacify($darker-text-color, 0.1); color: lighten($darker-text-color, 10%);
} }
} }
@ -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: $primary-text-color; color: $secondary-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: $primary-text-color; color: $secondary-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: $primary-text-color; color: $secondary-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: $primary-text-color; color: $secondary-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: $primary-text-color; color: $secondary-text-color;
} }
ul, ul,
@ -405,7 +405,7 @@ $small-breakpoint: 960px;
font-size: 14px; font-size: 14px;
&:hover { &:hover {
color: $darker-text-color; color: $secondary-text-color;
} }
} }
@ -517,7 +517,7 @@ $small-breakpoint: 960px;
span { span {
&:last-child { &:last-child {
color: $darker-text-color; color: $secondary-text-color;
} }
} }
@ -559,7 +559,7 @@ $small-breakpoint: 960px;
a, a,
span { span {
font-weight: 400; font-weight: 400;
color: opacify($darker-text-color, 0.1); color: darken($darker-text-color, 10%);
} }
a { a {
@ -775,7 +775,7 @@ $small-breakpoint: 960px;
} }
p a { p a {
color: $darker-text-color; color: $secondary-text-color;
} }
h1 { h1 {
@ -787,7 +787,7 @@ $small-breakpoint: 960px;
color: $darker-text-color; color: $darker-text-color;
span { span {
color: $darker-text-color; color: $secondary-text-color;
} }
} }
} }
@ -896,7 +896,7 @@ $small-breakpoint: 960px;
} }
a { a {
color: $darker-text-color; color: $secondary-text-color;
text-decoration: none; text-decoration: none;
} }
} }
@ -980,7 +980,7 @@ $small-breakpoint: 960px;
.footer-links { .footer-links {
padding-bottom: 50px; padding-bottom: 50px;
text-align: right; text-align: right;
color: $darker-text-color; color: $dark-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: $darker-text-color; color: $dark-text-color;
p { p {
font-size: 14px; font-size: 14px;

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

@ -178,7 +178,7 @@
font-size: 14px; font-size: 14px;
line-height: 18px; line-height: 18px;
padding: 0 15px; padding: 0 15px;
color: $darker-text-color; color: $secondary-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: $lighter-text-color; color: $inverted-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: $primary-text-color; color: $secondary-text-color;
} }
.older { .older {
@ -293,7 +293,7 @@
.disabled { .disabled {
cursor: default; cursor: default;
color: opacify($lighter-text-color, 0.1); color: lighten($inverted-text-color, 10%);
} }
@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: $lighter-text-color; color: $inverted-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: opacify($lighter-text-color, 0.04); background-color: lighten($inverted-text-color, 4%);
background-size: cover; background-size: cover;
background-position: center; background-position: center;
position: relative; position: relative;
@ -422,7 +422,7 @@
.account__header__content { .account__header__content {
padding: 10px 15px; padding: 10px 15px;
padding-top: 15px; padding-top: 15px;
color: transparentize($lighter-text-color, 0.1); color: $lighter-text-color;
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: $lighter-text-color; color: $light-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: $inverted-text-color; color: $light-text-color;
} }
} }
@ -508,7 +508,7 @@
.account__header__content { .account__header__content {
font-size: 14px; font-size: 14px;
color: $darker-text-color; color: $inverted-text-color;
} }
} }
@ -586,7 +586,7 @@
font-weight: 500; font-weight: 500;
text-align: center; text-align: center;
width: 94px; width: 94px;
color: opacify($darker-text-color, 0.1); color: $secondary-text-color;
background: rgba(darken($ui-base-color, 8%), 0.5); background: rgba(darken($ui-base-color, 8%), 0.5);
} }

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

@ -90,7 +90,7 @@
padding-left: 25px; padding-left: 25px;
h2 { h2 {
color: $primary-text-color; color: $secondary-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: $primary-text-color; color: $secondary-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: $primary-text-color; color: $darker-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: $primary-text-color; color: $secondary-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: $darker-text-color; color: $secondary-text-color;
margin-bottom: 20px; margin-bottom: 20px;
strong { strong {
@ -292,7 +292,7 @@
font-weight: 500; font-weight: 500;
font-size: 14px; font-size: 14px;
line-height: 18px; line-height: 18px;
color: $primary-text-color; color: $secondary-text-color;
@each $lang in $cjk-langs { @each $lang in $cjk-langs {
&:lang(#{$lang}) { &:lang(#{$lang}) {
@ -420,7 +420,7 @@
} }
&__timestamp { &__timestamp {
color: $darker-text-color; color: $dark-text-color;
} }
&__extras { &__extras {
@ -437,7 +437,7 @@
&__icon { &__icon {
font-size: 28px; font-size: 28px;
margin-right: 10px; margin-right: 10px;
color: $darker-text-color; color: $dark-text-color;
} }
&__icon__overlay { &__icon__overlay {
@ -464,7 +464,7 @@
a, a,
.username, .username,
.target { .target {
color: $primary-text-color; color: $secondary-text-color;
text-decoration: none; text-decoration: none;
font-weight: 500; font-weight: 500;
} }
@ -474,7 +474,7 @@
} }
.diff-neutral { .diff-neutral {
color: $darker-text-color; color: $secondary-text-color;
} }
.diff-new { .diff-new {
@ -487,7 +487,7 @@ a.name-tag,
display: flex; display: flex;
align-items: center; align-items: center;
text-decoration: none; text-decoration: none;
color: $ui-secondary-color; color: $secondary-text-color;
.avatar { .avatar {
display: block; display: block;
@ -535,7 +535,7 @@ a.name-tag,
font-weight: 500; font-weight: 500;
a { a {
color: $ui-primary-color; color: $darker-text-color;
} }
} }
@ -545,6 +545,6 @@ a.name-tag,
} }
time { time {
color: $darker-text-color; color: $dark-text-color;
} }
} }

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: $primary-text-color; color: $darker-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: $darker-text-color; color: $secondary-text-color;
} }
img { img {

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

@ -31,7 +31,7 @@
&:active, &:active,
&:focus, &:focus,
&:hover { &:hover {
background-color: lighten($ui-highlight-color, 4%); background-color: lighten($ui-highlight-color, 10%);
transition: all 200ms ease-out; transition: all 200ms ease-out;
} }
@ -83,7 +83,7 @@
} }
&.button-secondary { &.button-secondary {
color: $ui-primary-color; color: $darker-text-color;
background: transparent; background: transparent;
padding: 3px 15px; padding: 3px 15px;
border: 1px solid $ui-primary-color; border: 1px solid $ui-primary-color;
@ -92,7 +92,7 @@
&:focus, &:focus,
&:hover { &:hover {
border-color: lighten($ui-primary-color, 4%); border-color: lighten($ui-primary-color, 4%);
color: lighten($ui-primary-color, 4%); color: lighten($darker-text-color, 4%);
} }
} }
@ -149,18 +149,18 @@
&:hover, &:hover,
&:active, &:active,
&:focus { &:focus {
color: transparentize($lighter-text-color, 0.07); color: darken($lighter-text-color, 7%);
} }
&.disabled { &.disabled {
color: opacify($lighter-text-color, 0.07); color: lighten($lighter-text-color, 7%);
} }
&.active { &.active {
color: $highlight-text-color; color: $highlight-text-color;
&.disabled { &.disabled {
color: opacify($lighter-text-color, 0.13); color: lighten($highlight-text-color, 13%);
} }
} }
} }
@ -193,12 +193,12 @@
&:hover, &:hover,
&:active, &:active,
&:focus { &:focus {
color: opacify($lighter-text-color, 0.07); color: darken($lighter-text-color, 7%);
transition: color 200ms ease-out; transition: color 200ms ease-out;
} }
&.disabled { &.disabled {
color: transparentize($lighter-text-color, 0.2); color: lighten($lighter-text-color, 20%);
cursor: default; cursor: default;
} }
@ -349,7 +349,7 @@
box-shadow: 4px 4px 6px rgba($base-shadow-color, 0.4); box-shadow: 4px 4px 6px rgba($base-shadow-color, 0.4);
background: $ui-secondary-color; background: $ui-secondary-color;
border-radius: 0 0 4px 4px; border-radius: 0 0 4px 4px;
color: $lighter-text-color; color: $inverted-text-color;
font-size: 14px; font-size: 14px;
padding: 6px; padding: 6px;
@ -457,7 +457,7 @@
input { input {
background: transparent; background: transparent;
color: $primary-text-color; color: $secondary-text-color;
border: 0; border: 0;
padding: 0; padding: 0;
margin: 0; margin: 0;
@ -471,8 +471,8 @@
} }
&::placeholder { &::placeholder {
opacity: 0.54; opacity: 0.75;
color: $darker-text-color; color: $secondary-text-color;
} }
} }
@ -588,7 +588,7 @@
} }
.reply-indicator__display-name { .reply-indicator__display-name {
color: $lighter-text-color; color: $inverted-text-color;
display: block; display: block;
max-width: 100%; max-width: 100%;
line-height: 24px; line-height: 24px;
@ -643,14 +643,14 @@
} }
a { a {
color: $ui-secondary-color; color: $secondary-text-color;
text-decoration: none; text-decoration: none;
&:hover { &:hover {
text-decoration: underline; text-decoration: underline;
.fa { .fa {
color: lighten($action-button-color, 7%); color: lighten($dark-text-color, 7%);
} }
} }
@ -665,7 +665,7 @@
} }
.fa { .fa {
color: $action-button-color; color: $dark-text-color;
} }
} }
@ -769,7 +769,7 @@
&.light { &.light {
.status__relative-time { .status__relative-time {
color: $lighter-text-color; color: $light-text-color;
} }
.status__display-name { .status__display-name {
@ -782,7 +782,7 @@
} }
span { span {
color: $lighter-text-color; color: $light-text-color;
} }
} }
@ -816,13 +816,13 @@
} }
.status__relative-time { .status__relative-time {
color: $darker-text-color; color: $dark-text-color;
float: right; float: right;
font-size: 14px; font-size: 14px;
} }
.status__display-name { .status__display-name {
color: $darker-text-color; color: $dark-text-color;
} }
.status__info .status__display-name { .status__info .status__display-name {
@ -873,14 +873,14 @@
.status__prepend { .status__prepend {
margin-left: 68px; margin-left: 68px;
color: $darker-text-color; color: $dark-text-color;
padding: 8px 0; padding: 8px 0;
padding-bottom: 2px; padding-bottom: 2px;
font-size: 14px; font-size: 14px;
position: relative; position: relative;
.status__display-name strong { .status__display-name strong {
color: $darker-text-color; color: $dark-text-color;
} }
> span { > span {
@ -942,7 +942,7 @@
.detailed-status__meta { .detailed-status__meta {
margin-top: 15px; margin-top: 15px;
color: $darker-text-color; color: $dark-text-color;
font-size: 14px; font-size: 14px;
line-height: 18px; line-height: 18px;
} }
@ -1091,7 +1091,7 @@ a .account__avatar {
} }
.account__header__username { .account__header__username {
color: $darker-text-color; color: $secondary-text-color;
} }
} }
@ -1101,7 +1101,7 @@ a .account__avatar {
} }
.account__header__content { .account__header__content {
color: $darker-text-color; color: $secondary-text-color;
} }
.account__header__display-name { .account__header__display-name {
@ -1129,7 +1129,7 @@ a .account__avatar {
.account__disclaimer { .account__disclaimer {
padding: 10px; padding: 10px;
border-top: 1px solid lighten($ui-base-color, 8%); border-top: 1px solid lighten($ui-base-color, 8%);
color: $darker-text-color; color: $dark-text-color;
strong { strong {
font-weight: 500; font-weight: 500;
@ -1316,7 +1316,7 @@ a.account__display-name {
} }
.detailed-status__display-name { .detailed-status__display-name {
color: $darker-text-color; color: $secondary-text-color;
display: block; display: block;
line-height: 24px; line-height: 24px;
margin-bottom: 15px; margin-bottom: 15px;
@ -1351,11 +1351,11 @@ a.account__display-name {
.muted { .muted {
.status__content p, .status__content p,
.status__content a { .status__content a {
color: $darker-text-color; color: $dark-text-color;
} }
.status__display-name strong { .status__display-name strong {
color: $darker-text-color; color: $dark-text-color;
} }
.status__avatar { .status__avatar {
@ -1363,11 +1363,11 @@ a.account__display-name {
} }
a.status__content__spoiler-link { a.status__content__spoiler-link {
background: $darker-text-color; background: $ui-base-lighter-color;
color: lighten($ui-base-color, 4%); color: $inverted-text-color;
&:hover { &:hover {
background: transparentize($darker-text-color, 0.07); background: lighten($ui-base-lighter-color, 7%);
text-decoration: none; text-decoration: none;
} }
} }
@ -1378,7 +1378,7 @@ a.account__display-name {
padding: 8px 0; padding: 8px 0;
padding-bottom: 0; padding-bottom: 0;
cursor: default; cursor: default;
color: $ui-primary-color; color: $darker-text-color;
font-size: 15px; font-size: 15px;
position: relative; position: relative;
@ -1489,7 +1489,7 @@ a.account__display-name {
color: $darker-text-color; color: $darker-text-color;
strong { strong {
color: $primary-text-color; color: $secondary-text-color;
} }
a { a {
@ -1603,7 +1603,7 @@ a.account__display-name {
&:hover, &:hover,
&:active { &:active {
background: $ui-highlight-color; background: $ui-highlight-color;
color: $primary-text-color; color: $secondary-text-color;
outline: 0; outline: 0;
} }
} }
@ -1656,7 +1656,7 @@ a.account__display-name {
&:hover { &:hover {
background: $ui-highlight-color; background: $ui-highlight-color;
color: $primary-text-color; color: $secondary-text-color;
} }
} }
} }
@ -1668,7 +1668,7 @@ a.account__display-name {
.static-content { .static-content {
padding: 10px; padding: 10px;
padding-top: 20px; padding-top: 20px;
color: $darker-text-color; color: $dark-text-color;
h1 { h1 {
font-size: 16px; font-size: 16px;
@ -1755,7 +1755,7 @@ a.account__display-name {
display: block; display: block;
flex: 1 1 auto; flex: 1 1 auto;
padding: 15px 5px 13px; padding: 15px 5px 13px;
color: $ui-primary-color; color: $darker-text-color;
text-decoration: none; text-decoration: none;
text-align: center; text-align: center;
font-size: 16px; font-size: 16px;
@ -2167,7 +2167,7 @@ a.account__display-name {
.column-subheading { .column-subheading {
background: $ui-base-color; background: $ui-base-color;
color: $darker-text-color; color: $dark-text-color;
padding: 8px 20px; padding: 8px 20px;
font-size: 12px; font-size: 12px;
font-weight: 500; font-weight: 500;
@ -2190,11 +2190,11 @@ a.account__display-name {
flex: 1 0 auto; flex: 1 0 auto;
p { p {
color: $darker-text-color; color: $secondary-text-color;
} }
a { a {
color: opacify($darker-text-color, 0.07); color: $dark-text-color;
} }
} }
@ -2275,7 +2275,7 @@ a.account__display-name {
font-size: 14px; font-size: 14px;
border: 1px solid lighten($ui-base-color, 8%); border: 1px solid lighten($ui-base-color, 8%);
border-radius: 4px; border-radius: 4px;
color: $darker-text-color; color: $dark-text-color;
margin-top: 14px; margin-top: 14px;
text-decoration: none; text-decoration: none;
overflow: hidden; overflow: hidden;
@ -2355,7 +2355,7 @@ a.status-card {
display: block; display: block;
font-weight: 500; font-weight: 500;
margin-bottom: 5px; margin-bottom: 5px;
color: $ui-primary-color; color: $darker-text-color;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
@ -2369,7 +2369,7 @@ a.status-card {
} }
.status-card__description { .status-card__description {
color: $ui-primary-color; color: $darker-text-color;
} }
.status-card__host { .status-card__host {
@ -2413,7 +2413,7 @@ a.status-card {
.load-more { .load-more {
display: block; display: block;
color: $darker-text-color; color: $dark-text-color;
background-color: transparent; background-color: transparent;
border: 0; border: 0;
font-size: inherit; font-size: inherit;
@ -2437,7 +2437,7 @@ a.status-card {
text-align: center; text-align: center;
font-size: 16px; font-size: 16px;
font-weight: 500; font-weight: 500;
color: opacify($darker-text-color, 0.07); color: $dark-text-color;
background: $ui-base-color; background: $ui-base-color;
cursor: default; cursor: default;
display: flex; display: flex;
@ -2477,7 +2477,7 @@ a.status-card {
strong { strong {
display: block; display: block;
margin-bottom: 10px; margin-bottom: 10px;
color: $darker-text-color; color: $dark-text-color;
} }
span { span {
@ -2565,13 +2565,13 @@ a.status-card {
.column-header__button { .column-header__button {
background: lighten($ui-base-color, 4%); background: lighten($ui-base-color, 4%);
border: 0; border: 0;
color: $ui-primary-color; color: $darker-text-color;
cursor: pointer; cursor: pointer;
font-size: 16px; font-size: 16px;
padding: 0 15px; padding: 0 15px;
&:hover { &:hover {
color: lighten($ui-primary-color, 7%); color: lighten($darker-text-color, 7%);
} }
&.active { &.active {
@ -2652,7 +2652,7 @@ a.status-card {
} }
.loading-indicator { .loading-indicator {
color: $darker-text-color; color: $dark-text-color;
font-size: 12px; font-size: 12px;
font-weight: 400; font-weight: 400;
text-transform: uppercase; text-transform: uppercase;
@ -2749,7 +2749,7 @@ a.status-card {
&:active, &:active,
&:focus { &:focus {
padding: 0; padding: 0;
color: transparentize($darker-text-color, 0.07); color: lighten($darker-text-color, 8%);
} }
} }
@ -2873,7 +2873,7 @@ a.status-card {
.empty-column-indicator, .empty-column-indicator,
.error-column { .error-column {
color: $darker-text-color; color: $dark-text-color;
background: $ui-base-color; background: $ui-base-color;
text-align: center; text-align: center;
padding: 20px; padding: 20px;
@ -3075,7 +3075,7 @@ a.status-card {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
color: $primary-text-color; color: $secondary-text-color;
font-size: 18px; font-size: 18px;
font-weight: 500; font-weight: 500;
border: 2px dashed $ui-base-lighter-color; border: 2px dashed $ui-base-lighter-color;
@ -3173,7 +3173,7 @@ a.status-card {
} }
.privacy-dropdown__option { .privacy-dropdown__option {
color: $lighter-text-color; color: $inverted-text-color;
padding: 10px; padding: 10px;
cursor: pointer; cursor: pointer;
display: flex; display: flex;
@ -3295,7 +3295,7 @@ a.status-card {
font-size: 18px; font-size: 18px;
width: 18px; width: 18px;
height: 18px; height: 18px;
color: $ui-secondary-color; color: $secondary-text-color;
cursor: default; cursor: default;
pointer-events: none; pointer-events: none;
@ -3331,7 +3331,7 @@ a.status-card {
} }
.search-results__header { .search-results__header {
color: $darker-text-color; color: $dark-text-color;
background: lighten($ui-base-color, 2%); background: lighten($ui-base-color, 2%);
border-bottom: 1px solid darken($ui-base-color, 4%); border-bottom: 1px solid darken($ui-base-color, 4%);
padding: 15px 10px; padding: 15px 10px;
@ -3379,13 +3379,13 @@ a.status-card {
.search-results__hashtag { .search-results__hashtag {
display: block; display: block;
padding: 10px; padding: 10px;
color: darken($primary-text-color, 4%); color: $secondary-text-color;
text-decoration: none; text-decoration: none;
&:hover, &:hover,
&:active, &:active,
&:focus { &:focus {
color: $primary-text-color; color: lighten($secondary-text-color, 4%);
text-decoration: underline; text-decoration: underline;
} }
} }
@ -3650,7 +3650,7 @@ a.status-card {
&:hover, &:hover,
&:focus, &:focus,
&:active { &:active {
color: transparentize($lighter-text-color, 0.04); color: darken($lighter-text-color, 4%);
background-color: darken($ui-secondary-color, 16%); background-color: darken($ui-secondary-color, 16%);
} }
@ -3744,7 +3744,7 @@ a.status-card {
strong { strong {
font-weight: 500; font-weight: 500;
background: $ui-base-color; background: $ui-base-color;
color: $primary-text-color; color: $secondary-text-color;
border-radius: 4px; border-radius: 4px;
font-size: 14px; font-size: 14px;
padding: 3px 6px; padding: 3px 6px;
@ -3804,7 +3804,7 @@ a.status-card {
&__case { &__case {
background: $ui-base-color; background: $ui-base-color;
color: $primary-text-color; color: $secondary-text-color;
font-weight: 500; font-weight: 500;
padding: 10px; padding: 10px;
border-radius: 4px; border-radius: 4px;
@ -3821,7 +3821,7 @@ a.status-card {
.figure { .figure {
background: darken($ui-base-color, 8%); background: darken($ui-base-color, 8%);
color: $darker-text-color; color: $secondary-text-color;
margin-bottom: 20px; margin-bottom: 20px;
border-radius: 4px; border-radius: 4px;
padding: 10px; padding: 10px;
@ -3933,7 +3933,7 @@ a.status-card {
} }
.status__content__spoiler-link { .status__content__spoiler-link {
color: lighten($ui-secondary-color, 8%); color: lighten($secondary-text-color, 8%);
} }
} }
@ -4163,7 +4163,7 @@ a.status-card {
&:hover, &:hover,
&:focus, &:focus,
&:active { &:active {
color: transparentize($lighter-text-color, 0.04); color: darken($lighter-text-color, 4%);
} }
} }
} }
@ -4244,7 +4244,7 @@ a.status-card {
&__icon { &__icon {
flex: 0 0 auto; flex: 0 0 auto;
color: $darker-text-color; color: $dark-text-color;
padding: 8px 18px; padding: 8px 18px;
cursor: default; cursor: default;
border-right: 1px solid lighten($ui-base-color, 8%); border-right: 1px solid lighten($ui-base-color, 8%);
@ -4274,7 +4274,7 @@ a.status-card {
a { a {
text-decoration: none; text-decoration: none;
color: $darker-text-color; color: $dark-text-color;
font-weight: 500; font-weight: 500;
&:hover { &:hover {
@ -4293,7 +4293,7 @@ a.status-card {
} }
.fa { .fa {
color: $darker-text-color; color: $dark-text-color;
} }
} }
} }
@ -4329,7 +4329,7 @@ a.status-card {
cursor: zoom-in; cursor: zoom-in;
display: block; display: block;
text-decoration: none; text-decoration: none;
color: $ui-secondary-color; color: $secondary-text-color;
line-height: 0; line-height: 0;
&, &,
@ -4500,7 +4500,7 @@ a.status-card {
&:hover, &:hover,
&:active, &:active,
&:focus { &:focus {
color: transparentize($darker-text-color, 0.07); color: lighten($darker-text-color, 7%);
} }
} }
@ -4705,7 +4705,7 @@ a.status-card {
&:active, &:active,
&:focus { &:focus {
outline: 0; outline: 0;
color: transparentize($darker-text-color, 0.07); color: $secondary-text-color;
&::before { &::before {
content: ""; content: "";
@ -4745,7 +4745,7 @@ a.status-card {
position: relative; position: relative;
&.active { &.active {
color: transparentize($darker-text-color, 0.07); color: $secondary-text-color;
&::before, &::before,
&::after { &::after {
@ -4780,12 +4780,12 @@ a.status-card {
padding: 10px 14px; padding: 10px 14px;
padding-bottom: 14px; padding-bottom: 14px;
margin-top: 10px; margin-top: 10px;
color: $lighter-text-color; color: $light-text-color;
box-shadow: 2px 4px 15px rgba($base-shadow-color, 0.4); box-shadow: 2px 4px 15px rgba($base-shadow-color, 0.4);
h4 { h4 {
text-transform: uppercase; text-transform: uppercase;
color: $lighter-text-color; color: $light-text-color;
font-size: 13px; font-size: 13px;
font-weight: 500; font-weight: 500;
margin-bottom: 10px; margin-bottom: 10px;
@ -4817,7 +4817,7 @@ noscript {
div { div {
font-size: 14px; font-size: 14px;
margin: 30px auto; margin: 30px auto;
color: $primary-text-color; color: $secondary-text-color;
max-width: 400px; max-width: 400px;
a { a {
@ -4970,7 +4970,7 @@ noscript {
&__message { &__message {
position: relative; position: relative;
margin-left: 58px; margin-left: 58px;
color: $darker-text-color; color: $dark-text-color;
padding: 8px 0; padding: 8px 0;
padding-top: 0; padding-top: 0;
padding-bottom: 4px; padding-bottom: 4px;

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

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

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

@ -50,7 +50,7 @@
cursor: pointer; cursor: pointer;
&:hover { &:hover {
color: opacify($lighter-text-color, 0.04); color: darken($lighter-text-color, 4%);
} }
} }
@ -184,7 +184,7 @@
font-size: 14px; font-size: 14px;
text-align: center; text-align: center;
padding-top: 70px; padding-top: 70px;
color: $lighter-text-color; color: $light-text-color;
.emoji-mart-category-label { .emoji-mart-category-label {
display: none; display: none;

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

@ -248,7 +248,7 @@ code {
} }
&:required:valid { &:required:valid {
border-bottom-color: lighten($error-red, 12%); border-bottom-color: $valid-value-color;
} }
&:active, &:active,
@ -266,7 +266,7 @@ code {
input[type=text], input[type=text],
input[type=email], input[type=email],
input[type=password] { input[type=password] {
border-bottom-color: lighten($error-red, 12%); border-bottom-color: $valid-value-color;
} }
.error { .error {
@ -356,7 +356,7 @@ code {
padding: 7px 4px; padding: 7px 4px;
padding-bottom: 9px; padding-bottom: 9px;
font-size: 16px; font-size: 16px;
color: $darker-text-color; color: $dark-text-color;
font-family: inherit; font-family: inherit;
pointer-events: none; pointer-events: none;
cursor: default; cursor: default;
@ -446,7 +446,7 @@ code {
} }
strong { strong {
color: $primary-text-color; color: $secondary-text-color;
font-weight: 500; font-weight: 500;
@each $lang in $cjk-langs { @each $lang in $cjk-langs {
@ -483,7 +483,7 @@ code {
.qr-alternative { .qr-alternative {
margin-bottom: 20px; margin-bottom: 20px;
color: $darker-text-color; color: $secondary-text-color;
flex: 150px; flex: 150px;
samp { samp {

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

@ -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: $darker-text-color; color: $secondary-text-color;
font-weight: 400; font-weight: 400;
margin-bottom: 20px; margin-bottom: 20px;

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

@ -93,7 +93,7 @@
display: block; display: block;
max-width: 100%; max-width: 100%;
padding-right: 25px; padding-right: 25px;
color: $lighter-text-color; color: $inverted-text-color;
} }
.status__avatar { .status__avatar {
@ -134,7 +134,7 @@
span { span {
font-size: 14px; font-size: 14px;
color: $inverted-text-color; color: $light-text-color;
} }
} }
@ -191,7 +191,7 @@
span { span {
font-size: 14px; font-size: 14px;
color: $lighter-text-color; color: $light-text-color;
} }
} }
} }
@ -225,7 +225,7 @@
.detailed-status__meta { .detailed-status__meta {
margin-top: 15px; margin-top: 15px;
color: $lighter-text-color; color: $light-text-color;
font-size: 14px; font-size: 14px;
line-height: 18px; line-height: 18px;
@ -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: $lighter-text-color; color: $light-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: $lighter-text-color; color: $light-text-color;
} }
} }
@ -293,7 +293,7 @@
} }
.more { .more {
color: $classic-primary-color; color: $darker-text-color;
display: block; display: block;
padding: 14px; padding: 14px;
text-align: center; text-align: center;

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

@ -17,12 +17,6 @@ $base-shadow-color: $black !default;
$base-overlay-background: $black !default; $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;
$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;
@ -31,7 +25,19 @@ $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: #2b5fd9; $ui-highlight-color: $classic-highlight-color !default;
// Variables for texts
$primary-text-color: $white !default;
$darker-text-color: $ui-primary-color !default;
$dark-text-color: $ui-base-lighter-color !default;
$secondary-text-color: $ui-secondary-color !default;
$highlight-text-color: $ui-highlight-color !default;
$action-button-color: $ui-base-lighter-color !default;
// For texts on inverted backgrounds
$inverted-text-color: $ui-base-color !default;
$lighter-text-color: $ui-base-lighter-color !default;
$light-text-color: $ui-primary-color !default;
// 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;

1
config/locales/en.yml
View File

@ -785,6 +785,7 @@ en:
<p>Originally adapted from the <a href="https://github.com/discourse/discourse">Discourse privacy policy</a>.</p> <p>Originally adapted from the <a href="https://github.com/discourse/discourse">Discourse privacy policy</a>.</p>
title: "%{instance} Terms of Service and Privacy Policy" title: "%{instance} Terms of Service and Privacy Policy"
themes: themes:
contrast: High contrast
default: Mastodon default: Mastodon
time: time:
formats: formats:

1
config/themes.yml
View File

@ -1 +1,2 @@
default: styles/application.scss default: styles/application.scss
contrast: styles/contrast.scss