diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-13 17:26:45 +0100 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-13 17:26:45 +0100 |
| commit | f956514b109fc5628b397ff8f507bb4c37d5b115 (patch) | |
| tree | 597b88b9a085b5e660e5fc4f2e5a67ad493b10c3 /app/assets | |
| parent | 3238b0bc9fddd1a00d4926a7679c454db03d6fed (diff) | |
| download | gitlab-ce-f956514b109fc5628b397ff8f507bb4c37d5b115.tar.gz | |
Dont use nav-pills. Instead use nav-lists
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/stylesheets/framework/tw_bootstrap.scss | 10 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 4 |
2 files changed, 2 insertions, 12 deletions
diff --git a/app/assets/stylesheets/framework/tw_bootstrap.scss b/app/assets/stylesheets/framework/tw_bootstrap.scss index 1ce897ead54..88072606bf5 100644 --- a/app/assets/stylesheets/framework/tw_bootstrap.scss +++ b/app/assets/stylesheets/framework/tw_bootstrap.scss @@ -100,16 +100,6 @@ } -.nav-pills > li > a { - color: #666; -} - -.nav-pills > .active > a > span > .badge { - background-color: #fff; - color: $gl-primary; -} - - /** * fix to keep tooltips position in top navigation bar * diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index ef89e38555a..28c461a667a 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -458,11 +458,11 @@ table.table.protected-branches-list tr.no-border { padding-top: 10px; padding-bottom: 4px; - ul.nav-pills { + ul.nav { display:inline-block; } - .nav-pills li { + .nav li { display:inline; } |