From d7a17f9834c67b522144fc4a6476321709d3afcf Mon Sep 17 00:00:00 2001
From: Baptiste Lemoine <contact@cipherbliss.com>
Date: Sat, 4 Jan 2020 16:27:50 +0100
Subject: [PATCH] fix some columns show on smaller screens

---
 .../features/ui/components/link_footer.js     |  2 +-
 .../styles/bliss/accessibility.scss           |  4 +--
 app/javascript/styles/bliss/basics.scss       | 30 +++++++++++++++++++
 app/javascript/styles/bliss/components.scss   |  3 ++
 app/javascript/styles/bliss/footer.scss       |  6 +++-
 app/javascript/styles/bliss/variables.scss    | 26 ++++++++--------
 app/javascript/styles/custom.scss             | 30 -------------------
 .../styles/mastodon/containers.scss           |  2 +-
 8 files changed, 54 insertions(+), 49 deletions(-)

diff --git a/app/javascript/mastodon/features/ui/components/link_footer.js b/app/javascript/mastodon/features/ui/components/link_footer.js
index f007b0a6e..d263fd86e 100644
--- a/app/javascript/mastodon/features/ui/components/link_footer.js
+++ b/app/javascript/mastodon/features/ui/components/link_footer.js
@@ -103,7 +103,7 @@ class LinkFooter extends React.PureComponent {
 
     return (
 
-      <div className='getting-started__footer'>
+      <div className='getting-started__footer hide-on-smaller-screens'>
 
         <div className='extras'>
 
diff --git a/app/javascript/styles/bliss/accessibility.scss b/app/javascript/styles/bliss/accessibility.scss
index ebe8a1f36..76b07987a 100644
--- a/app/javascript/styles/bliss/accessibility.scss
+++ b/app/javascript/styles/bliss/accessibility.scss
@@ -13,6 +13,4 @@ $black-emojis: '8ball' 'ant' 'back' 'black_circle' 'black_heart' 'black_large_sq
   }
 }
 
-.fa {
-  margin-right: 1ch;
-}
+
diff --git a/app/javascript/styles/bliss/basics.scss b/app/javascript/styles/bliss/basics.scss
index 2c9e13d18..42cdae7aa 100644
--- a/app/javascript/styles/bliss/basics.scss
+++ b/app/javascript/styles/bliss/basics.scss
@@ -162,3 +162,33 @@ button {
 }
 
 
+.media-gallery {
+  margin-left: 0;
+}
+
+.debug, .well {
+  padding: 0.5rem;
+  border: solid 1px greenyellow;
+  background: yellow;
+  color: #222;
+
+}
+
+.spacer {
+  display: block;
+  padding: 1em;
+}
+
+.small-texts {
+  .timelines {
+    .column-link {
+
+
+    }
+
+    span {
+      display: none;
+    }
+  }
+}
+
diff --git a/app/javascript/styles/bliss/components.scss b/app/javascript/styles/bliss/components.scss
index 60e617466..6e6af8a4d 100644
--- a/app/javascript/styles/bliss/components.scss
+++ b/app/javascript/styles/bliss/components.scss
@@ -2265,6 +2265,9 @@ a.account__display-name {
   .columns-area__panels__pane--compositional {
     display: none;
   }
+  .hide-on-smaller-screens{
+    display: none;
+  }
 }
 
 @media screen and (min-width: 600px + (285px * 1) + (10px * 1)) {
diff --git a/app/javascript/styles/bliss/footer.scss b/app/javascript/styles/bliss/footer.scss
index 46fc97453..e325bd161 100644
--- a/app/javascript/styles/bliss/footer.scss
+++ b/app/javascript/styles/bliss/footer.scss
@@ -141,10 +141,14 @@
   position: fixed;
   bottom: 0;
   left: 1em;
-  width: 32vw;
+  width: 268px;
   z-index: 10;
   text-align: right;
 
+  .fa {
+    margin-right: 1ch;
+  }
+
   ul {
     list-style-type: none;
   }
diff --git a/app/javascript/styles/bliss/variables.scss b/app/javascript/styles/bliss/variables.scss
index a82c44229..7b84e6e7d 100644
--- a/app/javascript/styles/bliss/variables.scss
+++ b/app/javascript/styles/bliss/variables.scss
@@ -1,16 +1,16 @@
 // Commonly used web colors
-$black: #000000;            // Black
-$white: #ffffff;            // White
-$success-green: #79bd9a !default;    // Padua
-$error-red: #df405a !default;        // Cerise
-$warning-red: #ff5050 !default;      // Sunset Orange
-$gold-star: #ca8f04 !default;        // Dark Goldenrod
+$black: #111; // Black
+$white: #fff; // White
+$success-green: #6bbd77 !default; // Padua
+$error-red: #d4839b !default; // Cerise
+$warning-red: #528dc8 !default; // Sunset Orange
+$gold-star: #98c6ff !default; // Dark Goldenrod
 
 // Values from the classic Mastodon UI
-$classic-base-color: #282c37;         // Midnight Express
-$classic-primary-color: #9baec8;      // Echo Blue
-$classic-secondary-color: #d9e1e8;    // Pattens Blue
-$classic-highlight-color: #2b90d9;    // Summer Sky
+$classic-base-color: #282c37; // Midnight Express
+$classic-primary-color: #9baec8; // Echo Blue
+$classic-secondary-color: #d9e1e8; // Pattens Blue
+$classic-highlight-color: #2b90d9; // Summer Sky
 
 // Variables for defaults in UI
 $base-shadow-color: $black !default;
@@ -21,10 +21,10 @@ $valid-value-color: $success-green !default;
 $error-value-color: $error-red !default;
 
 // Tell UI to use selected colors
-$ui-base-color: $classic-base-color !default;                  // Darkest
+$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-primary-color: $classic-primary-color !default; // Lighter
+$ui-secondary-color: $classic-secondary-color !default; // Lightest
 $ui-highlight-color: $classic-highlight-color !default;
 
 // Variables for texts
diff --git a/app/javascript/styles/custom.scss b/app/javascript/styles/custom.scss
index 7c2d75d74..0b5a69c15 100644
--- a/app/javascript/styles/custom.scss
+++ b/app/javascript/styles/custom.scss
@@ -21,36 +21,6 @@ $media-modal-media-max-width: 100%;
 $media-modal-media-max-height: 80%;
 // fix
 
-.media-gallery {
-  margin-left: 0;
-}
-
 // then we import the rest of the world
 @import 'application';
 @import 'bliss/messaging';
-
-.debug, .well {
-  padding: 0.5rem;
-  border: solid 1px greenyellow;
-  background: yellow;
-  color: #222;
-
-}
-
-.spacer {
-  display: block;
-  padding: 1em;
-}
-
-.small-texts {
-  .timelines {
-    .column-link {
-
-
-    }
-
-    span {
-      display: none;
-    }
-  }
-}
diff --git a/app/javascript/styles/mastodon/containers.scss b/app/javascript/styles/mastodon/containers.scss
index 51d9b46b0..10a748dfa 100644
--- a/app/javascript/styles/mastodon/containers.scss
+++ b/app/javascript/styles/mastodon/containers.scss
@@ -21,7 +21,7 @@
     justify-content: center;
     align-items: center;
 
-    svg {
+    > svg {
       fill: $primary-text-color;
       height: 42px;
       margin-right: 10px;