diff options
author | Phil Hughes <me@iamphill.com> | 2016-10-18 12:23:44 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2016-10-18 12:23:44 +0100 |
commit | a1deb6ece3be68fb176eb08a6371a334b24b4f01 (patch) | |
tree | 7b5c300c34507efa05a885a6a51f3924b508dc52 /app/assets/stylesheets/pages | |
parent | da07c2e4d3d382c05ec287ee60f639b870074fe7 (diff) | |
parent | c9d7ba4d696bfd0198ac75db6e1b2a08b4517f82 (diff) | |
download | gitlab-ce-a1deb6ece3be68fb176eb08a6371a334b24b4f01.tar.gz |
Merge branch 'master' into issue_19734_2
Diffstat (limited to 'app/assets/stylesheets/pages')
-rw-r--r-- | app/assets/stylesheets/pages/detail_page.scss | 6 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/merge_conflicts.scss | 47 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 7 |
3 files changed, 51 insertions, 9 deletions
diff --git a/app/assets/stylesheets/pages/detail_page.scss b/app/assets/stylesheets/pages/detail_page.scss index 4d9c73c6840..2357671c2ae 100644 --- a/app/assets/stylesheets/pages/detail_page.scss +++ b/app/assets/stylesheets/pages/detail_page.scss @@ -20,9 +20,11 @@ .detail-page-description { .title { - margin: 0; - font-size: 23px; + margin: 0 0 16px; + font-size: 2em; color: $gl-gray-dark; + padding: 0 0 0.3em; + border-bottom: 1px solid $white-dark; } .description { diff --git a/app/assets/stylesheets/pages/merge_conflicts.scss b/app/assets/stylesheets/pages/merge_conflicts.scss index 49013d7cac9..eed2b0ab7cc 100644 --- a/app/assets/stylesheets/pages/merge_conflicts.scss +++ b/app/assets/stylesheets/pages/merge_conflicts.scss @@ -237,4 +237,51 @@ $colors: ( .btn-success .fa-spinner { color: #fff; } + + .editor-wrap { + &.is-loading { + .editor { + display: none; + } + + .loading { + display: block; + } + } + + &.saved { + .editor { + border-top: solid 2px $border-green-extra-light; + } + } + + .editor { + pre { + height: 350px; + border: none; + border-radius: 0; + margin-bottom: 0; + } + } + + .loading { + display: none; + } + } + + .discard-changes-alert { + background-color: $background-color; + text-align: right; + padding: $gl-padding-top $gl-padding; + color: $gl-text-color; + + .discard-actions { + display: inline-block; + margin-left: 10px; + } + } + + .resolve-conflicts-form { + padding-top: $gl-padding; + } } diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index afc4e517fde..101472278e2 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -429,13 +429,6 @@ } } -.merge-request-details { - - .title { - margin-bottom: 20px; - } -} - .merge-request-tabs { background-color: #fff; |