summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-01-06 23:01:24 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-01-06 23:01:24 +0200
commitd576e1619c0f7ccccfc178806837943a43aaa464 (patch)
tree910d2966367105df4f5e4da7b4b46fc4f6f95977 /app/assets
parente02fdfe87aec686ddf5b6a1af1bd2ed1d732105e (diff)
downloadgitlab-ci-d576e1619c0f7ccccfc178806837943a43aaa464.tar.gz
Style twbs3 forms and project menu
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/stylesheets/main.scss74
1 files changed, 51 insertions, 23 deletions
diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss
index 70adc44..dcb2ae5 100644
--- a/app/assets/stylesheets/main.scss
+++ b/app/assets/stylesheets/main.scss
@@ -216,23 +216,6 @@ td form {
margin: 0;
}
-.nav-stacked {
- li.active a {
- font-weight: bold;
- background: $style_color;
- color: #FFF;
-
- &:hover {
- background: $style_color;
- color: #FFF;
- }
- }
-
- a {
- background: #f9f9f9;
- }
-}
-
.well-list {
@extend .unstyled;
li {
@@ -268,12 +251,6 @@ td form {
}
}
-.project-menu {
- a {
- padding: 10px !important;
- }
-}
-
.profile-block {
font-size: 14px;
}
@@ -324,3 +301,54 @@ label {
@extend .col-sm-2;
}
}
+
+.prepend-top-20 { margin-top:20px }
+.append-bottom-20 { margin-bottom:20px }
+
+/**
+ * nav-pills
+ *
+ */
+.nav-pills {
+ .active a {
+ background: $style_color;
+ }
+
+ > li > a {
+ @include border-radius(0);
+ }
+
+ &.nav-stacked {
+ > li > a {
+ border-left: 4px solid #EEE;
+ padding: 12px;
+ color: #777;
+ }
+ > .active > a {
+ border-color: $style_color;
+ background: none;
+ color: #333;
+ font-weight: bolder;
+
+ &:hover {
+ background: none;
+ color: #333;
+ }
+ }
+
+ &.nav-stacked-menu {
+ li > a {
+ padding: 16px;
+ }
+ }
+ }
+
+ &.nav-pills-small {
+ > li > a {
+ padding: 8px 12px;
+ font-size: 12px;
+ }
+ }
+}
+
+.nav-pills > .active > a > i[class^="icon-"] { background: inherit; }