From 82408904a19b3f25323db97ff232c8f98f3aa3d1 Mon Sep 17 00:00:00 2001
From: imncls <himasoto@gmail.com>
Date: Sat, 24 Feb 2018 01:25:49 +0900
Subject: Update index.scss

---
 .../flavours/glitch/styles/components/index.scss   | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

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

diff --git a/app/javascript/flavours/glitch/styles/components/index.scss b/app/javascript/flavours/glitch/styles/components/index.scss
index 8f06209c6..10cad345e 100644
--- a/app/javascript/flavours/glitch/styles/components/index.scss
+++ b/app/javascript/flavours/glitch/styles/components/index.scss
@@ -40,14 +40,20 @@
     cursor: default;
   }
 
-  &.button-alternative {
+  &.button-primary,
+  &.button-alternative,
+  &.button-secondary,
+  &.button-alternative-2 {
     font-size: 16px;
     line-height: 36px;
     height: auto;
-    color: $ui-base-color;
-    background: $ui-primary-color;
     text-transform: none;
     padding: 4px 16px;
+  }
+
+  &.button-alternative {
+    color: $ui-base-color;
+    background: $ui-primary-color;
 
     &:active,
     &:focus,
@@ -56,6 +62,16 @@
     }
   }
 
+  &.button-alternative-2 {
+    background: $ui-base-lighter-color;
+
+    &:active,
+    &:focus,
+    &:hover {
+      background-color: lighten($ui-base-lighter-color, 4%);
+    }
+  }
+
   &.button-secondary {
     font-size: 16px;
     line-height: 36px;
-- 
cgit 


From 7bff3243ae5882ea9e9a708240a37dc10cffc246 Mon Sep 17 00:00:00 2001
From: imncls <himasoto@gmail.com>
Date: Sat, 24 Feb 2018 01:45:15 +0900
Subject: Update columns.scss

---
 .../flavours/glitch/styles/components/columns.scss       | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

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

diff --git a/app/javascript/flavours/glitch/styles/components/columns.scss b/app/javascript/flavours/glitch/styles/components/columns.scss
index 6e03650ed..30f7033ee 100644
--- a/app/javascript/flavours/glitch/styles/components/columns.scss
+++ b/app/javascript/flavours/glitch/styles/components/columns.scss
@@ -242,7 +242,6 @@
 
 .column-header {
   display: flex;
-  padding: 15px;
   font-size: 16px;
   background: lighten($ui-base-color, 4%);
   flex: 0 0 auto;
@@ -250,6 +249,21 @@
   position: relative;
   z-index: 2;
   outline: 0;
+  overflow: hidden;
+
+  & > button {
+    margin: 0;
+    border: none;
+    padding: 15px 0 15px 15px;
+    color: inherit;
+    background: transparent;
+    font: inherit;
+    text-align: left;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
+    flex: 1;
+  }
 
   &.active {
     box-shadow: 0 1px 0 rgba($ui-highlight-color, 0.3);
-- 
cgit 


From f2f19e1f8a3a048cf0a0041ae54d912acfea7742 Mon Sep 17 00:00:00 2001
From: imncls <himasoto@gmail.com>
Date: Sat, 24 Feb 2018 03:22:58 +0900
Subject: Update SCSS

---
 app/javascript/flavours/glitch/styles/about.scss              | 2 +-
 app/javascript/flavours/glitch/styles/basics.scss             | 1 +
 app/javascript/flavours/glitch/styles/components/columns.scss | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

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

diff --git a/app/javascript/flavours/glitch/styles/about.scss b/app/javascript/flavours/glitch/styles/about.scss
index a95b75984..2985f8947 100644
--- a/app/javascript/flavours/glitch/styles/about.scss
+++ b/app/javascript/flavours/glitch/styles/about.scss
@@ -722,10 +722,10 @@ $small-breakpoint: 960px;
       color: inherit;
       font-family: inherit;
       font-size: 16px;
+      padding: 15px;
       line-height: inherit;
       font-weight: inherit;
       margin: 0;
-      padding: 0;
     }
 
     .column {
diff --git a/app/javascript/flavours/glitch/styles/basics.scss b/app/javascript/flavours/glitch/styles/basics.scss
index b5d77ff63..15fbb1c89 100644
--- a/app/javascript/flavours/glitch/styles/basics.scss
+++ b/app/javascript/flavours/glitch/styles/basics.scss
@@ -118,5 +118,6 @@ button {
     height: 100%;
     align-items: center;
     justify-content: center;
+    outline: 0 !important;
   }
 }
diff --git a/app/javascript/flavours/glitch/styles/components/columns.scss b/app/javascript/flavours/glitch/styles/components/columns.scss
index 30f7033ee..5dcfab4d1 100644
--- a/app/javascript/flavours/glitch/styles/components/columns.scss
+++ b/app/javascript/flavours/glitch/styles/components/columns.scss
@@ -243,6 +243,7 @@
 .column-header {
   display: flex;
   font-size: 16px;
+  padding: 15px;
   background: lighten($ui-base-color, 4%);
   flex: 0 0 auto;
   cursor: pointer;
-- 
cgit