summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-07-05 09:35:23 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-07-05 09:35:23 +0300
commitdf6a75d52d9a7db6d3bbdb9c3c306a65b4f8a1f2 (patch)
tree78bdf89dbd769b61610e503a95f4183c68e7f909 /app/assets
parent4e0c2f00d3edcabd24488161933b00d497656bfd (diff)
downloadgitlab-ce-df6a75d52d9a7db6d3bbdb9c3c306a65b4f8a1f2.tar.gz
buttons margin fixed
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/stylesheets/common.scss15
-rw-r--r--app/assets/stylesheets/gitlab_bootstrap.scss6
2 files changed, 16 insertions, 5 deletions
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 8b76fe5a0fb..19092073c17 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -108,11 +108,6 @@ table a code {
margin-top: 5px;
}
-.btn.padded {
- margin-right:3px;
- padding:4px 10px 4px;
-}
-
.loading {
margin:20px auto;
background: url(ajax_loader.gif) no-repeat center center;
@@ -399,6 +394,16 @@ p.time {
padding:2px 6px;
margin:2px;
}
+
+ &.grouped {
+ margin-right:7px;
+ float:left;
+ }
+
+ &.padded {
+ margin-right:3px;
+ padding:4px 10px 4px;
+ }
}
diff --git a/app/assets/stylesheets/gitlab_bootstrap.scss b/app/assets/stylesheets/gitlab_bootstrap.scss
index fa8d544e1e1..7f26f16aa41 100644
--- a/app/assets/stylesheets/gitlab_bootstrap.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap.scss
@@ -189,6 +189,12 @@ a:focus {
padding:4px 6px;
color:#444;
text-shadow:0 0 1px #fff;
+
+ &.grouped {
+ float: left;
+ margin-right: 6px;
+ padding: 6px;
+ }
}
}