Skip to content
GitLab
Commit 542f9973 authored by Mark Otto's avatar Mark Otto
Browse files

Fix navbar margins and update grid sidebar styles to match

parent bb3157c2
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 44 additions and 35 deletions
+44 -35
dist/css/bootstrap.css
+ 14
- 14
View file @ 542f9973
......@@ -3189,8 +3189,8 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
}
}
.navbar-collapse {
padding-right: 0rem;
padding-left: 0rem;
padding-right: .75rem;
padding-left: .75rem;
overflow-x: visible;
-webkit-overflow-scrolling: touch;
border-top: 1px solid transparent;
......@@ -3237,8 +3237,8 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
.container-fluid > .navbar-header,
.container > .navbar-collapse,
.container-fluid > .navbar-collapse {
margin-right: -0rem;
margin-left: -0rem;
margin-right: -.75rem;
margin-left: -.75rem;
}
@media (min-width: 48em) {
.container > .navbar-header,
......@@ -3285,7 +3285,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
.navbar-brand {
float: left;
height: 50px;
padding: 13px 0rem;
padding: 13px .75rem;
font-size: 1.25rem;
line-height: 24px;
}
......@@ -3299,7 +3299,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
@media (min-width: 48em) {
.navbar > .container .navbar-brand,
.navbar > .container-fluid .navbar-brand {
margin-left: -0rem;
margin-left: -.75rem;
}
}
.navbar-toggle {
......@@ -3307,7 +3307,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
float: right;
padding: 9px 10px;
margin-top: 8px;
margin-right: 0rem;
margin-right: .75rem;
margin-bottom: 8px;
background-color: transparent;
background-image: none;
......@@ -3332,7 +3332,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
}
}
.navbar-nav {
margin: 6.5px -0rem;
margin: 6.5px -.75rem;
}
.navbar-nav > li > a {
padding-top: 10px;
......@@ -3376,11 +3376,11 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
}
}
.navbar-form {
padding: 10px 0rem;
padding: 10px .75rem;
margin-top: 23.65px;
margin-right: -0rem;
margin-right: -.75rem;
margin-bottom: 23.65px;
margin-left: -0rem;
margin-left: -.75rem;
border-top: 1px solid transparent;
border-bottom: 1px solid transparent;
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1), 0 1px 0 rgba(255, 255, 255, .1);
......@@ -3478,8 +3478,8 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
@media (min-width: 48em) {
.navbar-text {
float: left;
margin-right: 0rem;
margin-left: 0rem;
margin-right: .75rem;
margin-left: .75rem;
}
}
@media (min-width: 48em) {
......@@ -3488,7 +3488,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
}
.navbar-right {
float: right !important;
margin-right: -0rem;
margin-right: -.75rem;
}
.navbar-right ~ .navbar-right {
margin-right: 0;
......
dist/css/bootstrap.css.map
+42 bytes (+0%)
View file @ 542f9973
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
dist/css/bootstrap.min.css
+ 1
- 1
View file @ 542f9973
This diff is collapsed.
docs/_includes/nav/docs.html
+ 4
- 1
View file @ 542f9973
......@@ -7,7 +7,10 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a href="../" class="navbar-brand">Bootstrap</a>
<a href="../" class="navbar-brand">
<span class="visible-xs">Bootstrap</span>
<span class="bs-docs-booticon bs-docs-booticon-md hidden-xs">B</span>
</a>
</div>
<nav class="collapse navbar-collapse bs-sidenav-collapse" role="navigation">
<div class="bs-docs-toc-item{% if page.slug == "getting-started" %} active{% endif %}">
......
docs/assets/css/docs.min.css
+ 1
- 1
View file @ 542f9973
This diff is collapsed.
docs/assets/css/src/docs.css
+ 8
- 2
View file @ 542f9973
......@@ -73,6 +73,12 @@ body {
font-size: 20px;
line-height: 28px;
}
.bs-docs-booticon-md {
width: 40px;
height: 40px;
font-size: 28px;
line-height: 40px;
}
.bs-docs-booticon-lg {
width: 144px;
height: 144px;
......@@ -644,8 +650,8 @@ body {
display: none;
}
.bs-docs-toc-item {
margin-right: -15px;
margin-left: -15px;
margin-right: -.75rem;
margin-left: -.75rem;
}
.bs-docs-toc-link {
......
docs/dist/css/bootstrap.css
+ 14
- 14
View file @ 542f9973
......@@ -3189,8 +3189,8 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
}
}
.navbar-collapse {
padding-right: 0rem;
padding-left: 0rem;
padding-right: .75rem;
padding-left: .75rem;
overflow-x: visible;
-webkit-overflow-scrolling: touch;
border-top: 1px solid transparent;
......@@ -3237,8 +3237,8 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
.container-fluid > .navbar-header,
.container > .navbar-collapse,
.container-fluid > .navbar-collapse {
margin-right: -0rem;
margin-left: -0rem;
margin-right: -.75rem;
margin-left: -.75rem;
}
@media (min-width: 48em) {
.container > .navbar-header,
......@@ -3285,7 +3285,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
.navbar-brand {
float: left;
height: 50px;
padding: 13px 0rem;
padding: 13px .75rem;
font-size: 1.25rem;
line-height: 24px;
}
......@@ -3299,7 +3299,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
@media (min-width: 48em) {
.navbar > .container .navbar-brand,
.navbar > .container-fluid .navbar-brand {
margin-left: -0rem;
margin-left: -.75rem;
}
}
.navbar-toggle {
......@@ -3307,7 +3307,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
float: right;
padding: 9px 10px;
margin-top: 8px;
margin-right: 0rem;
margin-right: .75rem;
margin-bottom: 8px;
background-color: transparent;
background-image: none;
......@@ -3332,7 +3332,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
}
}
.navbar-nav {
margin: 6.5px -0rem;
margin: 6.5px -.75rem;
}
.navbar-nav > li > a {
padding-top: 10px;
......@@ -3376,11 +3376,11 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
}
}
.navbar-form {
padding: 10px 0rem;
padding: 10px .75rem;
margin-top: 23.65px;
margin-right: -0rem;
margin-right: -.75rem;
margin-bottom: 23.65px;
margin-left: -0rem;
margin-left: -.75rem;
border-top: 1px solid transparent;
border-bottom: 1px solid transparent;
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1), 0 1px 0 rgba(255, 255, 255, .1);
......@@ -3478,8 +3478,8 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
@media (min-width: 48em) {
.navbar-text {
float: left;
margin-right: 0rem;
margin-left: 0rem;
margin-right: .75rem;
margin-left: .75rem;
}
}
@media (min-width: 48em) {
......@@ -3488,7 +3488,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
}
.navbar-right {
float: right !important;
margin-right: -0rem;
margin-right: -.75rem;
}
.navbar-right ~ .navbar-right {
margin-right: 0;
......
docs/dist/css/bootstrap.css.map
+42 bytes (+0%)
View file @ 542f9973
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
docs/dist/css/bootstrap.min.css
+ 1
- 1
View file @ 542f9973
This diff is collapsed.
less/variables.less
+ 1
- 1
View file @ 542f9973
......@@ -311,7 +311,7 @@
@navbar-height: 50px;
@navbar-margin-bottom: @line-height-computed;
@navbar-border-radius: @border-radius-base;
@navbar-padding-horizontal: floor((@grid-gutter-width / 2));
@navbar-padding-horizontal: (@grid-gutter-width / 2);
@navbar-padding-vertical: ((@navbar-height - @line-height-computed) / 2);
@navbar-collapse-max-height: 340px;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment