summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-04-19 12:58:43 +0100
committerPhil Hughes <me@iamphill.com>2018-04-19 12:58:43 +0100
commit5588efede33d543051e08542429650b0bb7dcc41 (patch)
tree940dafdeec166208140e0131c7eaaa6763a60278 /app/assets/stylesheets
parentf43b7af706f9a98eba01160547125cb8da62cff0 (diff)
downloadgitlab-ce-5588efede33d543051e08542429650b0bb7dcc41.tar.gz
cleaned up after merging master
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r--app/assets/stylesheets/pages/repo.scss25
1 files changed, 2 insertions, 23 deletions
diff --git a/app/assets/stylesheets/pages/repo.scss b/app/assets/stylesheets/pages/repo.scss
index 04abb4be3d5..42ef3e4e4ae 100644
--- a/app/assets/stylesheets/pages/repo.scss
+++ b/app/assets/stylesheets/pages/repo.scss
@@ -743,32 +743,11 @@
.ide-commit-list-container {
display: flex;
+ flex: 1;
flex-direction: column;
width: 100%;
+ min-height: 140px;
padding: 0 16px;
-
- &:not(.is-collapsed) {
- 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 {