root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 14 Packages Projects Releases Wiki Activity

update navbar and nav link values

This commit is contained in:
Mark Otto 2015-04-18 18:15:24 -07:00
parent 325133b33f
commit 209cdf33f9
8 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dist/css/bootstrap.css
View File

@ -2952,7 +2952,7 @@ input[type="submit"].btn-block, input[type="reset"].btn-block, input[type="butto
.nav-link {
display: inline-block;
padding: .6em 1em;
padding: .75em 1em;
line-height: 1;
}
.nav-link:focus, .nav-link:hover {
@ -3098,7 +3098,7 @@ input[type="submit"].btn-block, input[type="reset"].btn-block, input[type="butto
.navbar-brand {
float: left;
padding: .95rem .75rem;
padding: .625rem .75rem;
margin-right: 1rem;
margin-bottom: 0;
font-size: 1.25rem;
@ -3178,6 +3178,10 @@ input[type="submit"].btn-block, input[type="reset"].btn-block, input[type="butto
padding-top: 0;
padding-bottom: 0;
}
.navbar-condensed .navbar-brand {
padding-top: .95rem;
padding-bottom: .95rem;
}
.navbar-condensed .form-inline, .navbar-condensed .navbar-form {
margin-top: .6rem;
}

2
dist/css/bootstrap.css.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

8
docs/dist/css/bootstrap.css
View File

@ -2952,7 +2952,7 @@ input[type="submit"].btn-block, input[type="reset"].btn-block, input[type="butto
.nav-link {
display: inline-block;
padding: .6em 1em;
padding: .75em 1em;
line-height: 1;
}
.nav-link:focus, .nav-link:hover {
@ -3098,7 +3098,7 @@ input[type="submit"].btn-block, input[type="reset"].btn-block, input[type="butto
.navbar-brand {
float: left;
padding: .95rem .75rem;
padding: .625rem .75rem;
margin-right: 1rem;
margin-bottom: 0;
font-size: 1.25rem;
@ -3178,6 +3178,10 @@ input[type="submit"].btn-block, input[type="reset"].btn-block, input[type="butto
padding-top: 0;
padding-bottom: 0;
}
.navbar-condensed .navbar-brand {
padding-top: .95rem;
padding-bottom: .95rem;
}
.navbar-condensed .form-inline, .navbar-condensed .navbar-form {
margin-top: .6rem;
}

2
docs/dist/css/bootstrap.css.map vendored
View File

File diff suppressed because one or more lines are too long

2
docs/dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

7
scss/_navbar.scss
View File

@ -75,7 +75,7 @@
.navbar-brand {
float: left;
padding: .95rem .75rem;
padding: .625rem .75rem;
margin-right: $spacer;
margin-bottom: 0; // For headings
font-size: $font-size-lg;
@ -243,6 +243,11 @@
padding-top: 0;
padding-bottom: 0;
.navbar-brand {
padding-top: .95rem;
padding-bottom: .95rem;
}
.form-inline {
margin-top: .6rem;
}

2
scss/_variables.scss
View File

@ -326,7 +326,7 @@ $navbar-inverse-toggle-border-color: #333 !default;
// Navs
$nav-link-padding: .6em 1em !default;
$nav-link-padding: .75em 1em !default;
$nav-link-hover-bg: $gray-lighter !default;
$nav-disabled-link-color: $gray-light !default;