From 447b46ca186d3b1fc14898bbd932485569d71c68 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 30 Dec 2013 23:53:16 +0200
Subject: [PATCH] Make app start with bootstrap 3 gem

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/assets/stylesheets/gitlab_bootstrap.scss | 74 ++++++++++++++--------------
 app/assets/stylesheets/sections/header.scss  |  3 +-
 app/assets/stylesheets/sections/notes.scss   |  3 +-
 app/views/layouts/_head_panel.html.haml      |  2 +-
 4 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/app/assets/stylesheets/gitlab_bootstrap.scss b/app/assets/stylesheets/gitlab_bootstrap.scss
index 322fab4b4..c851dd9eb 100644
--- a/app/assets/stylesheets/gitlab_bootstrap.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap.scss
@@ -1,45 +1,45 @@
 /** Override bootstrap variables **/
-$baseFontSize: 13px !default;
-$baseLineHeight: 18px !default;
+$font-size-base: 13px !default;
 
+@import 'bootstrap';
 /**
  * BOOTSTRAP
  */
-@import "bootstrap/variables";
-@import "bootstrap/mixins";
-@import "bootstrap/reset";
-@import "bootstrap/scaffolding";
-@import "bootstrap/grid";
-@import "bootstrap/layouts";
-@import "bootstrap/type";
-@import "bootstrap/code";
-@import "bootstrap/forms";
-@import "bootstrap/tables";
-@import "bootstrap/sprites";
-@import "bootstrap/dropdowns";
-@import "bootstrap/wells";
-@import "bootstrap/component-animations";
-@import "bootstrap/close";
-@import "bootstrap/button-groups";
-@import "bootstrap/alerts";
-@import "bootstrap/navs";
-@import "bootstrap/navbar";
-@import "bootstrap/breadcrumbs";
-@import "bootstrap/pagination";
-@import "bootstrap/pager";
-@import "bootstrap/modals";
-@import "bootstrap/tooltip";
-@import "bootstrap/popovers";
-@import "bootstrap/thumbnails";
-@import "bootstrap/media";
-@import "bootstrap/labels-badges";
-@import "bootstrap/progress-bars";
-@import "bootstrap/accordion";
-@import "bootstrap/carousel";
-@import "bootstrap/hero-unit";
-@import "bootstrap/utilities";
-@import "bootstrap/responsive-utilities";
-@import "bootstrap/responsive-1200px-min";
+/*@import "bootstrap/variables";*/
+/*@import "bootstrap/mixins";*/
+/*@import "bootstrap/reset";*/
+/*@import "bootstrap/scaffolding";*/
+/*@import "bootstrap/grid";*/
+/*@import "bootstrap/layouts";*/
+/*@import "bootstrap/type";*/
+/*@import "bootstrap/code";*/
+/*@import "bootstrap/forms";*/
+/*@import "bootstrap/tables";*/
+/*@import "bootstrap/sprites";*/
+/*@import "bootstrap/dropdowns";*/
+/*@import "bootstrap/wells";*/
+/*@import "bootstrap/component-animations";*/
+/*@import "bootstrap/close";*/
+/*@import "bootstrap/button-groups";*/
+/*@import "bootstrap/alerts";*/
+/*@import "bootstrap/navs";*/
+/*@import "bootstrap/navbar";*/
+/*@import "bootstrap/breadcrumbs";*/
+/*@import "bootstrap/pagination";*/
+/*@import "bootstrap/pager";*/
+/*@import "bootstrap/modals";*/
+/*@import "bootstrap/tooltip";*/
+/*@import "bootstrap/popovers";*/
+/*@import "bootstrap/thumbnails";*/
+/*@import "bootstrap/media";*/
+/*@import "bootstrap/labels-badges";*/
+/*@import "bootstrap/progress-bars";*/
+/*@import "bootstrap/accordion";*/
+/*@import "bootstrap/carousel";*/
+/*@import "bootstrap/hero-unit";*/
+/*@import "bootstrap/utilities";*/
+/*@import "bootstrap/responsive-utilities";*/
+/*@import "bootstrap/responsive-1200px-min";*/
 
 /**
  * Font icons
diff --git a/app/assets/stylesheets/sections/header.scss b/app/assets/stylesheets/sections/header.scss
index 157b9dd9e..276dd872f 100644
--- a/app/assets/stylesheets/sections/header.scss
+++ b/app/assets/stylesheets/sections/header.scss
@@ -4,8 +4,9 @@
  */
 header {
   &.navbar-gitlab {
+    margin-bottom: 0;
     .navbar-inner {
-      height: 40px;
+      /*height: 40px;*/
       padding: 3px;
       background: #F1F1F1;
       filter: none;
diff --git a/app/assets/stylesheets/sections/notes.scss b/app/assets/stylesheets/sections/notes.scss
index 724b8d414..af1f7880a 100644
--- a/app/assets/stylesheets/sections/notes.scss
+++ b/app/assets/stylesheets/sections/notes.scss
@@ -119,7 +119,6 @@ ul.notes {
 }
 
 .file .notes_holder {
-  font-family: $sansFontFamily;
   font-size: 13px;
   line-height: 18px;
 
@@ -138,7 +137,7 @@ ul.notes {
       border-left: 1px solid #ddd !important;
     }
     &.notes_content {
-      background-color: $white;
+      background-color: #fff;
       border-width: 1px 0;
       padding-top: 0;
 
diff --git a/app/views/layouts/_head_panel.html.haml b/app/views/layouts/_head_panel.html.haml
index 80c42fe63..b1fe3aaff 100644
--- a/app/views/layouts/_head_panel.html.haml
+++ b/app/views/layouts/_head_panel.html.haml
@@ -7,7 +7,7 @@
           %h1 GITLAB
         %span.separator
       %h1.project_name= title
-      %ul.nav
+      %ul.nav.navbar-nav
         %li
           %a
             %div.hide.turbolink-spinner
-- 
2.11.0