Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
55024ed1
Commit
55024ed1
authored
Jan 13, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use default bootstrap pills
parent
3f71f2fa
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
45 deletions
+5
-45
app/assets/stylesheets/gl_bootstrap.scss
app/assets/stylesheets/gl_bootstrap.scss
+4
-42
app/assets/stylesheets/main/variables.scss
app/assets/stylesheets/main/variables.scss
+1
-3
No files found.
app/assets/stylesheets/gl_bootstrap.scss
View file @
55024ed1
...
@@ -6,6 +6,9 @@
...
@@ -6,6 +6,9 @@
*
*
*/
*/
$font-size-base
:
13px
!
default
;
$nav-pills-active-link-hover-bg
:
$bg_style_color
;
$pagination-active-bg
:
$bg_style_color
;
// Core variables and mixins
// Core variables and mixins
@import
"bootstrap/variables"
;
@import
"bootstrap/variables"
;
...
@@ -137,49 +140,8 @@
...
@@ -137,49 +140,8 @@
}
}
}
}
.nav-tabs
>
li
>
a
,
.nav-pills
>
li
>
a
{
color
:
$style_color
;
}
.nav-tabs
>
li
>
a
,
.nav-pills
>
li
>
a
{
color
:
#666
;
}
// Nav pills
.nav-pills
{
.active
a
{
background
:
$primary_color
;
}
&
.nav-stacked
{
>
li
>
a
{
@include
border-radius
(
0
);
border-left
:
4px
solid
#EEE
;
padding
:
12px
;
color
:
#777
;
}
>
.active
>
a
{
border-color
:
$primary_color
;
background
:
none
;
color
:
#333
;
font-weight
:
bolder
;
&
:hover
{
background
:
none
;
color
:
#333
;
}
}
&
.nav-stacked-menu
{
li
>
a
{
padding
:
16px
;
}
}
}
&
.nav-pills-small
{
>
li
>
a
{
padding
:
8px
12px
;
font-size
:
12px
;
}
}
}
.nav-pills
>
.active
>
a
>
i
[
class
^=
"icon-"
]
{
background
:
inherit
;
}
/*
/*
* Callouts from Bootstrap3 docs
* Callouts from Bootstrap3 docs
...
...
app/assets/stylesheets/main/variables.scss
View file @
55024ed1
/** Override bootstrap variables **/
$font-size-base
:
13px
!
default
;
/**
/**
* General Colors
* General Colors
*/
*/
$primary_color
:
#2FA0BB
;
$primary_color
:
#2FA0BB
;
$link_color
:
#3A89A3
;
$link_color
:
#3A89A3
;
$style_color
:
#474D57
;
$style_color
:
#474D57
;
$bg_style_color
:
#2299BB
;
$hover
:
#D9EDF7
;
$hover
:
#D9EDF7
;
/**
/**
...
...
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