diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-12-28 15:50:26 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-12-28 15:50:26 +0000 |
| commit | f12a8c467c21d68f355d523fcc31cf28409287b7 (patch) | |
| tree | 5fba294da9d679ec7f5fdc5bafb889a63909f047 | |
| parent | 6892216f5f65687d4dc53e7e08c649e858fa8ff4 (diff) | |
| parent | 7e3b63e1b3a7272e5dcb240e200a400d8b62f223 (diff) | |
| download | gitlab-ce-f12a8c467c21d68f355d523fcc31cf28409287b7.tar.gz | |
Merge branch 'fix-light-hr-in-descriptions' into 'master'
darkened hr border color in descriptions because of update of bootstrap
See merge request !8333
| -rw-r--r-- | app/assets/stylesheets/framework/common.scss | 1 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-light-hr-in-descriptions.yml | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss index 5e3a91af86e..34757c57acf 100644 --- a/app/assets/stylesheets/framework/common.scss +++ b/app/assets/stylesheets/framework/common.scss @@ -66,6 +66,7 @@ pre { hr { margin: $gl-padding 0; + border-top: 1px solid darken($gray-normal, 8%); } .str-truncated { diff --git a/changelogs/unreleased/fix-light-hr-in-descriptions.yml b/changelogs/unreleased/fix-light-hr-in-descriptions.yml new file mode 100644 index 00000000000..8efd471e416 --- /dev/null +++ b/changelogs/unreleased/fix-light-hr-in-descriptions.yml @@ -0,0 +1,4 @@ +--- +title: Darkened hr border color in descriptions because of update of bootstrap +merge_request: 8333 +author: |