diff options
| author | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2015-05-14 19:41:43 +0200 |
|---|---|---|
| committer | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2015-05-14 19:41:43 +0200 |
| commit | e1982c32889399ff50881b00636f01d36dc7d9d1 (patch) | |
| tree | 498e4de29fbc3e9a84d3b4a348446e34ba600443 | |
| parent | 8dde52cc099af63e1bdc02ca6fc389e4a9ea9969 (diff) | |
| parent | 273897811196b926a9d513187d0ed5889ea119a0 (diff) | |
| download | gitlab-ce-e1982c32889399ff50881b00636f01d36dc7d9d1.tar.gz | |
Merge pull request #9295 from afc163/master
Add style for <kbd> element in markdown
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/base/mixins.scss | 16 |
2 files changed, 17 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index dd69d73d86f..db3ffb3fb13 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -62,6 +62,7 @@ v 7.11.0 (unreleased) - Call merge request web hook for each new commits (Arthur Gautier) - Use SIGKILL by default in Sidekiq::MemoryKiller - Fix mentioning of private groups. + - Add style for <kbd> element in markdown v 7.10.2 - Fix CI links on MR page diff --git a/app/assets/stylesheets/base/mixins.scss b/app/assets/stylesheets/base/mixins.scss index a0794e7825a..08cbe911672 100644 --- a/app/assets/stylesheets/base/mixins.scss +++ b/app/assets/stylesheets/base/mixins.scss @@ -73,6 +73,22 @@ padding: 0; } + kbd { + display: inline-block; + padding: 3px 5px; + font-size: 11px; + line-height: 10px; + color: #555; + vertical-align: middle; + background-color: #FCFCFC; + border-width: 1px; + border-style: solid; + border-color: #CCC #CCC #BBB; + border-image: none; + border-radius: 3px; + box-shadow: 0px -1px 0px #BBB inset; + } + h1 { margin-top: 45px; font-size: 2.5em; |