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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
b1b3f485
Commit
b1b3f485
authored
Jan 03, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move nav-tabs to gl_bootstrap
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
6dfbd3f7
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
39 additions
and
32 deletions
+39
-32
app/assets/stylesheets/generic/nav.scss
app/assets/stylesheets/generic/nav.scss
+5
-32
app/assets/stylesheets/gl_bootstrap.scss
app/assets/stylesheets/gl_bootstrap.scss
+34
-0
No files found.
app/assets/stylesheets/generic/nav.scss
View file @
b1b3f485
...
@@ -22,6 +22,11 @@
...
@@ -22,6 +22,11 @@
background
:
none
;
background
:
none
;
color
:
#333
;
color
:
#333
;
font-weight
:
bolder
;
font-weight
:
bolder
;
&
:hover
{
background
:
none
;
color
:
#333
;
}
}
}
&
.nav-stacked-menu
{
&
.nav-stacked-menu
{
...
@@ -48,38 +53,6 @@
...
@@ -48,38 +53,6 @@
*
*
*/
*/
.nav-tabs
>
li
>
a
,
.nav-pills
>
li
>
a
{
color
:
$style_color
;
}
.nav-tabs
>
li
>
a
,
.nav-pills
>
li
>
a
{
color
:
$style_color
;
}
.nav.nav-tabs
{
li
{
>
a
{
padding
:
8px
20px
;
margin-right
:
7px
;
line-height
:
20px
;
border-color
:
#EEE
;
color
:
#888
;
border-bottom
:
1px
solid
#ddd
;
.badge
{
background-color
:
#eee
;
color
:
#888
;
text-shadow
:
0
1px
1px
#fff
;
}
i
[
class
^=
"icon-"
]
{
line-height
:
14px
;
}
}
&
.active
{
>
a
{
border-color
:
#CCC
;
border-bottom
:
1px
solid
#fff
;
color
:
#333
;
font-weight
:
bold
;
}
}
}
&
.nav-small-tabs
>
li
>
a
{
padding
:
6px
9px
;
}
}
/**
/**
* fix to keep tooltips position in top navigation bar
* fix to keep tooltips position in top navigation bar
...
...
app/assets/stylesheets/gl_bootstrap.scss
View file @
b1b3f485
...
@@ -93,3 +93,37 @@
...
@@ -93,3 +93,37 @@
background-color
:
#333333
;
background-color
:
#333333
;
}
}
}
}
// Nav tabs
.nav.nav-tabs
{
li
{
>
a
{
padding
:
8px
20px
;
margin-right
:
7px
;
line-height
:
20px
;
border-color
:
#EEE
;
color
:
#888
;
border-bottom
:
1px
solid
#ddd
;
.badge
{
background-color
:
#eee
;
color
:
#888
;
text-shadow
:
0
1px
1px
#fff
;
}
i
[
class
^=
"icon-"
]
{
line-height
:
14px
;
}
}
&
.active
{
>
a
{
border-color
:
#CCC
;
border-bottom
:
1px
solid
#fff
;
color
:
#333
;
font-weight
:
bold
;
}
}
}
&
.nav-small-tabs
>
li
>
a
{
padding
:
6px
9px
;
}
}
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