Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SRCT
masonstrap
Commits
9f7a95b8
Commit
9f7a95b8
authored
Sep 04, 2014
by
Thomas Park
Browse files
paper: fix nav-justified border, closes #322
parent
ce44be19
Changes
4
Hide whitespace changes
Inline
Side-by-side
paper/bootstrap.css
View file @
9f7a95b8
...
...
@@ -3665,11 +3665,11 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
.nav-tabs.nav-justified
>
.active
>
a
,
.nav-tabs.nav-justified
>
.active
>
a
:hover
,
.nav-tabs.nav-justified
>
.active
>
a
:focus
{
border
:
1px
solid
#dddddd
;
border
:
1px
solid
transparent
;
}
@media
(
min-width
:
768px
)
{
.nav-tabs.nav-justified
>
li
>
a
{
border-bottom
:
1px
solid
#dddddd
;
border-bottom
:
1px
solid
transparent
;
border-radius
:
3px
3px
0
0
;
}
.nav-tabs.nav-justified
>
.active
>
a
,
...
...
@@ -3733,11 +3733,11 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
.nav-tabs-justified
>
.active
>
a
,
.nav-tabs-justified
>
.active
>
a
:hover
,
.nav-tabs-justified
>
.active
>
a
:focus
{
border
:
1px
solid
#dddddd
;
border
:
1px
solid
transparent
;
}
@media
(
min-width
:
768px
)
{
.nav-tabs-justified
>
li
>
a
{
border-bottom
:
1px
solid
#dddddd
;
border-bottom
:
1px
solid
transparent
;
border-radius
:
3px
3px
0
0
;
}
.nav-tabs-justified
>
.active
>
a
,
...
...
@@ -6385,11 +6385,18 @@ select.form-control {
}
.nav-tabs
>
li
.active
>
a
:hover
{
border
:
none
;
color
:
#2196f3
;
}
.nav-tabs
>
li
.disabled
>
a
{
-webkit-box-shadow
:
inset
0
-1px
0
#dddddd
;
box-shadow
:
inset
0
-1px
0
#dddddd
;
}
.nav-tabs.nav-justified
>
li
>
a
,
.nav-tabs.nav-justified
>
li
>
a
:hover
,
.nav-tabs.nav-justified
>
.active
>
a
,
.nav-tabs.nav-justified
>
.active
>
a
:hover
{
border
:
none
;
}
.nav-tabs
.dropdown-menu
{
margin-top
:
0
;
}
...
...
paper/bootstrap.min.css
View file @
9f7a95b8
This source diff could not be displayed because it is too large. You can
view the blob
instead.
paper/bootswatch.less
View file @
9f7a95b8
...
...
@@ -189,6 +189,7 @@ select.form-control {
&:hover {
border: none;
color: @brand-primary;
}
}
...
...
@@ -196,6 +197,16 @@ select.form-control {
.box-shadow(inset 0 -1px 0 #ddd);
}
&.nav-justified {
& > li > a,
& > li > a:hover,
& > .active > a,
& > .active > a:hover {
border: none;
}
}
.dropdown-menu {
margin-top: 0;
}
...
...
paper/variables.less
View file @
9f7a95b8
...
...
@@ -414,7 +414,7 @@
@nav-tabs-active-link-hover-color: @gray;
@nav-tabs-active-link-hover-border-color: transparent;
@nav-tabs-justified-link-border-color:
#ddd
;
@nav-tabs-justified-link-border-color:
@nav-tabs-border-color
;
@nav-tabs-justified-active-link-border-color: @body-bg;
//== Pills
...
...
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