diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-10-26 15:08:15 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-10-26 15:08:15 +0200 |
| commit | 0e544db657ecd2d5497bb6ff47a04fe128ca4ec2 (patch) | |
| tree | 50e05003849bdba264c59a626cce7b0ed4b39654 | |
| parent | a66a3c7449f6d91f7f3bb1a86ac0e17623ba1fd6 (diff) | |
| parent | 6d6e4c0fcc1a4e0be5415741a151af6fe91c322f (diff) | |
| download | gitlab-ce-0e544db657ecd2d5497bb6ff47a04fe128ca4ec2.tar.gz | |
Merge branch 'voogsgerd/gitlab-ce-daniel-cssclassvisable'
See merge request !7086
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/header.scss | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c19c3cec55..c0324b15a5c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ Please view this file on the master branch, on stable branches it's out of date. - Fixed link typo on /help/ui to Alerts section. !6915 (Sam Rose) - Fix filtering of milestones with quotes in title (airatshigapov) - Simpler arguments passed to named_route on toggle_award_url helper method + - Fix typo in framework css class. !7086 (Daniel Voogsgerd) - Fix: Backup restore doesn't clear cache - API: Fix project deploy keys 400 and 500 errors when adding an existing key. !6784 (Joshua Welsh) - Replace jquery.cookie plugin with js.cookie !7085 diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index 142076f65b2..53ee1ed309e 100644 --- a/app/assets/stylesheets/framework/header.scss +++ b/app/assets/stylesheets/framework/header.scss @@ -227,7 +227,7 @@ header { float: none !important; .visible-xs, - .visable-sm { + .visible-sm { display: table-cell !important; } } |