home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-18 00:56:41 +10:00
Code Issues Packages Projects Releases Wiki Activity

Make app start with bootstrap 3 gem

Browse Source 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
Dmitriy Zaporozhets
2013-12-30 23:53:16 +02:00
parent da4244484b
commit 447b46ca18
4 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/stylesheets/gitlab_bootstrap.scss
+37 -37
View File
@@ -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
app/assets/stylesheets/sections/header.scss
+2 -1
View File
@@ -4,8 +4,9 @@
*/
header {
&.navbar-gitlab {
margin-bottom: 0;
.navbar-inner {
height: 40px;
/*height: 40px;*/
padding: 3px;
background: #F1F1F1;
filter: none;
app/assets/stylesheets/sections/notes.scss
+1 -2
View File
@@ -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;
app/views/layouts/_head_panel.html.haml
+1 -1
View File
@@ -7,7 +7,7 @@
%h1 GITLAB
%span.separator
%h1.project_name= title
%ul.nav
%ul.nav.navbar-nav
%li
%a
%div.hide.turbolink-spinner