diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-08-30 16:48:32 +0300 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-08-30 16:48:32 +0300 |
commit | 43ddf0caf7f17d36037a0904223c84d1d0674439 (patch) | |
tree | 8ec884c0318d2f0388fe6ac261d078475832590f /app | |
parent | 919cec08665a78e6cc7d9ac68d5e0e97bc83fafc (diff) | |
parent | cfbab1bc73a1a93c4b5fb5b4143af01fe29a2ec6 (diff) |
Merge branch 'add-no-readme-margin' into 'master'
Add white background for no readme container
## What does this MR do?
Changes the readme container background to white so that it is more consistent with the other default pages
## Are there points in the code the reviewer needs to double check?
Check for side effects but there really shouldn't be any
## Why was this MR needed?
Improves UI
## What are the relevant issue numbers?
Closes #20906
## Screenshots (if relevant)
Before:
![Screen_Shot_2016-08-18_at_4.02.15_PM](/uploads/b3e70bba4c7ecab262bb4ff76bf80d85/Screen_Shot_2016-08-18_at_4.02.15_PM.png)
After:
![Screen_Shot_2016-08-22_at_4.30.41_PM](/uploads/520f276e1ed6786f66e3eff6e579b157/Screen_Shot_2016-08-22_at_4.30.41_PM.png)
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
- [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !5877
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index eaf2d3270b3..83500a687bb 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -600,18 +600,25 @@ pre.light-well { } } -.project-show-readme .readme-holder { - padding: $gl-padding 0; - border-top: 0; - - .edit-project-readme { - z-index: 2; - position: relative; +.project-show-readme { + .row-content-block { + background-color: inherit; + border: none; } - .wiki h1 { - border-bottom: none; - padding: 0; + .readme-holder { + padding: $gl-padding 0; + border-top: 0; + + .edit-project-readme { + z-index: 2; + position: relative; + } + + .wiki h1 { + border-bottom: none; + padding: 0; + } } } |