diff options
author | Phil Hughes <me@iamphill.com> | 2017-10-31 12:10:03 +0300 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-10-31 12:10:03 +0300 |
commit | ac8e94d4d56d98f9e4c3b7c0f331eaa6fa5a4312 (patch) | |
tree | 81e903cd886f94380e510daf237a4d139f270fae /app/assets/stylesheets/pages | |
parent | 662f87ca372515f0b739796b31c7e242f1ebcd7f (diff) | |
parent | 6e6cea23e187b6c93886da4d043ea5a6fb7bfab5 (diff) |
Merge branch 'master' into multi-file-editor-vuex
Diffstat (limited to 'app/assets/stylesheets/pages')
-rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 12 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/repo.scss | 13 |
2 files changed, 14 insertions, 11 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index 3bd0e3ad535..312917bd13a 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -269,7 +269,7 @@ ul.notes { display: none; } - &.system-note-commit-list { + &.system-note-commit-list:not(.hide-shade) { max-height: 70px; overflow: hidden; display: block; @@ -291,16 +291,6 @@ ul.notes { bottom: 0; background: linear-gradient(rgba($white-light, 0.1) -100px, $white-light 100%); } - - &.hide-shade { - max-height: 100%; - overflow: auto; - - &::after { - display: none; - background: transparent; - } - } } } } diff --git a/app/assets/stylesheets/pages/repo.scss b/app/assets/stylesheets/pages/repo.scss index 45aaeb77a48..1bb4e3cc345 100644 --- a/app/assets/stylesheets/pages/repo.scss +++ b/app/assets/stylesheets/pages/repo.scss @@ -1,3 +1,16 @@ +.modal.popup-dialog { + display: block; + background-color: $black-transparent; + z-index: 2100; + + @media (min-width: $screen-md-min) { + .modal-dialog { + width: 600px; + margin: 30px auto; + } + } +} + .project-refs-form, .project-refs-target-form { display: inline-block; |