summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-04-18 14:14:45 +0100
committerPhil Hughes <me@iamphill.com>2018-04-18 14:14:45 +0100
commit8c5adf681bc4d1f3a5ce883fca41be540ad27119 (patch)
tree5e4d7c2f9624f4c0cd6a227fea9bbad2698ea55e /app/assets/stylesheets
parentfb3e23b06da10a90149aba0e2dbc3bca04286b0e (diff)
downloadgitlab-ce-8c5adf681bc4d1f3a5ce883fca41be540ad27119.tar.gz
updates to variable names to make more sense
fixed up duplicate is-collapsed classes
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r--app/assets/stylesheets/pages/repo.scss34
1 files changed, 18 insertions, 16 deletions
diff --git a/app/assets/stylesheets/pages/repo.scss b/app/assets/stylesheets/pages/repo.scss
index 4bb07234722..98853d0e7af 100644
--- a/app/assets/stylesheets/pages/repo.scss
+++ b/app/assets/stylesheets/pages/repo.scss
@@ -540,22 +540,6 @@
margin-bottom: 0;
border-bottom: 1px solid $white-dark;
padding: $gl-btn-padding 0;
-
- &.is-collapsed {
- margin-left: -$gl-padding;
- margin-right: -$gl-padding;
-
- svg {
- margin-left: auto;
- margin-right: auto;
- }
-
- .multi-file-commit-panel-collapse-btn {
- margin-right: auto;
- margin-left: auto;
- border-left: 0;
- }
- }
}
.multi-file-commit-panel-header-title {
@@ -835,6 +819,24 @@
flex: 1;
min-height: 140px;
}
+
+ &.is-collapsed {
+ .multi-file-commit-panel-header {
+ margin-left: -$gl-padding;
+ margin-right: -$gl-padding;
+
+ svg {
+ margin-left: auto;
+ margin-right: auto;
+ }
+
+ .multi-file-commit-panel-collapse-btn {
+ margin-right: auto;
+ margin-left: auto;
+ border-left: 0;
+ }
+ }
+ }
}
.ide-staged-action-btn {