Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
b2c3f1d7e1b4
Unverified
Commit
447b46ca
authored
Dec 30, 2013
by
Dmitriy Zaporozhets
Browse files
Make app start with bootstrap 3 gem
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
9974cd2c074a
Changes
4
Hide whitespace changes
Inline
Side-by-side
app/assets/stylesheets/gitlab_bootstrap.scss
View file @
b2c3f1d7
/** 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
View file @
b2c3f1d7
...
...
@@ -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
View file @
b2c3f1d7
...
...
@@ -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
View file @
b2c3f1d7
...
...
@@ -7,7 +7,7 @@
%h1
GITLAB
%span
.separator
%h1
.project_name
=
title
%ul
.nav
%ul
.nav
.navbar-nav
%li
%a
%div
.hide.turbolink-spinner
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment