From a6d47ac5f5e7f747c6a5211110cfa4c7730eea3c Mon Sep 17 00:00:00 2001
From: Thibaut Girka <thib@sitedethib.com>
Date: Thu, 20 Sep 2018 18:07:52 +0200
Subject: [Glitch] Port SCSS changes from upstream

Port SCSS changes from:
- a58ec29631f74259364dc71b408a8d66df657149
- cdfe51e3253edc219116e9276f9416cda95c4461
- 1f6ed4f86ab2aa98bb271b40bf381370fab4fdf2
- 617f40fc2bb6057aa6a823b1750a53e8bd1504f6
- 6a0d4d36adb3b2efbd145a40248ee40bdbbb163f
- 2374a00c1062a70e9092d88579e1351e4c8128f9
- a2cabf3f4af9271d8bfdb13c1ae2b7a8b4e6fb88
---
 app/javascript/flavours/glitch/styles/forms.scss | 44 +++++++++++++++++++++---
 app/javascript/flavours/glitch/styles/rtl.scss   |  8 ++++-
 2 files changed, 47 insertions(+), 5 deletions(-)

(limited to 'app/javascript/flavours/glitch/styles')

diff --git a/app/javascript/flavours/glitch/styles/forms.scss b/app/javascript/flavours/glitch/styles/forms.scss
index f97890187..18019c29c 100644
--- a/app/javascript/flavours/glitch/styles/forms.scss
+++ b/app/javascript/flavours/glitch/styles/forms.scss
@@ -50,6 +50,12 @@ code {
         color: $highlight-text-color;
       }
     }
+
+    code {
+      border-radius: 3px;
+      padding: 0.2em 0.4em;
+      background: darken($ui-base-color, 12%);
+    }
   }
 
   .card {
@@ -136,6 +142,8 @@ code {
   }
 
   .input.with_block_label {
+    padding-top: 15px;
+
     & > label {
       font-family: inherit;
       font-size: 16px;
@@ -148,9 +156,8 @@ code {
       margin-bottom: 15px;
     }
 
-    li {
-      float: left;
-      width: 50%;
+    ul {
+      columns: 2;
     }
   }
 
@@ -346,7 +353,7 @@ code {
     position: relative;
 
     .input input {
-      padding-right: 127px;
+      padding-right: 142px;
     }
 
     .append {
@@ -360,6 +367,20 @@ code {
       font-family: inherit;
       pointer-events: none;
       cursor: default;
+      max-width: 140px;
+      white-space: nowrap;
+      overflow: hidden;
+
+      &::after {
+        content: '';
+        display: block;
+        position: absolute;
+        top: 0;
+        right: 0;
+        bottom: 1px;
+        width: 5px;
+        background-image: linear-gradient(to right, rgba($ui-base-color, 0), $ui-base-color);
+      }
     }
   }
 }
@@ -592,3 +613,18 @@ code {
     display: block;
   }
 }
+
+.scope-danger {
+  color: $warning-red;
+}
+
+.form_admin_settings_site_short_description,
+.form_admin_settings_site_description,
+.form_admin_settings_site_extended_description,
+.form_admin_settings_site_terms,
+.form_admin_settings_custom_css,
+.form_admin_settings_closed_registrations_message {
+  textarea {
+    font-family: 'mastodon-font-monospace', monospace;
+  }
+}
diff --git a/app/javascript/flavours/glitch/styles/rtl.scss b/app/javascript/flavours/glitch/styles/rtl.scss
index e9099a9e9..b8c0efad8 100644
--- a/app/javascript/flavours/glitch/styles/rtl.scss
+++ b/app/javascript/flavours/glitch/styles/rtl.scss
@@ -206,13 +206,19 @@ body.rtl {
   }
 
   .simple_form .input-with-append .input input {
-    padding-left: 127px;
+    padding-left: 142px;
     padding-right: 0;
   }
 
   .simple_form .input-with-append .append {
     right: auto;
     left: 0;
+
+    &::after {
+      right: auto;
+      left: 0;
+      background-image: linear-gradient(to left, rgba($ui-base-color, 0), $ui-base-color);
+    }
   }
 
   .table th,
-- 
cgit