summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/framework/typography.scss
diff options
context:
space:
mode:
authorLuke Bennett <lbennett@gitlab.com>2018-09-24 14:39:00 +0100
committerLuke Bennett <lbennett@gitlab.com>2018-09-24 14:39:00 +0100
commit05afd11e16aecd43adfb869ae90aa6cae13916ec (patch)
tree63b31431981d48ac970853778dd01a5301bb9564 /app/assets/stylesheets/framework/typography.scss
parent086549d986a453e1b2dd0d09ffbd19d0487d9c51 (diff)
parent28086b203ae397e01d5e9870dfbddd66466450c2 (diff)
downloadgitlab-ce-05afd11e16aecd43adfb869ae90aa6cae13916ec.tar.gz
Merge remote-tracking branch 'origin/master' into ce-6983-promote-starting-a-gitlab-com-trial
Diffstat (limited to 'app/assets/stylesheets/framework/typography.scss')
-rw-r--r--app/assets/stylesheets/framework/typography.scss4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss
index 9929f1bdebf..0c1b8b92de3 100644
--- a/app/assets/stylesheets/framework/typography.scss
+++ b/app/assets/stylesheets/framework/typography.scss
@@ -61,12 +61,12 @@
padding: 3px 5px;
font-size: 11px;
line-height: 10px;
- color: $kdb-color;
+ color: $gl-gray-700;
vertical-align: middle;
background-color: $kdb-bg;
border-width: 1px;
border-style: solid;
- border-color: $kdb-border $kdb-border $kdb-border-bottom;
+ border-color: $gl-gray-200 $gl-gray-200 $kdb-border-bottom;
border-image: none;
border-radius: 3px;
box-shadow: 0 -1px 0 $kdb-shadow inset;