Separate high contrast theme (#7213)

2018-04-22 04:35:55 +09:00
parent d10447c3a8
commit a4a36d994b
16 changed files with 187 additions and 140 deletions
--- a/app/javascript/styles/contrast.scss
+++ b/app/javascript/styles/contrast.scss
@@ -0,0 +1,3 @@
+@import 'contrast/variables';
+@import 'application';
+@import 'contrast/diff';
--- a/app/javascript/styles/contrast/diff.scss
+++ b/app/javascript/styles/contrast/diff.scss
@@ -0,0 +1,14 @@
+// components.scss
+.compose-form {
+  .compose-form__modifiers {
+    .compose-form__upload {
+      &-description {
+        input {
+          &::placeholder {
+            opacity: 1.0;
+          }
+        }
+      }
+    }
+  }
+}
--- a/app/javascript/styles/contrast/variables.scss
+++ b/app/javascript/styles/contrast/variables.scss
@@ -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;
--- a/app/javascript/styles/mastodon/about.scss
+++ b/app/javascript/styles/mastodon/about.scss
@@ -225,7 +225,7 @@ $small-breakpoint: 960px;
    font-family: inherit;
    font-size: inherit;
    line-height: inherit;
-    color: transparentize($darker-text-color, 0.1);
+    color: lighten($darker-text-color, 10%);
  }

  h1 {
@@ -234,14 +234,14 @@ $small-breakpoint: 960px;
    line-height: 30px;
    font-weight: 500;
    margin-bottom: 20px;
-    color: $primary-text-color;
+    color: $secondary-text-color;

    small {
      font-family: 'mastodon-font-sans-serif', sans-serif;
      display: block;
      font-size: 18px;
      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;
    font-weight: 500;
    margin-bottom: 20px;
-    color: $primary-text-color;
+    color: $secondary-text-color;
  }

  h3 {
@@ -260,7 +260,7 @@ $small-breakpoint: 960px;
    line-height: 24px;
    font-weight: 500;
    margin-bottom: 20px;
-    color: $primary-text-color;
+    color: $secondary-text-color;
  }

  h4 {
@@ -269,7 +269,7 @@ $small-breakpoint: 960px;
    line-height: 24px;
    font-weight: 500;
    margin-bottom: 20px;
-    color: $primary-text-color;
+    color: $secondary-text-color;
  }

  h5 {
@@ -278,7 +278,7 @@ $small-breakpoint: 960px;
    line-height: 24px;
    font-weight: 500;
    margin-bottom: 20px;
-    color: $primary-text-color;
+    color: $secondary-text-color;
  }

  h6 {
@@ -287,7 +287,7 @@ $small-breakpoint: 960px;
    line-height: 24px;
    font-weight: 500;
    margin-bottom: 20px;
-    color: $primary-text-color;
+    color: $secondary-text-color;
  }

  ul,
@@ -405,7 +405,7 @@ $small-breakpoint: 960px;
        font-size: 14px;

        &:hover {
-          color: $darker-text-color;
+          color: $secondary-text-color;
        }
      }

@@ -517,7 +517,7 @@ $small-breakpoint: 960px;

      span {
        &:last-child {
-          color: $darker-text-color;
+          color: $secondary-text-color;
        }
      }

@@ -559,7 +559,7 @@ $small-breakpoint: 960px;
        a,
        span {
          font-weight: 400;
-          color: opacify($darker-text-color, 0.1);
+          color: darken($darker-text-color, 10%);
        }

        a {
@@ -775,7 +775,7 @@ $small-breakpoint: 960px;
    }

    p a {
-      color: $darker-text-color;
+      color: $secondary-text-color;
    }

    h1 {
@@ -787,7 +787,7 @@ $small-breakpoint: 960px;
        color: $darker-text-color;

        span {
-          color: $darker-text-color;
+          color: $secondary-text-color;
        }
      }
    }
