summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrandx <dmitriy.zaporozhets@gmail.com>2012-09-18 20:50:34 +0300
committerrandx <dmitriy.zaporozhets@gmail.com>2012-09-18 20:50:34 +0300
commitaaec545a677f08a39a49d40db2e454e57ed72cbe (patch)
tree1a5bf802be71e53973c3f741ddb19a13f695152c
parent560b1ac5f39b87145e0882cad018f12cc8cf27b4 (diff)
downloadgitlab-ce-aaec545a677f08a39a49d40db2e454e57ed72cbe.tar.gz
Gitlab styled tabs. Better ref selector
-rw-r--r--app/assets/stylesheets/gitlab_bootstrap/common.scss24
-rw-r--r--app/assets/stylesheets/ref_select.scss28
2 files changed, 42 insertions, 10 deletions
diff --git a/app/assets/stylesheets/gitlab_bootstrap/common.scss b/app/assets/stylesheets/gitlab_bootstrap/common.scss
index cd7145c99c3..f4fbd223390 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/common.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/common.scss
@@ -33,7 +33,29 @@
.nav-pills a:hover { background-color:#888; }
.nav-pills .active a { background-color: $style_color; }
.nav-tabs > li > a, .nav-pills > li > a { color:$style_color; }
-.nav-tabs > .active > a { font-weight:bold; }
+.nav.nav-tabs {
+ li {
+ > a {
+ padding:8px 20px;
+ margin-right: 7px;
+ border-color: #EEE;
+ color:#888;
+ border-bottom: 1px solid #ddd;
+ .badge {
+ background-color: #eee;
+ color:#888;
+ text-shadow:0 1px 1px #fff;
+ }
+ }
+ &.active {
+ > a {
+ border-color: #CCC;
+ border-bottom: 1px solid #fff;
+ color:#333;
+ }
+ }
+ }
+}
/** ALERT MESSAGES **/
.alert-message { @extend .alert; }
diff --git a/app/assets/stylesheets/ref_select.scss b/app/assets/stylesheets/ref_select.scss
index 5b52e11b355..9f66136fb7f 100644
--- a/app/assets/stylesheets/ref_select.scss
+++ b/app/assets/stylesheets/ref_select.scss
@@ -12,35 +12,45 @@
width:120px;
}
-.project-refs-form .chzn-container {
+.project-refs-form .chzn-container {
position: relative;
top: 0;
left: 0;
margin-right: 10px;
- .chzn-drop {
+ .chzn-drop {
margin:7px 0;
- border: 1px solid #CCC;
- min-width: 300px;
+ min-width: 400px;
+ border: 2px solid $blue_link;
+ @include border-radius(4px);
- .chzn-results {
+ .chzn-results {
max-height:300px;
+
+ .group-result {
+ color: $blue_link;
+ }
+ .active-result {
+ &.highlighted {
+ background: $blue_link;
+ }
+ }
}
.chzn-search input {
- min-width:200px;
+ min-width:300px;
}
}
- .chzn-single {
+ .chzn-single {
@include bg-gray-gradient;
- div {
+ div {
background:transparent;
border-left:none;
}
- span {
+ span {
font-weight: normal;
}
}