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:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-07 21:35:17 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-07 21:35:17 +0300
commitbe3edeb6a1db341e5a10f9031c79f5fbc25e6f59 (patch)
tree1ba0099ced1d5bd8f516e587a7067d6ef71c36bd /app/assets/stylesheets
parente2b8025abe929007fb82e952b0be954a7598e528 (diff)
Small UI improvements after css refactoring
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r--app/assets/stylesheets/base/gl_bootstrap.scss2
-rw-r--r--app/assets/stylesheets/generic/buttons.scss7
-rw-r--r--app/assets/stylesheets/generic/gfm.scss2
-rw-r--r--app/assets/stylesheets/generic/selects.scss3
-rw-r--r--app/assets/stylesheets/pages/issues.scss2
5 files changed, 5 insertions, 11 deletions
diff --git a/app/assets/stylesheets/base/gl_bootstrap.scss b/app/assets/stylesheets/base/gl_bootstrap.scss
index d1dba6d66b5..0775c171817 100644
--- a/app/assets/stylesheets/base/gl_bootstrap.scss
+++ b/app/assets/stylesheets/base/gl_bootstrap.scss
@@ -157,7 +157,7 @@
.panel-head-actions {
position: relative;
- top: -7px;
+ top: -6px;
float: right;
}
}
diff --git a/app/assets/stylesheets/generic/buttons.scss b/app/assets/stylesheets/generic/buttons.scss
index 7cc9782f539..0224484d82b 100644
--- a/app/assets/stylesheets/generic/buttons.scss
+++ b/app/assets/stylesheets/generic/buttons.scss
@@ -6,12 +6,10 @@
}
&.btn-create {
- @extend .wide;
@extend .btn-success;
}
&.btn-save {
- @extend .wide;
@extend .btn-primary;
}
@@ -23,11 +21,6 @@
float: right;
}
- &.wide {
- padding-left: 20px;
- padding-right: 20px;
- }
-
&.btn-small {
padding: 2px 10px;
font-size: 12px;
diff --git a/app/assets/stylesheets/generic/gfm.scss b/app/assets/stylesheets/generic/gfm.scss
index 617d91154db..8fac5e534fa 100644
--- a/app/assets/stylesheets/generic/gfm.scss
+++ b/app/assets/stylesheets/generic/gfm.scss
@@ -3,7 +3,7 @@
*/
.issue-form, .merge-request-form, .wiki-form {
.description {
- height: 18em;
+ height: 16em;
border-top-left-radius: 0;
}
}
diff --git a/app/assets/stylesheets/generic/selects.scss b/app/assets/stylesheets/generic/selects.scss
index 41ed736bbe5..2773ee11fd4 100644
--- a/app/assets/stylesheets/generic/selects.scss
+++ b/app/assets/stylesheets/generic/selects.scss
@@ -3,10 +3,11 @@
.select2-choice {
background: #FFF;
border-color: #BBB;
- padding: 8px 14px;
+ padding: 6px 14px;
font-size: 13px;
line-height: 18px;
height: auto;
+ margin: 2px 0;
.select2-arrow {
background: #FFF;
diff --git a/app/assets/stylesheets/pages/issues.scss b/app/assets/stylesheets/pages/issues.scss
index b909725bff5..46522e9ece9 100644
--- a/app/assets/stylesheets/pages/issues.scss
+++ b/app/assets/stylesheets/pages/issues.scss
@@ -40,7 +40,7 @@
}
.check-all-holder {
- height: 32px;
+ height: 36px;
float: left;
margin-right: 12px;
padding: 6px 15px;