@@ -896,7 +896,7 @@ $small-breakpoint: 960px;
      }

      a {
-        color: $darker-text-color;
+        color: $secondary-text-color;
        text-decoration: none;
      }
    }
@@ -980,7 +980,7 @@ $small-breakpoint: 960px;
  .footer-links {
    padding-bottom: 50px;
    text-align: right;
-    color: $darker-text-color;
+    color: $dark-text-color;

    p {
      font-size: 14px;
@@ -995,7 +995,7 @@ $small-breakpoint: 960px;
  &__footer {
    margin-top: 10px;
    text-align: center;
-    color: $darker-text-color;
+    color: $dark-text-color;

    p {
      font-size: 14px;
--- a/app/javascript/styles/mastodon/accounts.scss
+++ b/app/javascript/styles/mastodon/accounts.scss
@@ -178,7 +178,7 @@
    font-size: 14px;
    line-height: 18px;
    padding: 0 15px;
-    color: $darker-text-color;
+    color: $secondary-text-color;
  }

  @media screen and (max-width: 480px) {
@@ -256,7 +256,7 @@
  .current {
    background: $simple-background-color;
    border-radius: 100px;
-    color: $lighter-text-color;
+    color: $inverted-text-color;
    cursor: default;
    margin: 0 10px;
  }
@@ -268,7 +268,7 @@
  .older,
  .newer {
    text-transform: uppercase;
-    color: $primary-text-color;
+    color: $secondary-text-color;
  }

  .older {
@@ -293,7 +293,7 @@

  .disabled {
    cursor: default;
-    color: opacify($lighter-text-color, 0.1);
+    color: lighten($inverted-text-color, 10%);
  }

  @media screen and (max-width: 700px) {
@@ -332,7 +332,7 @@
    width: 335px;
    background: $simple-background-color;
    border-radius: 4px;
-    color: $lighter-text-color;
+    color: $inverted-text-color;
    margin: 0 5px 10px;
    position: relative;

@@ -344,7 +344,7 @@
      overflow: hidden;
      height: 100px;
      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-position: center;
      position: relative;
@@ -422,7 +422,7 @@
    .account__header__content {
      padding: 10px 15px;
      padding-top: 15px;
-      color: transparentize($lighter-text-color, 0.1);
+      color: $lighter-text-color;
      word-wrap: break-word;
      overflow: hidden;
      text-overflow: ellipsis;
@@ -434,7 +434,7 @@
 .nothing-here {
  width: 100%;
  display: block;
-  color: $lighter-text-color;
+  color: $light-text-color;
  font-size: 14px;
  font-weight: 500;
  text-align: center;
@@ -493,7 +493,7 @@

      span {
        font-size: 14px;
-        color: $inverted-text-color;
+        color: $light-text-color;
      }
    }

@@ -508,7 +508,7 @@

  .account__header__content {
    font-size: 14px;
-    color: $darker-text-color;
+    color: $inverted-text-color;
  }
 }

@@ -586,7 +586,7 @@
    font-weight: 500;
    text-align: center;
    width: 94px;
-    color: opacify($darker-text-color, 0.1);
+    color: $secondary-text-color;
    background: rgba(darken($ui-base-color, 8%), 0.5);
  }

--- a/app/javascript/styles/mastodon/admin.scss
+++ b/app/javascript/styles/mastodon/admin.scss
@@ -90,7 +90,7 @@
    padding-left: 25px;

    h2 {
-      color: $primary-text-color;
+      color: $secondary-text-color;
      font-size: 24px;
      line-height: 28px;
      font-weight: 400;
@@ -98,7 +98,7 @@
    }

    h3 {
-      color: $primary-text-color;
+      color: $secondary-text-color;
      font-size: 20px;
      line-height: 28px;
      font-weight: 400;
@@ -109,7 +109,7 @@
      text-transform: uppercase;
      font-size: 13px;
      font-weight: 500;
-      color: $primary-text-color;
+      color: $darker-text-color;
      padding-bottom: 8px;
      margin-bottom: 8px;
      border-bottom: 1px solid lighten($ui-base-color, 8%);
@@ -117,7 +117,7 @@

    h6 {
      font-size: 16px;
-      color: $primary-text-color;
+      color: $secondary-text-color;
      line-height: 28px;
      font-weight: 400;
    }
@@ -125,7 +125,7 @@
    & > p {
      font-size: 14px;
      line-height: 18px;
-      color: $darker-text-color;
+      color: $secondary-text-color;
      margin-bottom: 20px;

      strong {
@@ -292,7 +292,7 @@
    font-weight: 500;
    font-size: 14px;
    line-height: 18px;
-    color: $primary-text-color;
+    color: $secondary-text-color;

    @each $lang in $cjk-langs {
      &:lang(#{$lang}) {
@@ -420,7 +420,7 @@
  }

  &__timestamp {
-    color: $darker-text-color;
+    color: $dark-text-color;
  }

  &__extras {
@@ -437,7 +437,7 @@
  &__icon {
    font-size: 28px;
    margin-right: 10px;
-    color: $darker-text-color;
+    color: $dark-text-color;
  }

  &__icon__overlay {
@@ -464,7 +464,7 @@
  a,
  .username,
  .target {
-    color: $primary-text-color;
+    color: $secondary-text-color;
    text-decoration: none;
    font-weight: 500;
  }
@@ -474,7 +474,7 @@
  }

  .diff-neutral {
-    color: $darker-text-color;
+    color: $secondary-text-color;
  }

  .diff-new {
@@ -487,7 +487,7 @@ a.name-tag,
  display: flex;
  align-items: center;
  text-decoration: none;
-  color: $ui-secondary-color;
+  color: $secondary-text-color;

  .avatar {
    display: block;
@@ -535,7 +535,7 @@ a.name-tag,
    font-weight: 500;

    a {
-      color: $ui-primary-color;
+      color: $darker-text-color;
    }
  }

@@ -545,6 +545,6 @@ a.name-tag,
  }

  time {
-    color: $darker-text-color;
+    color: $dark-text-color;
  }
 }
--- a/app/javascript/styles/mastodon/compact_header.scss
+++ b/app/javascript/styles/mastodon/compact_header.scss
@@ -2,7 +2,7 @@
  h1 {
    font-size: 24px;
    line-height: 28px;
-    color: $primary-text-color;
+    color: $darker-text-color;
    font-weight: 500;
    margin-bottom: 20px;
    padding: 0 10px;
@@ -20,7 +20,7 @@

    small {
      font-weight: 400;
-      color: $darker-text-color;
+      color: $secondary-text-color;
    }

    img {
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -31,7 +31,7 @@
  &:active,
  &:focus,
  &:hover {
-    background-color: lighten($ui-highlight-color, 4%);
+    background-color: lighten($ui-highlight-color, 10%);
    transition: all 200ms ease-out;
  }

@@ -83,7 +83,7 @@
  }

  &.button-secondary {
-    color: $ui-primary-color;
+    color: $darker-text-color;
    background: transparent;
    padding: 3px 15px;
    border: 1px solid $ui-primary-color;
@@ -92,7 +92,7 @@
    &:focus,
    &:hover {
      border-color: lighten($ui-primary-color, 4%);
-      color: lighten($ui-primary-color, 4%);
+      color: lighten($darker-text-color, 4%);
    }
  }

@@ -149,18 +149,18 @@
    &:hover,
    &:active,
    &:focus {
-      color: transparentize($lighter-text-color, 0.07);
+      color: darken($lighter-text-color, 7%);
    }

    &.disabled {
-      color: opacify($lighter-text-color, 0.07);
+      color: lighten($lighter-text-color, 7%);
    }

    &.active {
      color: $highlight-text-color;

      &.disabled {
-        color: opacify($lighter-text-color, 0.13);
+        color: lighten($highlight-text-color, 13%);
      }
    }
  }
@@ -193,12 +193,12 @@
  &:hover,
  &:active,
  &:focus {
-    color: opacify($lighter-text-color, 0.07);
+    color: darken($lighter-text-color, 7%);
    transition: color 200ms ease-out;
  }

  &.disabled {
-    color: transparentize($lighter-text-color, 0.2);
+    color: lighten($lighter-text-color, 20%);
    cursor: default;
  }

@@ -349,7 +349,7 @@
    box-shadow: 4px 4px 6px rgba($base-shadow-color, 0.4);
    background: $ui-secondary-color;
    border-radius: 0 0 4px 4px;
-    color: $lighter-text-color;
+    color: $inverted-text-color;
    font-size: 14px;
    padding: 6px;

@@ -457,7 +457,7 @@

        input {
          background: transparent;
-          color: $primary-text-color;
+          color: $secondary-text-color;
          border: 0;
          padding: 0;
          margin: 0;
@@ -471,8 +471,8 @@
          }

          &::placeholder {
-            opacity: 0.54;
-            color: $darker-text-color;
+            opacity: 0.75;
+            color: $secondary-text-color;
          }
        }

@@ -588,7 +588,7 @@
 }

 .reply-indicator__display-name {
-  color: $lighter-text-color;
+  color: $inverted-text-color;
  display: block;
  max-width: 100%;
  line-height: 24px;
@@ -643,14 +643,14 @@
  }

  a {
-    color: $ui-secondary-color;
+    color: $secondary-text-color;
    text-decoration: none;

    &:hover {
      text-decoration: underline;

      .fa {
-        color: lighten($action-button-color, 7%);
+        color: lighten($dark-text-color, 7%);
      }
    }

@@ -665,7 +665,7 @@
    }

    .fa {
-      color: $action-button-color;
+      color: $dark-text-color;
    }
  }

@@ -769,7 +769,7 @@

  &.light {
    .status__relative-time {
-      color: $lighter-text-color;
+      color: $light-text-color;
    }

    .status__display-name {
@@ -782,7 +782,7 @@
      }

      span {
-        color: $lighter-text-color;
+        color: $light-text-color;
      }
    }

@@ -816,13 +816,13 @@
 }

 .status__relative-time {
-  color: $darker-text-color;
+  color: $dark-text-color;
  float: right;
  font-size: 14px;
 }

 .status__display-name {
-  color: $darker-text-color;
+  color: $dark-text-color;
 }

 .status__info .status__display-name {
@@ -873,14 +873,14 @@

 .status__prepend {
  margin-left: 68px;
-  color: $darker-text-color;
+  color: $dark-text-color;
  padding: 8px 0;
  padding-bottom: 2px;
  font-size: 14px;
  position: relative;

  .status__display-name strong {
-    color: $darker-text-color;
+    color: $dark-text-color;
  }

  > span {
@@ -942,7 +942,7 @@

 .detailed-status__meta {
  margin-top: 15px;
-  color: $darker-text-color;
+  color: $dark-text-color;
  font-size: 14px;
  line-height: 18px;
 }
@@ -1091,7 +1091,7 @@ a .account__avatar {
    }

    .account__header__username {
-      color: $darker-text-color;
+      color: $secondary-text-color;
    }
  }

@@ -1101,7 +1101,7 @@ a .account__avatar {
  }

  .account__header__content {
-    color: $darker-text-color;
+    color: $secondary-text-color;
  }

  .account__header__display-name {
@@ -1129,7 +1129,7 @@ a .account__avatar {
 .account__disclaimer {
  padding: 10px;
  border-top: 1px solid lighten($ui-base-color, 8%);
-  color: $darker-text-color;
+  color: $dark-text-color;

  strong {
    font-weight: 500;
@@ -1316,7 +1316,7 @@ a.account__display-name {
 }

 .detailed-status__display-name {
-  color: $darker-text-color;
+  color: $secondary-text-color;
  display: block;
  line-height: 24px;
  margin-bottom: 15px;
@@ -1351,11 +1351,11 @@ a.account__display-name {
 .muted {
  .status__content p,
  .status__content a {
-    color: $darker-text-color;
+    color: $dark-text-color;
  }

  .status__display-name strong {
-    color: $darker-text-color;
+    color: $dark-text-color;
  }

  .status__avatar {
@@ -1363,11 +1363,11 @@ a.account__display-name {
  }

  a.status__content__spoiler-link {
-    background: $darker-text-color;
-    color: lighten($ui-base-color, 4%);
+    background: $ui-base-lighter-color;
+    color: $inverted-text-color;

    &:hover {
-      background: transparentize($darker-text-color, 0.07);
+      background: lighten($ui-base-lighter-color, 7%);
      text-decoration: none;
    }
  }
@@ -1378,7 +1378,7 @@ a.account__display-name {
  padding: 8px 0;
  padding-bottom: 0;
  cursor: default;
-  color: $ui-primary-color;
+  color: $darker-text-color;
  font-size: 15px;
  position: relative;

@@ -1489,7 +1489,7 @@ a.account__display-name {
  color: $darker-text-color;

  strong {
-    color: $primary-text-color;
+    color: $secondary-text-color;
  }

  a {
@@ -1603,7 +1603,7 @@ a.account__display-name {
    &:hover,
    &:active {
      background: $ui-highlight-color;
-      color: $primary-text-color;
+      color: $secondary-text-color;
      outline: 0;
    }
  }
@@ -1656,7 +1656,7 @@ a.account__display-name {

    &:hover {
      background: $ui-highlight-color;
-      color: $primary-text-color;
+      color: $secondary-text-color;
    }
  }
 }
@@ -1668,7 +1668,7 @@ a.account__display-name {
 .static-content {
  padding: 10px;
  padding-top: 20px;
-  color: $darker-text-color;
+  color: $dark-text-color;

  h1 {
    font-size: 16px;
@@ -1755,7 +1755,7 @@ a.account__display-name {
  display: block;
  flex: 1 1 auto;
  padding: 15px 5px 13px;
-  color: $ui-primary-color;
+  color: $darker-text-color;
  text-decoration: none;
  text-align: center;
  font-size: 16px;
@@ -2167,7 +2167,7 @@ a.account__display-name {

 .column-subheading {
  background: $ui-base-color;
-  color: $darker-text-color;
+  color: $dark-text-color;
  padding: 8px 20px;
  font-size: 12px;
  font-weight: 500;
@@ -2190,11 +2190,11 @@ a.account__display-name {
  flex: 1 0 auto;

  p {
-    color: $darker-text-color;
+    color: $secondary-text-color;
  }

  a {
-    color: opacify($darker-text-color, 0.07);
+    color: $dark-text-color;
  }
 }

@@ -2275,7 +2275,7 @@ a.account__display-name {
  font-size: 14px;
  border: 1px solid lighten($ui-base-color, 8%);
  border-radius: 4px;
-  color: $darker-text-color;
+  color: $dark-text-color;
  margin-top: 14px;
  text-decoration: none;
  overflow: hidden;
@@ -2355,7 +2355,7 @@ a.status-card {
  display: block;
  font-weight: 500;
  margin-bottom: 5px;
-  color: $ui-primary-color;
+  color: $darker-text-color;
  overflow: hidden;
  text-overflow: ellipsis;
  white-space: nowrap;
@@ -2369,7 +2369,7 @@ a.status-card {
 }

 .status-card__description {
-  color: $ui-primary-color;
+  color: $darker-text-color;
 }

 .status-card__host {
@@ -2413,7 +2413,7 @@ a.status-card {

 .load-more {
  display: block;
-  color: $darker-text-color;
+  color: $dark-text-color;
  background-color: transparent;
  border: 0;
  font-size: inherit;
@@ -2437,7 +2437,7 @@ a.status-card {
  text-align: center;
  font-size: 16px;
  font-weight: 500;
-  color: opacify($darker-text-color, 0.07);
+  color: $dark-text-color;
  background: $ui-base-color;
  cursor: default;
  display: flex;
@@ -2477,7 +2477,7 @@ a.status-card {
    strong {
      display: block;
      margin-bottom: 10px;
-      color: $darker-text-color;
+      color: $dark-text-color;
    }

    span {
@@ -2565,13 +2565,13 @@ a.status-card {
 .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 {
@@ -2652,7 +2652,7 @@ a.status-card {
 }

 .loading-indicator {
-  color: $darker-text-color;
+  color: $dark-text-color;
  font-size: 12px;
  font-weight: 400;
  text-transform: uppercase;
@@ -2749,7 +2749,7 @@ a.status-card {
  &:active,
  &:focus {
    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,
 .error-column {
-  color: $darker-text-color;
+  color: $dark-text-color;
  background: $ui-base-color;
  text-align: center;
  padding: 20px;
@@ -3075,7 +3075,7 @@ a.status-card {
  display: flex;
  align-items: center;
  justify-content: center;
-  color: $primary-text-color;
+  color: $secondary-text-color;
  font-size: 18px;
  font-weight: 500;
  border: 2px dashed $ui-base-lighter-color;
@@ -3173,7 +3173,7 @@ a.status-card {
 }

 .privacy-dropdown__option {
-  color: $lighter-text-color;
+  color: $inverted-text-color;
  padding: 10px;
  cursor: pointer;
  display: flex;
@@ -3295,7 +3295,7 @@ a.status-card {
    font-size: 18px;
    width: 18px;
    height: 18px;
-    color: $ui-secondary-color;
+    color: $secondary-text-color;
    cursor: default;
    pointer-events: none;

@@ -3331,7 +3331,7 @@ a.status-card {
 }

 .search-results__header {
-  color: $darker-text-color;
+  color: $dark-text-color;
  background: lighten($ui-base-color, 2%);
  border-bottom: 1px solid darken($ui-base-color, 4%);
  padding: 15px 10px;
@@ -3379,13 +3379,13 @@ a.status-card {
 .search-results__hashtag {
  display: block;
  padding: 10px;
-  color: darken($primary-text-color, 4%);
+  color: $secondary-text-color;
  text-decoration: none;

  &:hover,
  &:active,
  &:focus {
-    color: $primary-text-color;
+    color: lighten($secondary-text-color, 4%);
    text-decoration: underline;
  }
 }
@@ -3650,7 +3650,7 @@ a.status-card {
    &:hover,
    &:focus,
    &:active {
-      color: transparentize($lighter-text-color, 0.04);
+      color: darken($lighter-text-color, 4%);
      background-color: darken($ui-secondary-color, 16%);
    }

@@ -3744,7 +3744,7 @@ a.status-card {
    strong {
      font-weight: 500;
      background: $ui-base-color;
-      color: $primary-text-color;
+      color: $secondary-text-color;
      border-radius: 4px;
      font-size: 14px;
      padding: 3px 6px;
@@ -3804,7 +3804,7 @@ a.status-card {

  &__case {
    background: $ui-base-color;
-    color: $primary-text-color;
+    color: $secondary-text-color;
    font-weight: 500;
    padding: 10px;
    border-radius: 4px;
@@ -3821,7 +3821,7 @@ a.status-card {

  .figure {
    background: darken($ui-base-color, 8%);
-    color: $darker-text-color;
+    color: $secondary-text-color;
    margin-bottom: 20px;
    border-radius: 4px;
    padding: 10px;
@@ -3933,7 +3933,7 @@ a.status-card {
  }

  .status__content__spoiler-link {
-    color: lighten($ui-secondary-color, 8%);
+    color: lighten($secondary-text-color, 8%);
  }
 }

@@ -4163,7 +4163,7 @@ a.status-card {
    &:hover,
    &:focus,
    &:active {
-      color: transparentize($lighter-text-color, 0.04);
+      color: darken($lighter-text-color, 4%);
    }
  }
 }
@@ -4244,7 +4244,7 @@ a.status-card {

  &__icon {
    flex: 0 0 auto;
-    color: $darker-text-color;
+    color: $dark-text-color;
    padding: 8px 18px;
    cursor: default;
    border-right: 1px solid lighten($ui-base-color, 8%);
@@ -4274,7 +4274,7 @@ a.status-card {

    a {
      text-decoration: none;
-      color: $darker-text-color;
+      color: $dark-text-color;
      font-weight: 500;

      &:hover {
@@ -4293,7 +4293,7 @@ a.status-card {
    }

    .fa {
-      color: $darker-text-color;
+      color: $dark-text-color;
    }
  }
 }
@@ -4329,7 +4329,7 @@ a.status-card {
  cursor: zoom-in;
  display: block;
  text-decoration: none;
-  color: $ui-secondary-color;
+  color: $secondary-text-color;
  line-height: 0;

  &,
@@ -4500,7 +4500,7 @@ a.status-card {
      &:hover,
      &:active,
      &:focus {
-        color: transparentize($darker-text-color, 0.07);
+        color: lighten($darker-text-color, 7%);
      }
    }

@@ -4705,7 +4705,7 @@ a.status-card {
    &:active,
    &:focus {
      outline: 0;
-      color: transparentize($darker-text-color, 0.07);
+      color: $secondary-text-color;

      &::before {
        content: "";
@@ -4745,7 +4745,7 @@ a.status-card {
    position: relative;

    &.active {
-      color: transparentize($darker-text-color, 0.07);
+      color: $secondary-text-color;

      &::before,
      &::after {
@@ -4780,12 +4780,12 @@ a.status-card {
  padding: 10px 14px;
  padding-bottom: 14px;
  margin-top: 10px;
-  color: $lighter-text-color;
+  color: $light-text-color;
  box-shadow: 2px 4px 15px rgba($base-shadow-color, 0.4);

  h4 {
    text-transform: uppercase;
-    color: $lighter-text-color;
+    color: $light-text-color;
    font-size: 13px;
    font-weight: 500;
    margin-bottom: 10px;
@@ -4817,7 +4817,7 @@ noscript {
  div {
    font-size: 14px;
    margin: 30px auto;
-    color: $primary-text-color;
+    color: $secondary-text-color;
    max-width: 400px;

    a {
@@ -4970,7 +4970,7 @@ noscript {
  &__message {
    position: relative;
    margin-left: 58px;
-    color: $darker-text-color;
+    color: $dark-text-color;
    padding: 8px 0;
    padding-top: 0;
    padding-bottom: 4px;
--- a/app/javascript/styles/mastodon/containers.scss
+++ b/app/javascript/styles/mastodon/containers.scss
@@ -100,7 +100,7 @@

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

    .username {
--- a/app/javascript/styles/mastodon/emoji_picker.scss
+++ b/app/javascript/styles/mastodon/emoji_picker.scss
@@ -50,7 +50,7 @@
  cursor: pointer;

  &:hover {
-    color: opacify($lighter-text-color, 0.04);
+    color: darken($lighter-text-color, 4%);
  }
 }

@@ -184,7 +184,7 @@
  font-size: 14px;
  text-align: center;
  padding-top: 70px;
-  color: $lighter-text-color;
+  color: $light-text-color;

  .emoji-mart-category-label {
    display: none;
--- a/app/javascript/styles/mastodon/forms.scss
+++ b/app/javascript/styles/mastodon/forms.scss
@@ -248,7 +248,7 @@ code {
    }

    &:required:valid {
-      border-bottom-color: lighten($error-red, 12%);
+      border-bottom-color: $valid-value-color;
    }

    &:active,
@@ -266,7 +266,7 @@ code {
    input[type=text],
    input[type=email],
    input[type=password] {
-      border-bottom-color: lighten($error-red, 12%);
+      border-bottom-color: $valid-value-color;
    }

    .error {
@@ -356,7 +356,7 @@ code {
      padding: 7px 4px;
      padding-bottom: 9px;
      font-size: 16px;
-      color: $darker-text-color;
+      color: $dark-text-color;
      font-family: inherit;
      pointer-events: none;
      cursor: default;
@@ -446,7 +446,7 @@ code {
  }

  strong {
-    color: $primary-text-color;
+    color: $secondary-text-color;
    font-weight: 500;

    @each $lang in $cjk-langs {
@@ -483,7 +483,7 @@ code {

 .qr-alternative {
  margin-bottom: 20px;
-  color: $darker-text-color;
+  color: $secondary-text-color;
  flex: 150px;

  samp {
--- a/app/javascript/styles/mastodon/landing_strip.scss
+++ b/app/javascript/styles/mastodon/landing_strip.scss
@@ -45,7 +45,7 @@
  padding: 14px;
  border-radius: 4px;
  background: rgba(darken($ui-base-color, 7%), 0.8);
-  color: $darker-text-color;
+  color: $secondary-text-color;
  font-weight: 400;
  margin-bottom: 20px;

--- a/app/javascript/styles/mastodon/stream_entries.scss
+++ b/app/javascript/styles/mastodon/stream_entries.scss
@@ -93,7 +93,7 @@
      display: block;
      max-width: 100%;
      padding-right: 25px;
-      color: $lighter-text-color;
+      color: $inverted-text-color;
    }

    .status__avatar {
@@ -134,7 +134,7 @@

      span {
        font-size: 14px;
-        color: $inverted-text-color;
+        color: $light-text-color;
      }
    }

@@ -191,7 +191,7 @@

        span {
          font-size: 14px;
-          color: $lighter-text-color;
+          color: $light-text-color;
        }
      }
    }
@@ -225,7 +225,7 @@

    .detailed-status__meta {
      margin-top: 15px;
-      color: $lighter-text-color;
+      color: $light-text-color;
      font-size: 14px;
      line-height: 18px;

@@ -270,7 +270,7 @@
    padding-left: (48px + 14px * 2);
    padding-bottom: 0;
    margin-bottom: -4px;
-    color: $lighter-text-color;
+    color: $light-text-color;
    font-size: 14px;
    position: relative;

@@ -280,7 +280,7 @@
    }

    .status__display-name.muted strong {
-      color: $lighter-text-color;
+      color: $light-text-color;
    }
  }

@@ -293,7 +293,7 @@
  }

  .more {
-    color: $classic-primary-color;
+    color: $darker-text-color;
    display: block;
    padding: 14px;
    text-align: center;
--- a/app/javascript/styles/mastodon/variables.scss
+++ b/app/javascript/styles/mastodon/variables.scss
@@ -17,12 +17,6 @@ $base-shadow-color: $black !default;
 $base-overlay-background: $black !default;
 $base-border-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;
 $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-primary-color: $classic-primary-color !default;            // Lighter
 $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
 $cjk-langs: ja, ko, zh-CN, zh-HK, zh-TW;
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -785,6 +785,7 @@ en:
      <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"
  themes:
+    contrast: High contrast
    default: Mastodon
  time:
    formats:
--- a/config/themes.yml
+++ b/config/themes.yml
@@ -1 +1,2 @@
 default: styles/application.scss
+contrast: styles/contrast.scss