Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2018-02-06 01:00:17 +0300
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2018-02-06 01:00:17 +0300
commitcf9b932f78be297ee91de048e634cfa83d91ef83 (patch)
tree5eb4f43e256849ec842dc76b7bd8e623ad901338 /app/assets/stylesheets
parentf610a0cc17d1f9cd607810d5aabd7bf097f645d0 (diff)
Use sprite_icon and variables
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r--app/assets/stylesheets/framework/modal.scss4
-rw-r--r--app/assets/stylesheets/framework/variables.scss1
2 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/modal.scss b/app/assets/stylesheets/framework/modal.scss
index 1b785341246..a6b1bf9b099 100644
--- a/app/assets/stylesheets/framework/modal.scss
+++ b/app/assets/stylesheets/framework/modal.scss
@@ -6,8 +6,8 @@
margin-top: 0;
.color-label {
- font-size: 14px;
- padding: 6px 10px;
+ font-size: $gl-font-size;
+ padding: $gl-vert-padding $label-padding-modal;
}
}
}
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index f76c6866463..85004326656 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -558,6 +558,7 @@ $jq-ui-default-color: #777;
* Label
*/
$label-padding: 7px;
+$label-padding-modal: 10px;
$label-gray-bg: #f8fafc;
$label-inverse-bg: #333;
$label-remove-border: rgba(0, 0, 0, .1);