Commit 447b46ca authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Make app start with bootstrap 3 gem

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent da424448
/** Override bootstrap variables **/ /** Override bootstrap variables **/
$baseFontSize: 13px !default; $font-size-base: 13px !default;
$baseLineHeight: 18px !default;
@import 'bootstrap';
/** /**
* BOOTSTRAP * BOOTSTRAP
*/ */
@import "bootstrap/variables"; /*@import "bootstrap/variables";*/
@import "bootstrap/mixins"; /*@import "bootstrap/mixins";*/
@import "bootstrap/reset"; /*@import "bootstrap/reset";*/
@import "bootstrap/scaffolding"; /*@import "bootstrap/scaffolding";*/
@import "bootstrap/grid"; /*@import "bootstrap/grid";*/
@import "bootstrap/layouts"; /*@import "bootstrap/layouts";*/
@import "bootstrap/type"; /*@import "bootstrap/type";*/
@import "bootstrap/code"; /*@import "bootstrap/code";*/
@import "bootstrap/forms"; /*@import "bootstrap/forms";*/
@import "bootstrap/tables"; /*@import "bootstrap/tables";*/
@import "bootstrap/sprites"; /*@import "bootstrap/sprites";*/
@import "bootstrap/dropdowns"; /*@import "bootstrap/dropdowns";*/
@import "bootstrap/wells"; /*@import "bootstrap/wells";*/
@import "bootstrap/component-animations"; /*@import "bootstrap/component-animations";*/
@import "bootstrap/close"; /*@import "bootstrap/close";*/
@import "bootstrap/button-groups"; /*@import "bootstrap/button-groups";*/
@import "bootstrap/alerts"; /*@import "bootstrap/alerts";*/
@import "bootstrap/navs"; /*@import "bootstrap/navs";*/
@import "bootstrap/navbar"; /*@import "bootstrap/navbar";*/
@import "bootstrap/breadcrumbs"; /*@import "bootstrap/breadcrumbs";*/
@import "bootstrap/pagination"; /*@import "bootstrap/pagination";*/
@import "bootstrap/pager"; /*@import "bootstrap/pager";*/
@import "bootstrap/modals"; /*@import "bootstrap/modals";*/
@import "bootstrap/tooltip"; /*@import "bootstrap/tooltip";*/
@import "bootstrap/popovers"; /*@import "bootstrap/popovers";*/
@import "bootstrap/thumbnails"; /*@import "bootstrap/thumbnails";*/
@import "bootstrap/media"; /*@import "bootstrap/media";*/
@import "bootstrap/labels-badges"; /*@import "bootstrap/labels-badges";*/
@import "bootstrap/progress-bars"; /*@import "bootstrap/progress-bars";*/
@import "bootstrap/accordion"; /*@import "bootstrap/accordion";*/
@import "bootstrap/carousel"; /*@import "bootstrap/carousel";*/
@import "bootstrap/hero-unit"; /*@import "bootstrap/hero-unit";*/
@import "bootstrap/utilities"; /*@import "bootstrap/utilities";*/
@import "bootstrap/responsive-utilities"; /*@import "bootstrap/responsive-utilities";*/
@import "bootstrap/responsive-1200px-min"; /*@import "bootstrap/responsive-1200px-min";*/
/** /**
* Font icons * Font icons
......
...@@ -4,8 +4,9 @@ ...@@ -4,8 +4,9 @@
*/ */
header { header {
&.navbar-gitlab { &.navbar-gitlab {
margin-bottom: 0;
.navbar-inner { .navbar-inner {
height: 40px; /*height: 40px;*/
padding: 3px; padding: 3px;
background: #F1F1F1; background: #F1F1F1;
filter: none; filter: none;
......
...@@ -119,7 +119,6 @@ ul.notes { ...@@ -119,7 +119,6 @@ ul.notes {
} }
.file .notes_holder { .file .notes_holder {
font-family: $sansFontFamily;
font-size: 13px; font-size: 13px;
line-height: 18px; line-height: 18px;
...@@ -138,7 +137,7 @@ ul.notes { ...@@ -138,7 +137,7 @@ ul.notes {
border-left: 1px solid #ddd !important; border-left: 1px solid #ddd !important;
} }
&.notes_content { &.notes_content {
background-color: $white; background-color: #fff;
border-width: 1px 0; border-width: 1px 0;
padding-top: 0; padding-top: 0;
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
%h1 GITLAB %h1 GITLAB
%span.separator %span.separator
%h1.project_name= title %h1.project_name= title
%ul.nav %ul.nav.navbar-nav
%li %li
%a %a
%div.hide.turbolink-spinner %div.hide.turbolink-spinner
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment