diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 2283d3f..56dbd9a 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -358,8 +358,3 @@ table { background: #555; color: #BBB; } - -.project-refs-form .chosen-container .chosen-single span { - font-weight: bold; - color: #555; -} diff --git a/app/assets/stylesheets/gitlab_bootstrap/files.scss b/app/assets/stylesheets/gitlab_bootstrap/files.scss index a286e53..3f9e498 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/files.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/files.scss @@ -11,8 +11,8 @@ } .file-title { - border-bottom: 1px solid #bbb; - @include bg-dark-gray-gradient; + background: #DDD; + border-bottom: 1px solid #CCC; text-shadow: 0 1px 1px #fff; margin: 0; font-weight: normal; diff --git a/app/assets/stylesheets/sections/commits.scss b/app/assets/stylesheets/sections/commits.scss index 787d81a..769e95d 100644 --- a/app/assets/stylesheets/sections/commits.scss +++ b/app/assets/stylesheets/sections/commits.scss @@ -16,37 +16,29 @@ .header { @extend .clearfix; + background: #DDD; + border-bottom: 1px solid #CCC; padding: 5px 5px 5px 10px; color: #555; - border-bottom: 1px solid #CCC; - background: #eee; - // TODO Replace with linear-gradient mixin - background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf)); - background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf); - background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf); - background-image: -ms-linear-gradient(#eee 6.6%, #dfdfdf); - background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf); - - a{ - color: $style_color; - } > span { font-family: $monospace_font; font-size: 14px; - line-height: 30px; + line-height: 2; } - a.view-file{ + .view-file { font-weight: bold; + float: right; + background-color: #EEE; } - .commit-short-id{ + .commit-short-id { font-family: $monospace_font; font-size: smaller; } - .file-mode{ + .file-mode { font-family: $monospace_font; } } @@ -56,13 +48,13 @@ background: #FFF; color: #333; font-size: 12px; - .old{ - span.idiff{ + .old { + span.idiff { background-color: #FAA; } } - .new{ - span.idiff{ + .new { + span.idiff { background-color: #AFA; } } diff --git a/app/assets/stylesheets/sections/projects.scss b/app/assets/stylesheets/sections/projects.scss index f74d7f3..e9162b3 100644 --- a/app/assets/stylesheets/sections/projects.scss +++ b/app/assets/stylesheets/sections/projects.scss @@ -209,6 +209,11 @@ ul.nav.nav-projects-tabs { left: 0; margin-right: 10px; + .chosen-single span { + font-weight: bold; + color: #555; + } + &.chosen-container-active { .chosen-drop { min-width: 400px; diff --git a/app/assets/stylesheets/selects.scss b/app/assets/stylesheets/selects.scss index ad7233e..3b61594 100644 --- a/app/assets/stylesheets/selects.scss +++ b/app/assets/stylesheets/selects.scss @@ -39,6 +39,7 @@ } .chosen-search input { + border: 1px solid #CCC !important; @include box-shadow(none !important); } } diff --git a/app/views/projects/commits/_diffs.html.haml b/app/views/projects/commits/_diffs.html.haml index 2e61b9e..f23403a 100644 --- a/app/views/projects/commits/_diffs.html.haml +++ b/app/views/projects/commits/_diffs.html.haml @@ -46,7 +46,7 @@ %span= diff.old_path - if @commit.parent_ids.present? - = link_to project_blob_path(project, tree_join(@commit.parent_id, diff.new_path)), {:class => 'btn btn-tiny pull-right view-file'} do + = link_to project_blob_path(project, tree_join(@commit.parent_id, diff.new_path)), { class: 'btn btn-small view-file' } do View file @ %span.commit-short-id= @commit.short_id(6) - else @@ -54,7 +54,7 @@ - if diff.a_mode && diff.b_mode && diff.a_mode != diff.b_mode %span.file-mode= "#{diff.a_mode} → #{diff.b_mode}" - = link_to project_blob_path(project, tree_join(@commit.id, diff.new_path)), {:class => 'btn btn-tiny pull-right view-file'} do + = link_to project_blob_path(project, tree_join(@commit.id, diff.new_path)), { class: 'btn btn-small view-file' } do View file @ %span.commit-short-id= @commit.short_id(6) -- libgit2 0.21.2