diff options
| author | Jose Ivan Vargas <jvargas@gitlab.com> | 2018-03-06 16:54:19 -0600 |
|---|---|---|
| committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2018-03-07 16:14:56 -0600 |
| commit | 8780abfd55c9b2917c3716fc4b67437c52369b60 (patch) | |
| tree | 98f269e6abca82f93029a162f4a0c2a59231c578 /app/assets/stylesheets | |
| parent | 5e8138aa54492dd3ace42d889ba01f82e8e19c83 (diff) | |
| download | gitlab-ce-8780abfd55c9b2917c3716fc4b67437c52369b60.tar.gz | |
backport of custom metrics for the common metrics section of CEjivl-backport-custom-metrics-frontend
Diffstat (limited to 'app/assets/stylesheets')
| -rw-r--r-- | app/assets/stylesheets/framework/common.scss | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/flash.scss | 6 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/settings.scss | 3 |
3 files changed, 12 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss index ae517c41cb2..37d33320445 100644 --- a/app/assets/stylesheets/framework/common.scss +++ b/app/assets/stylesheets/framework/common.scss @@ -14,6 +14,10 @@ color: $gl-text-color-secondary; } +.text-tertiary { + color: $gl-text-color-tertiary; +} + .text-primary, .text-primary:hover { color: $brand-primary; diff --git a/app/assets/stylesheets/framework/flash.scss b/app/assets/stylesheets/framework/flash.scss index 88ce119ee3a..cb2f71b0033 100644 --- a/app/assets/stylesheets/framework/flash.scss +++ b/app/assets/stylesheets/framework/flash.scss @@ -12,6 +12,12 @@ margin: 0; } + .flash-warning { + @extend .alert; + @extend .alert-warning; + margin: 0; + } + .flash-alert { @extend .alert; @extend .alert-danger; diff --git a/app/assets/stylesheets/pages/settings.scss b/app/assets/stylesheets/pages/settings.scss index 47672783d5a..a6ca8ed5016 100644 --- a/app/assets/stylesheets/pages/settings.scss +++ b/app/assets/stylesheets/pages/settings.scss @@ -205,7 +205,8 @@ } .badge { - font-size: inherit; + font-size: 12px; + line-height: 12px; } .panel-heading .badge-count { |