Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Normalize examples' CSS. #24210

Merged
merged 2 commits into from
Oct 2, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 3 additions & 5 deletions docs/4.0/examples/blog/blog.css
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ h4, .h4,
h5, .h5,
h6, .h6 {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-weight: normal;
font-weight: 400;
color: #333;
}

Expand All @@ -41,8 +41,7 @@ h6, .h6 {
.blog-masthead {
margin-bottom: 3rem;
background-color: #428bca;
-webkit-box-shadow: inset 0 -.1rem .25rem rgba(0,0,0,.1);
box-shadow: inset 0 -.1rem .25rem rgba(0,0,0,.1);
box-shadow: inset 0 -.1rem .25rem rgba(0,0,0,.1);
}

/* Nav links */
Expand Down Expand Up @@ -89,7 +88,7 @@ h6, .h6 {
.blog-title {
margin-bottom: 0;
font-size: 2rem;
font-weight: normal;
font-weight: 400;
}
.blog-description {
font-size: 1.1rem;
Expand All @@ -110,7 +109,6 @@ h6, .h6 {
/* Sidebar modules for boxing content */
.sidebar-module {
padding: 1rem;
/*margin: 0 -1rem 1rem;*/
}
.sidebar-module-inset {
padding: 1rem;
Expand Down
4 changes: 2 additions & 2 deletions docs/4.0/examples/carousel/carousel.css
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ body {
}
/* Since positioning the image, we need to help out the caption */
.carousel-caption {
z-index: 10;
bottom: 3rem;
z-index: 10;
}

/* Declare heights because of positioning of img element */
Expand All @@ -45,7 +45,7 @@ body {
text-align: center;
}
.marketing h2 {
font-weight: normal;
font-weight: 400;
}
.marketing .col-lg-4 p {
margin-right: .75rem;
Expand Down
9 changes: 5 additions & 4 deletions docs/4.0/examples/cover/cover.css
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@ body {
width: 100%;
height: 100%; /* For at least Firefox */
min-height: 100%;
-webkit-box-shadow: inset 0 0 5rem rgba(0,0,0,.5);
box-shadow: inset 0 0 5rem rgba(0,0,0,.5);
box-shadow: inset 0 0 5rem rgba(0,0,0,.5);
}
.site-wrapper-inner {
display: table-cell;
Expand Down Expand Up @@ -73,7 +72,7 @@ body {

.nav-masthead .nav-link {
padding: .25rem 0;
font-weight: bold;
font-weight: 700;
color: rgba(255,255,255,.5);
background-color: transparent;
border-bottom: .25rem solid transparent;
Expand Down Expand Up @@ -112,7 +111,7 @@ body {
}
.cover .btn-lg {
padding: .75rem 1.25rem;
font-weight: bold;
font-weight: 700;
}


Expand All @@ -139,10 +138,12 @@ body {
position: fixed;
bottom: 0;
}

/* Start the vertical centering */
.site-wrapper-inner {
vertical-align: middle;
}

/* Handle the widths */
.masthead,
.mastfoot,
Expand Down
6 changes: 3 additions & 3 deletions docs/4.0/examples/dashboard/dashboard.css
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ body {
*/

h1 {
margin-bottom: 20px;
padding-bottom: 9px;
margin-bottom: 20px;
border-bottom: 1px solid #eee;
}

Expand All @@ -35,8 +35,8 @@ h1 {

/* Sidebar navigation */
.sidebar {
padding-left: 0;
padding-right: 0;
padding-left: 0;
}

.sidebar .nav {
Expand All @@ -59,7 +59,7 @@ h1 {
* Dashboard
*/

/* Placeholders */
/* Placeholders */
.placeholders {
padding-bottom: 3rem;
}
Expand Down
11 changes: 2 additions & 9 deletions docs/4.0/examples/justified-nav/justified-nav.css
Original file line number Diff line number Diff line change
Expand Up @@ -20,26 +20,19 @@ body {
}

.navbar {
background-image: -webkit-gradient(linear, left top, left bottom, from(#f7f7f7),to(#eee));
background-image: -webkit-linear-gradient(top, #f7f7f7 0%,#eee 100%);
background-image: -o-linear-gradient(top, #f7f7f7 0%,#eee 100%);
background-image: linear-gradient(to bottom, #f7f7f7 0%,#eee 100%);
border: 1px solid #e5e5e5;
}

@media (min-width: 768px) {
.navbar-nav {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
}

.navbar-nav .nav-item {
-webkit-box-flex: 1;
-webkit-flex: 1 0 auto;
-ms-flex: 1 0 auto;
flex: 1 0 auto;
-ms-flex: 1 0 auto;
flex: 1 0 auto;
}
}

Expand Down
3 changes: 3 additions & 0 deletions docs/4.0/examples/narrow-jumbotron/narrow-jumbotron.css
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ body {
padding-bottom: 1rem;
border-bottom: .05rem solid #e5e5e5;
}

/* Make the masthead heading the same height as the navigation */
.header h3 {
margin-top: 0;
Expand Down Expand Up @@ -68,10 +69,12 @@ body {
padding-right: 0;
padding-left: 0;
}

/* Space out the masthead */
.header {
margin-bottom: 2rem;
}

/* Remove the bottom border on the jumbotron for visual effect */
.jumbotron {
border-bottom: 0;
Expand Down
1 change: 0 additions & 1 deletion docs/4.0/examples/navbars/navbar.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
body {
/*padding-top: 20px;*/
padding-bottom: 20px;
}

Expand Down
16 changes: 5 additions & 11 deletions docs/4.0/examples/offcanvas/offcanvas.css
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@ footer {
@media screen and (max-width: 767px) {
.row-offcanvas {
position: relative;
-webkit-transition: all .25s ease-out;
-o-transition: all .25s ease-out;
transition: all .25s ease-out;
transition: all .25s ease-out;
}

.row-offcanvas-right {
Expand All @@ -33,23 +31,19 @@ footer {
left: 0;
}

.row-offcanvas-right
.sidebar-offcanvas {
.row-offcanvas-right .sidebar-offcanvas {
right: -100%; /* 12 columns */
}

.row-offcanvas-right.active
.sidebar-offcanvas {
.row-offcanvas-right.active .sidebar-offcanvas {
right: -50%; /* 6 columns */
}

.row-offcanvas-left
.sidebar-offcanvas {
.row-offcanvas-left .sidebar-offcanvas {
left: -100%; /* 12 columns */
}

.row-offcanvas-left.active
.sidebar-offcanvas {
.row-offcanvas-left.active .sidebar-offcanvas {
left: -50%; /* 6 columns */
}

Expand Down
5 changes: 2 additions & 3 deletions docs/4.0/examples/signin/signin.css
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,12 @@ body {
margin-bottom: 10px;
}
.form-signin .checkbox {
font-weight: normal;
font-weight: 400;
}
.form-signin .form-control {
position: relative;
box-sizing: border-box;
height: auto;
-webkit-box-sizing: border-box;
box-sizing: border-box;
padding: 10px;
font-size: 16px;
}
Expand Down
6 changes: 2 additions & 4 deletions docs/4.0/examples/sticky-footer/sticky-footer.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,13 @@ html {
min-height: 100%;
}
body {
/* Margin bottom by footer height */
margin-bottom: 60px;
margin-bottom: 60px; /* Margin bottom by footer height */
}
.footer {
position: absolute;
bottom: 0;
width: 100%;
/* Set the fixed height of the footer here */
height: 60px;
height: 60px; /* Set the fixed height of the footer here */
line-height: 60px; /* Vertically center the text there */
background-color: #f5f5f5;
}
Expand Down