From 271738e5a9dccd0fed8d402d67eb3f8d2719c1dd Mon Sep 17 00:00:00 2001
From: Baptiste Lemoine <contact@cipherbliss.com>
Date: Sat, 1 Feb 2020 17:43:33 +0100
Subject: [PATCH] hop

---
 app/javascript/styles/bliss.scss              |  2 ++
 app/javascript/styles/custom.scss             | 26 ----------------
 app/javascript/styles/large_center.scss       | 31 -------------------
 .../styles/mastodon-light/variables.scss      |  2 +-
 .../preferences/appearance/show.html.haml     |  3 +-
 5 files changed, 5 insertions(+), 59 deletions(-)

diff --git a/app/javascript/styles/bliss.scss b/app/javascript/styles/bliss.scss
index 2e45ff0c7..762aa1a06 100644
--- a/app/javascript/styles/bliss.scss
+++ b/app/javascript/styles/bliss.scss
@@ -28,3 +28,5 @@
 @import 'bliss/dashboard';
 @import 'bliss/rtl';
 @import 'bliss/accessibility';
+
+
diff --git a/app/javascript/styles/custom.scss b/app/javascript/styles/custom.scss
index e32e35bcc..e69de29bb 100644
--- a/app/javascript/styles/custom.scss
+++ b/app/javascript/styles/custom.scss
@@ -1,26 +0,0 @@
-//@import 'large_center';
-//// custom sheet made on https://www.cipherbliss.com
-//// Commonly used web colors
-//$black: #fff; // Black
-//$white: #000; // White
-//$success-green: #6bbd77 !default; // Padua
-//$error-red: #d4839b !default; // Cerise
-//$warning-red: #528dc8 !default; // Sunset Orange
-//$gold-star: #00ec84 !default; // Dark Goldenrod
-//
-//// User Interface Colors
-//$ui-base-color: #313644; // Midnight Express
-//$ui-base-lighter-color: #bdd2d6;
-//$ui-primary-color: #a1ccff; // Echo Blue
-//$ui-secondary-color: #7fc0ff; // Pattens Blue
-//$ui-highlight-color: #00a7d1; // Summer Sky
-//
-//// Variables for components
-//$media-modal-media-max-width: 100%;
-//// put margins on top and bottom of image to avoid the screen covered by image.
-//$media-modal-media-max-height: 80%;
-//// fix
-//
-//// then we import the rest of the world
-//@import 'application';
-//@import 'bliss/messaging';
diff --git a/app/javascript/styles/large_center.scss b/app/javascript/styles/large_center.scss
index 173dd80a1..e69de29bb 100644
--- a/app/javascript/styles/large_center.scss
+++ b/app/javascript/styles/large_center.scss
@@ -1,31 +0,0 @@
-.column {
-  width: 35em;
-}
-
-.drawer__inner__mastodon > img {
-  padding: 1rem;
-  box-sizing: border-box;
-}
-
-.compose-form__publish-button-wrapper .button {
-  background: #a1bded
-}
-
-div[aria-label="Accueil"],
-div[aria-label="Notifications"] {
-  width: 27em;
-}
-
-.media-gallery {
-  width: 115%;
-  max-height: 500px;
-}
-
-.media-gallery,
-.status-card.compact.interactive {
-  margin-left: -4.4em;
-}
-
-.status-card__image-image {
-  width: 100% !important;
-}
diff --git a/app/javascript/styles/mastodon-light/variables.scss b/app/javascript/styles/mastodon-light/variables.scss
index c68944528..cf0e40371 100644
--- a/app/javascript/styles/mastodon-light/variables.scss
+++ b/app/javascript/styles/mastodon-light/variables.scss
@@ -13,7 +13,7 @@ $success-green: lighten(#3c754d, 8%);
 $base-overlay-background: $white !default;
 $valid-value-color: $success-green !default;
 
-$ui-base-color: $classic-secondary-color !default;
+$ui-base-color: $classic-secondary-color !important;
 $ui-base-lighter-color: #b0c0cf;
 $ui-primary-color: #9bcbed;
 $ui-secondary-color: $classic-base-color !default;
diff --git a/app/views/settings/preferences/appearance/show.html.haml b/app/views/settings/preferences/appearance/show.html.haml
index d2b05513e..cd1646d28 100644
--- a/app/views/settings/preferences/appearance/show.html.haml
+++ b/app/views/settings/preferences/appearance/show.html.haml
@@ -6,7 +6,7 @@
     .fields-group.fields-row__column.fields-row__column-6
       = f.input :locale, collection: I18n.available_locales, wrapper: :with_label, include_blank: false, label_method: lambda { |locale| human_locale(locale) }, selected: I18n.locale, hint: false
     .fields-group.fields-row__column.fields-row__column-6
-      = f.input :setting_theme, collection: Themes.instance.names, label_method: lambda { |theme| I18n.t("themes.#{theme}", default: theme) }, wrapper: :with_label, include_blank: false, hint: false
+      = f.input :setting_theme, collection: Themes.instance.names, label_method: lambda { |theme| I18n.t("themes.#{theme}", default: theme) }, wrapper: :with_label, include_blank: false, hint: true
 
   - unless I18n.locale == :en
     .flash-message{ style: "text-align: unset; color: unset" }
@@ -59,3 +59,4 @@
 
   .actions
     = f.button :button, t('generic.save_changes'), type: :submit
+