Download as
Browse Code »

Commit 447b46ca186d3b1fc14898bbd932485569d71c68

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

Make app start with bootstrap 3 gem 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 4 changed files with 41 additions and 41 deletions   Show diff stats
app/assets/stylesheets/gitlab_bootstrap.scss
  Diff comments   View file @447b46c
1 1 /** Override bootstrap variables **/
2   -$baseFontSize: 13px !default;
3   -$baseLineHeight: 18px !default;
  2 +$font-size-base: 13px !default;
4 3  
  4 +@import 'bootstrap';
5 5 /**
6 6 * BOOTSTRAP
7 7 */
8   -@import "bootstrap/variables";
9   -@import "bootstrap/mixins";
10   -@import "bootstrap/reset";
11   -@import "bootstrap/scaffolding";
12   -@import "bootstrap/grid";
13   -@import "bootstrap/layouts";
14   -@import "bootstrap/type";
15   -@import "bootstrap/code";
16   -@import "bootstrap/forms";
17   -@import "bootstrap/tables";
18   -@import "bootstrap/sprites";
19   -@import "bootstrap/dropdowns";
20   -@import "bootstrap/wells";
21   -@import "bootstrap/component-animations";
22   -@import "bootstrap/close";
23   -@import "bootstrap/button-groups";
24   -@import "bootstrap/alerts";
25   -@import "bootstrap/navs";
26   -@import "bootstrap/navbar";
27   -@import "bootstrap/breadcrumbs";
28   -@import "bootstrap/pagination";
29   -@import "bootstrap/pager";
30   -@import "bootstrap/modals";
31   -@import "bootstrap/tooltip";
32   -@import "bootstrap/popovers";
33   -@import "bootstrap/thumbnails";
34   -@import "bootstrap/media";
35   -@import "bootstrap/labels-badges";
36   -@import "bootstrap/progress-bars";
37   -@import "bootstrap/accordion";
38   -@import "bootstrap/carousel";
39   -@import "bootstrap/hero-unit";
40   -@import "bootstrap/utilities";
41   -@import "bootstrap/responsive-utilities";
42   -@import "bootstrap/responsive-1200px-min";
  8 +/*@import "bootstrap/variables";*/
  9 +/*@import "bootstrap/mixins";*/
  10 +/*@import "bootstrap/reset";*/
  11 +/*@import "bootstrap/scaffolding";*/
  12 +/*@import "bootstrap/grid";*/
  13 +/*@import "bootstrap/layouts";*/
  14 +/*@import "bootstrap/type";*/
  15 +/*@import "bootstrap/code";*/
  16 +/*@import "bootstrap/forms";*/
  17 +/*@import "bootstrap/tables";*/
  18 +/*@import "bootstrap/sprites";*/
  19 +/*@import "bootstrap/dropdowns";*/
  20 +/*@import "bootstrap/wells";*/
  21 +/*@import "bootstrap/component-animations";*/
  22 +/*@import "bootstrap/close";*/
  23 +/*@import "bootstrap/button-groups";*/
  24 +/*@import "bootstrap/alerts";*/
  25 +/*@import "bootstrap/navs";*/
  26 +/*@import "bootstrap/navbar";*/
  27 +/*@import "bootstrap/breadcrumbs";*/
  28 +/*@import "bootstrap/pagination";*/
  29 +/*@import "bootstrap/pager";*/
  30 +/*@import "bootstrap/modals";*/
  31 +/*@import "bootstrap/tooltip";*/
  32 +/*@import "bootstrap/popovers";*/
  33 +/*@import "bootstrap/thumbnails";*/
  34 +/*@import "bootstrap/media";*/
  35 +/*@import "bootstrap/labels-badges";*/
  36 +/*@import "bootstrap/progress-bars";*/
  37 +/*@import "bootstrap/accordion";*/
  38 +/*@import "bootstrap/carousel";*/
  39 +/*@import "bootstrap/hero-unit";*/
  40 +/*@import "bootstrap/utilities";*/
  41 +/*@import "bootstrap/responsive-utilities";*/
  42 +/*@import "bootstrap/responsive-1200px-min";*/
43 43  
44 44 /**
45 45 * Font icons
... ...
app/assets/stylesheets/sections/header.scss
  Diff comments   View file @447b46c
... ... @@ -4,8 +4,9 @@
4 4 */
5 5 header {
6 6 &.navbar-gitlab {
  7 + margin-bottom: 0;
7 8 .navbar-inner {
8   - height: 40px;
  9 + /*height: 40px;*/
9 10 padding: 3px;
10 11 background: #F1F1F1;
11 12 filter: none;
... ...
app/assets/stylesheets/sections/notes.scss
  Diff comments   View file @447b46c
... ... @@ -119,7 +119,6 @@ ul.notes {
119 119 }
120 120  
121 121 .file .notes_holder {
122   - font-family: $sansFontFamily;
123 122 font-size: 13px;
124 123 line-height: 18px;
125 124  
... ... @@ -138,7 +137,7 @@ ul.notes {
138 137 border-left: 1px solid #ddd !important;
139 138 }
140 139 &.notes_content {
141   - background-color: $white;
  140 + background-color: #fff;
142 141 border-width: 1px 0;
143 142 padding-top: 0;
144 143  
... ...
app/views/layouts/_head_panel.html.haml
  Diff comments   View file @447b46c
... ... @@ -7,7 +7,7 @@
7 7 %h1 GITLAB
8 8 %span.separator
9 9 %h1.project_name= title
10   - %ul.nav
  10 + %ul.nav.navbar-nav
11 11 %li
12 12 %a
13 13 %div.hide.turbolink-spinner
... ...