diff options
| author | Simon Knox <psimyn@gmail.com> | 2017-06-21 21:58:13 +1000 |
|---|---|---|
| committer | Simon Knox <psimyn@gmail.com> | 2017-06-21 22:02:38 +1000 |
| commit | abc293fb8af76c3d263eb9a26d6401ea21945048 (patch) | |
| tree | f18dc290cb55b901034125bb44b09cc77a06fd1b | |
| parent | b2e1d32e7a74b22b23e8ab052bd29e15bb8a4f1e (diff) | |
| download | gitlab-ce-33976-mr-widget-dividers.tar.gz | |
use horizontal dividers for MR widget sections33976-mr-widget-dividers
| -rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 25 | ||||
| -rw-r--r-- | changelogs/unreleased/33976-mr-widget-dividers.yml | 4 |
2 files changed, 15 insertions, 14 deletions
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index c0bd045f1fc..1eb875b364b 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -7,6 +7,14 @@ border: 1px solid $border-color; border-radius: 2px; + > * { + padding: $gl-padding; + } + + > * + * { + border-top: solid 1px $border-color; + } + form { margin-bottom: 0; @@ -84,11 +92,8 @@ .ci-widget { color: $gl-text-color; - display: -webkit-flex; display: flex; - -webkit-align-items: center; align-items: center; - padding: $gl-padding-top $gl-padding 0; svg { position: relative; @@ -115,11 +120,6 @@ } } - .mr-widget-body, - .mr-widget-footer { - margin: 16px; - } - .mr-widget-pipeline-graph { flex-shrink: 0; @@ -153,8 +153,8 @@ } .normal { - color: $gl-text-color; font-size: 15px; + line-height: 28px; } .capitalize { @@ -570,11 +570,8 @@ .mr-source-target { background-color: $gray-light; - border-radius: 3px 3px 0 0; - border-bottom: 1px solid $border-color; - padding: 0 $gl-padding; - margin-bottom: 6px; - line-height: 44px; + border-radius: $border-radius-default $border-radius-default 0 0; + padding: $gl-padding-top $gl-padding; .dropdown-toggle .fa { color: $gl-text-color; diff --git a/changelogs/unreleased/33976-mr-widget-dividers.yml b/changelogs/unreleased/33976-mr-widget-dividers.yml new file mode 100644 index 00000000000..d6077afa900 --- /dev/null +++ b/changelogs/unreleased/33976-mr-widget-dividers.yml @@ -0,0 +1,4 @@ +--- +title: add dividing lines between merge request widget sections +merge_request: +author: |