Commit 43ddf0ca authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

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
parents 919cec08 cfbab1bc
...@@ -11,6 +11,7 @@ v 8.12.0 (unreleased) ...@@ -11,6 +11,7 @@ v 8.12.0 (unreleased)
- Set path for all JavaScript cookies to honor GitLab's subdirectory setting !5627 (Mike Greiling) - Set path for all JavaScript cookies to honor GitLab's subdirectory setting !5627 (Mike Greiling)
- Add hover color to emoji icon (ClemMakesApps) - Add hover color to emoji icon (ClemMakesApps)
- Fix branches page dropdown sort alignment (ClemMakesApps) - Fix branches page dropdown sort alignment (ClemMakesApps)
- Add white background for no readme container (ClemMakesApps)
- Optimistic locking for Issues and Merge Requests (title and description overriding prevention) - Optimistic locking for Issues and Merge Requests (title and description overriding prevention)
- Add `wiki_page_events` to project hook APIs (Ben Boeckel) - Add `wiki_page_events` to project hook APIs (Ben Boeckel)
- Remove Gitorious import - Remove Gitorious import
......
...@@ -600,18 +600,25 @@ pre.light-well { ...@@ -600,18 +600,25 @@ pre.light-well {
} }
} }
.project-show-readme .readme-holder { .project-show-readme {
padding: $gl-padding 0; .row-content-block {
border-top: 0; background-color: inherit;
border: none;
.edit-project-readme {
z-index: 2;
position: relative;
} }
.wiki h1 { .readme-holder {
border-bottom: none; padding: $gl-padding 0;
padding: 0; border-top: 0;
.edit-project-readme {
z-index: 2;
position: relative;
}
.wiki h1 {
border-bottom: none;
padding: 0;
}
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment