Download as
Browse Code »

Commit 9fbbae9dbf9d2358d0cde2ae0b7f627da53f85d0

Authored by Dmitriy Zaporozhets
1 parent 7d037c11
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Small css cleanup 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 6 changed files with 22 additions and 29 deletions   Show diff stats
app/assets/stylesheets/common.scss
  Diff comments   View file @9fbbae9
@@ -358,8 +358,3 @@ table { @@ -358,8 +358,3 @@ table {
358 background: #555; 358 background: #555;
359 color: #BBB; 359 color: #BBB;
360 } 360 }
361 -  
362 -.project-refs-form .chosen-container .chosen-single span {  
363 - font-weight: bold;  
364 - color: #555;  
365 -}  
app/assets/stylesheets/gitlab_bootstrap/files.scss
  Diff comments   View file @9fbbae9
@@ -11,8 +11,8 @@ @@ -11,8 +11,8 @@
11 } 11 }
12 12
13 .file-title { 13 .file-title {
14 - border-bottom: 1px solid #bbb;  
15 - @include bg-dark-gray-gradient; 14 + background: #DDD;
  15 + border-bottom: 1px solid #CCC;
16 text-shadow: 0 1px 1px #fff; 16 text-shadow: 0 1px 1px #fff;
17 margin: 0; 17 margin: 0;
18 font-weight: normal; 18 font-weight: normal;
app/assets/stylesheets/sections/commits.scss
  Diff comments   View file @9fbbae9
@@ -16,37 +16,29 @@ @@ -16,37 +16,29 @@
16 16
17 .header { 17 .header {
18 @extend .clearfix; 18 @extend .clearfix;
  19 + background: #DDD;
  20 + border-bottom: 1px solid #CCC;
19 padding: 5px 5px 5px 10px; 21 padding: 5px 5px 5px 10px;
20 color: #555; 22 color: #555;
21 - border-bottom: 1px solid #CCC;  
22 - background: #eee;  
23 - // TODO Replace with linear-gradient mixin  
24 - background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf));  
25 - background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf);  
26 - background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf);  
27 - background-image: -ms-linear-gradient(#eee 6.6%, #dfdfdf);  
28 - background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf);  
29 -  
30 - a{  
31 - color: $style_color;  
32 - }  
33 23
34 > span { 24 > span {
35 font-family: $monospace_font; 25 font-family: $monospace_font;
36 font-size: 14px; 26 font-size: 14px;
37 - line-height: 30px; 27 + line-height: 2;
38 } 28 }
39 29
40 - a.view-file{ 30 + .view-file {
41 font-weight: bold; 31 font-weight: bold;
  32 + float: right;
  33 + background-color: #EEE;
42 } 34 }
43 35
44 - .commit-short-id{ 36 + .commit-short-id {
45 font-family: $monospace_font; 37 font-family: $monospace_font;
46 font-size: smaller; 38 font-size: smaller;
47 } 39 }
48 40
49 - .file-mode{ 41 + .file-mode {
50 font-family: $monospace_font; 42 font-family: $monospace_font;
51 } 43 }
52 } 44 }
@@ -56,13 +48,13 @@ @@ -56,13 +48,13 @@
56 background: #FFF; 48 background: #FFF;
57 color: #333; 49 color: #333;
58 font-size: 12px; 50 font-size: 12px;
59 - .old{  
60 - span.idiff{ 51 + .old {
  52 + span.idiff {
61 background-color: #FAA; 53 background-color: #FAA;
62 } 54 }
63 } 55 }
64 - .new{  
65 - span.idiff{ 56 + .new {
  57 + span.idiff {
66 background-color: #AFA; 58 background-color: #AFA;
67 } 59 }
68 } 60 }
app/assets/stylesheets/sections/projects.scss
  Diff comments   View file @9fbbae9
@@ -209,6 +209,11 @@ ul.nav.nav-projects-tabs { @@ -209,6 +209,11 @@ ul.nav.nav-projects-tabs {
209 left: 0; 209 left: 0;
210 margin-right: 10px; 210 margin-right: 10px;
211 211
  212 + .chosen-single span {
  213 + font-weight: bold;
  214 + color: #555;
  215 + }
  216 +
212 &.chosen-container-active { 217 &.chosen-container-active {
213 .chosen-drop { 218 .chosen-drop {
214 min-width: 400px; 219 min-width: 400px;
app/assets/stylesheets/selects.scss
  Diff comments   View file @9fbbae9
@@ -39,6 +39,7 @@ @@ -39,6 +39,7 @@
39 } 39 }
40 40
41 .chosen-search input { 41 .chosen-search input {
  42 + border: 1px solid #CCC !important;
42 @include box-shadow(none !important); 43 @include box-shadow(none !important);
43 } 44 }
44 } 45 }
app/views/projects/commits/_diffs.html.haml
  Diff comments   View file @9fbbae9
@@ -46,7 +46,7 @@ @@ -46,7 +46,7 @@
46 %span= diff.old_path 46 %span= diff.old_path
47 47
48 - if @commit.parent_ids.present? 48 - if @commit.parent_ids.present?
49 - = link_to project_blob_path(project, tree_join(@commit.parent_id, diff.new_path)), {:class => 'btn btn-tiny pull-right view-file'} do 49 + = link_to project_blob_path(project, tree_join(@commit.parent_id, diff.new_path)), { class: 'btn btn-small view-file' } do
50 View file @ 50 View file @
51 %span.commit-short-id= @commit.short_id(6) 51 %span.commit-short-id= @commit.short_id(6)
52 - else 52 - else
@@ -54,7 +54,7 @@ @@ -54,7 +54,7 @@
54 - if diff.a_mode && diff.b_mode && diff.a_mode != diff.b_mode 54 - if diff.a_mode && diff.b_mode && diff.a_mode != diff.b_mode
55 %span.file-mode= "#{diff.a_mode} → #{diff.b_mode}" 55 %span.file-mode= "#{diff.a_mode} → #{diff.b_mode}"
56 56
57 - = link_to project_blob_path(project, tree_join(@commit.id, diff.new_path)), {:class => 'btn btn-tiny pull-right view-file'} do 57 + = link_to project_blob_path(project, tree_join(@commit.id, diff.new_path)), { class: 'btn btn-small view-file' } do
58 View file @ 58 View file @
59 %span.commit-short-id= @commit.short_id(6) 59 %span.commit-short-id= @commit.short_id(6)
60 60