about summary refs log tree commit diff
path: root/app/javascript/styles/components.scss
diff options
context:
space:
mode:
authorunarist <m.unarist@gmail.com>2017-05-17 07:24:46 +0900
committerEugen Rochko <eugen@zeonfederated.com>2017-05-17 00:24:46 +0200
commit3722f908655b8de7669c89c10aeff10a2c07d277 (patch)
treea4238df047391c812cb01f77649be939e5387ac5 /app/javascript/styles/components.scss
parent9bddb946f069c9dc933da9b36a8a1d9769ecd898 (diff)
Make .column-collapse animation simple (#3086)
* Always set `overflow: auto` to allow scroll just after opening
* Remove bounce animation which may cause unintended behavior due to max-height
* Use CSS transition instead of react-motion
* Some CSS refactoring including className changing
Diffstat (limited to 'app/javascript/styles/components.scss')
-rw-r--r--app/javascript/styles/components.scss41
1 files changed, 26 insertions, 15 deletions
diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss
index 4de8b7969..3c90ae728 100644
--- a/app/javascript/styles/components.scss
+++ b/app/javascript/styles/components.scss
@@ -48,6 +48,32 @@
 
 .column-collapsable {
   position: relative;
+
+  .column-collapsable__content {
+    overflow: auto;
+    transition: 300ms ease;
+    opacity: 1;
+  }
+
+  &.collapsed .column-collapsable__content {
+    height: 0 !important;
+    opacity: 0;
+  }
+
+  .column-collapsable__button {
+    color: $primary-text-color;
+    background: lighten($ui-base-color, 8%);
+
+    &:hover {
+      color: $primary-text-color;
+      background: lighten($ui-base-color, 8%);
+    }
+  }
+
+  &.collapsed .column-collapsable__button {
+    color: $ui-primary-color;
+    background: lighten($ui-base-color, 4%);
+  }
 }
 
 .column-icon {
@@ -1984,21 +2010,6 @@ button.icon-button.active i.fa-retweet {
   text-align: center;
 }
 
-.collapsable-collapsed {
-  color: $ui-primary-color;
-  background: lighten($ui-base-color, 4%);
-}
-
-.collapsable {
-  color: $primary-text-color;
-  background: lighten($ui-base-color, 8%);
-
-  &:hover {
-    color: $primary-text-color;
-    background: lighten($ui-base-color, 8%);
-  }
-}
-
 .video-error-cover {
   align-items: center;
   background: $base-overlay-background;