Download as
Browse Code »

Commit 0392669cbc7686f54677362457cfc4e62a527414

Authored by Dmitriy Zaporozhets
1 parent 010a770b
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Fix some css after bootstrap 3 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 11 changed files with 31 additions and 16 deletions   Show diff stats
app/assets/stylesheets/gitlab_bootstrap/common.scss
  Diff comments   View file @0392669
... ... @@ -20,6 +20,7 @@
20 20 .append-right-10 { margin-right:10px }
21 21 .append-right-20 { margin-right:20px }
22 22 .append-bottom-10 { margin-bottom:10px }
  23 +.append-bottom-15 { margin-bottom:15px }
23 24 .append-bottom-20 { margin-bottom:20px }
24 25 .inline { display: inline-block }
25 26  
... ... @@ -129,3 +130,9 @@ pre.well-pre {
129 130 .gl-hide {
130 131 display: none;
131 132 }
  133 +
  134 +.breadcrumb > li + li:before {
  135 + content: "/";
  136 + padding: 0;
  137 + color: #666;
  138 +}
... ...
app/assets/stylesheets/gitlab_bootstrap/files.scss
  Diff comments   View file @0392669
... ... @@ -20,7 +20,6 @@
20 20 text-align: left;
21 21 color: $style_color;
22 22 padding: 9px 10px;
23   - height: 18px;
24 23  
25 24 .options {
26 25 float: right;
... ...
app/assets/stylesheets/gitlab_bootstrap/mixins.scss
  Diff comments   View file @0392669
... ... @@ -84,6 +84,10 @@
84 84 }
85 85  
86 86 @mixin md-typography {
  87 + img {
  88 + max-width: 100%;
  89 + }
  90 +
87 91 *:first-child {
88 92 margin-top: 0;
89 93 }
... ...
app/assets/stylesheets/gitlab_bootstrap/typography.scss
  Diff comments   View file @0392669
... ... @@ -2,11 +2,6 @@
2 2 * Headers
3 3 *
4 4 */
5   -h1, h2, h3, h4, h5, h6 {
6   - font-weight: 500;
7   - line-height: 1.1;
8   -}
9   -
10 5 h1.page-title {
11 6 @include page-title;
12 7 font-size: 28px;
... ... @@ -99,6 +94,7 @@ a:focus {
99 94 background: #f5f5f5;
100 95 }
101 96 ul {
  97 + padding: 0;
102 98 margin: 0 0 9px 25px !important;
103 99 }
104 100 }
... ...
app/assets/stylesheets/sections/header.scss
  Diff comments   View file @0392669
... ... @@ -103,7 +103,6 @@ header {
103 103 }
104 104  
105 105 .search-input {
106   - width: 300px;
107 106 background-image: url("icon-search.png");
108 107 background-repeat: no-repeat;
109 108 background-position: 10px;
... ... @@ -115,9 +114,6 @@ header {
115 114 border: 1px solid #c6c6c6;
116 115 box-shadow: none;
117 116 @include transition(all 0.15s ease-in 0s);
118   - &:focus {
119   - width: 400px;
120   - }
121 117 }
122 118 }
123 119  
... ... @@ -201,3 +197,18 @@ header {
201 197 }
202 198 }
203 199  
  200 +.search .search-input {
  201 + width: 300px;
  202 + &:focus {
  203 + width: 400px;
  204 + }
  205 +}
  206 +
  207 +@media (max-width: 1200px) {
  208 + .search .search-input {
  209 + width: 200px;
  210 + &:focus {
  211 + width: 300px;
  212 + }
  213 + }
  214 +}
... ...
app/assets/stylesheets/sections/tree.scss
  Diff comments   View file @0392669
... ... @@ -111,7 +111,7 @@
111 111  
112 112 .tree-ref-holder {
113 113 float: left;
114   - margin-top: 5px;
  114 + margin-top: 8px;
115 115 }
116 116  
117 117 .readme-holder {
... ...
app/assets/stylesheets/selects.scss
  Diff comments   View file @0392669
... ... @@ -3,6 +3,7 @@
3 3 min-width: 100px;
4 4  
5 5 .chosen-single {
  6 + height: 26px;
6 7 background: #EEE !important;
7 8 border: 1px solid #DDD !important;
8 9 @include box-shadow(none !important);
... ...
app/views/projects/blob/_blob.html.haml
  Diff comments   View file @0392669
... ... @@ -4,7 +4,6 @@
4 4 = link_to project_tree_path(@project, @ref) do
5 5 = @project.path
6 6 - tree_breadcrumbs(@tree, 6) do |title, path|
7   - \/
8 7 %li
9 8 - if path
10 9 - if path.end_with?(@path)
... ...
app/views/projects/commits/_head.html.haml
  Diff comments   View file @0392669
1   -%ul.nav.nav-tabs
  1 +%ul.nav.nav-tabs.append-bottom-15
2 2 %li= render partial: 'shared/ref_switcher', locals: {destination: 'commits'}
3 3  
4 4 = nav_link(controller: [:commit, :commits]) do
... ...
app/views/projects/issues/_head.html.haml
  Diff comments   View file @0392669
1   -%ul.nav.nav-tabs
  1 +%ul.nav.nav-tabs.append-bottom-15
2 2 = nav_link(controller: :issues) do
3 3 = link_to project_issues_path(@project), class: "tab" do
4 4 Browse Issues
... ...
app/views/projects/tree/_tree.html.haml
  Diff comments   View file @0392669
... ... @@ -4,14 +4,12 @@
4 4 = link_to project_tree_path(@project, @ref) do
5 5 = @project.path
6 6 - tree_breadcrumbs(tree, 6) do |title, path|
7   - \/
8 7 %li
9 8 - if path
10 9 = link_to truncate(title, length: 40), project_tree_path(@project, path)
11 10 - else
12 11 = link_to title, '#'
13 12 - if @repository.branch_names.include?(@ref)
14   - \/
15 13 %li
16 14 = link_to project_new_tree_path(@project, @id), title: 'New file', id: 'new-file-link' do
17 15 %small
... ...