aboutsummaryrefslogtreecommitdiff
path: root/docs/examples
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2014-12-04 14:18:13 -0800
committerMark Otto <[email protected]>2014-12-04 14:18:13 -0800
commitb8115531479ead21cd91b392ad98bae0d662e87e (patch)
tree652aa7c29593a72dd10dace7a0136cdae2bc99d4 /docs/examples
parent908f776c08bd5a1a04c7e6acdfdce693f943bcec (diff)
downloadbootstrap-b8115531479ead21cd91b392ad98bae0d662e87e.tar.xz
bootstrap-b8115531479ead21cd91b392ad98bae0d662e87e.zip
new look for carousel example, convert to rems
Diffstat (limited to 'docs/examples')
-rw-r--r--docs/examples/carousel/carousel.css86
-rw-r--r--docs/examples/carousel/index.html60
2 files changed, 46 insertions, 100 deletions
diff --git a/docs/examples/carousel/carousel.css b/docs/examples/carousel/carousel.css
index 8833f82dd..7056a41a8 100644
--- a/docs/examples/carousel/carousel.css
+++ b/docs/examples/carousel/carousel.css
@@ -3,44 +3,17 @@
/* Padding below the footer and lighter body text */
body {
- padding-bottom: 40px;
+ padding-bottom: 3rem;
color: #5a5a5a;
}
-/* CUSTOMIZE THE NAVBAR
--------------------------------------------------- */
-
-/* Special class on .container surrounding .navbar, used for positioning it into place. */
-.navbar-wrapper {
- position: absolute;
- top: 0;
- right: 0;
- left: 0;
- z-index: 20;
-}
-
-/* Flip around the padding for proper display in narrow viewports */
-.navbar-wrapper > .container {
- padding-right: 0;
- padding-left: 0;
-}
-.navbar-wrapper .navbar {
- padding-right: 15px;
- padding-left: 15px;
-}
-.navbar-wrapper .navbar .container {
- width: auto;
-}
-
-
/* CUSTOMIZE THE CAROUSEL
-------------------------------------------------- */
/* Carousel base class */
.carousel {
- height: 500px;
- margin-bottom: 60px;
+ margin-bottom: 4rem;
}
/* Since positioning the image, we need to help out the caption */
.carousel-caption {
@@ -49,7 +22,7 @@ body {
/* Declare heights because of positioning of img element */
.carousel .item {
- height: 500px;
+ height: 32rem;
background-color: #777;
}
.carousel-inner > .item > img {
@@ -57,7 +30,20 @@ body {
top: 0;
left: 0;
min-width: 100%;
- height: 500px;
+ height: 32rem;
+}
+
+.carousel-indicators {
+ top: 1.5rem;
+ right: 1.5rem;
+ bottom: auto;
+ left: auto;
+ width: 1rem;
+ margin-left: 0;
+}
+
+.carousel-indicators > li {
+ margin-bottom: .25rem;
}
@@ -66,15 +52,15 @@ body {
/* Center align the text within the three columns below the carousel */
.marketing .col-lg-4 {
- margin-bottom: 20px;
+ margin-bottom: 1.5rem;
text-align: center;
}
.marketing h2 {
font-weight: normal;
}
.marketing .col-lg-4 p {
- margin-right: 10px;
- margin-left: 10px;
+ margin-right: .75rem;
+ margin-left: .75rem;
}
@@ -82,43 +68,25 @@ body {
------------------------- */
.featurette-divider {
- margin: 80px 0; /* Space out the Bootstrap <hr> more */
+ margin: 5rem 0; /* Space out the Bootstrap <hr> more */
}
/* Thin out the marketing headings */
.featurette-heading {
font-weight: 300;
line-height: 1;
- letter-spacing: -1px;
+ letter-spacing: -.05rem;
}
/* RESPONSIVE CSS
-------------------------------------------------- */
-@media (min-width: 768px) {
- /* Navbar positioning foo */
- .navbar-wrapper {
- margin-top: 20px;
- }
- .navbar-wrapper .container {
- padding-right: 15px;
- padding-left: 15px;
- }
- .navbar-wrapper .navbar {
- padding-right: 0;
- padding-left: 0;
- }
-
- /* The navbar becomes detached from the top, so we round the corners */
- .navbar-wrapper .navbar {
- border-radius: 4px;
- }
-
+@media (min-width: 40em) {
/* Bump up size of carousel content */
.carousel-caption p {
- margin-bottom: 20px;
- font-size: 21px;
+ margin-bottom: 1.25rem;
+ font-size: 1.25rem;
line-height: 1.4;
}
@@ -127,8 +95,8 @@ body {
}
}
-@media (min-width: 992px) {
+@media (min-width: 62em) {
.featurette-heading {
- margin-top: 120px;
+ margin-top: 7rem;
}
}
diff --git a/docs/examples/carousel/index.html b/docs/examples/carousel/index.html
index f7d119d06..15704ac09 100644
--- a/docs/examples/carousel/index.html
+++ b/docs/examples/carousel/index.html
@@ -19,47 +19,25 @@
<!-- Custom styles for this template -->
<link href="carousel.css" rel="stylesheet">
</head>
-<!-- NAVBAR
-================================================== -->
<body>
- <div class="navbar-wrapper">
- <div class="container">
- <nav class="navbar navbar-inverse navbar-static-top">
- <div class="container">
- <div class="navbar-header">
- <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
- <span class="sr-only">Toggle navigation</span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </button>
- <a class="navbar-brand" href="#">Project name</a>
- </div>
- <div id="navbar" class="navbar-collapse collapse">
- <ul class="nav navbar-nav">
- <li class="active"><a href="#">Home</a></li>
- <li><a href="#about">About</a></li>
- <li><a href="#contact">Contact</a></li>
- <li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Dropdown</a>
- <ul class="dropdown-menu" role="menu">
- <li><a href="#">Action</a></li>
- <li><a href="#">Another action</a></li>
- <li><a href="#">Something else here</a></li>
- <li class="divider"></li>
- <li class="dropdown-header">Nav header</li>
- <li><a href="#">Separated link</a></li>
- <li><a href="#">One more separated link</a></li>
- </ul>
- </li>
- </ul>
- </div>
- </div>
- </nav>
-
- </div>
- </div>
+ <nav class="navbar navbar-default navbar-static-top">
+ <a href="#" class="navbar-brand">Carousel</a>
+ <ul class="nav nav-pills">
+ <li class="nav-item active">
+ <a class="nav-link" href="#">Home <span class="sr-only">(current)</span></a>
+ </li>
+ <li class="nav-item">
+ <a class="nav-link" href="#">Features</a>
+ </li>
+ <li class="nav-item">
+ <a class="nav-link" href="#">Pricing</a>
+ </li>
+ <li class="nav-item">
+ <a class="nav-link" href="#">About</a>
+ </li>
+ </ul>
+ </nav>
<!-- Carousel
@@ -75,7 +53,7 @@
<div class="item active">
<img src="data:image/gif;base64,R0lGODlhAQABAIAAAHd3dwAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==" alt="First slide">
<div class="container">
- <div class="carousel-caption">
+ <div class="carousel-caption text-left">
<h1>Example headline.</h1>
<p>Note: If you're viewing this page via a <code>file://</code> URL, the "next" and "previous" Glyphicon buttons on the left and right might not load/display properly due to web browser security rules.</p>
<p><a class="btn btn-lg btn-primary" href="#" role="button">Sign up today</a></p>
@@ -95,7 +73,7 @@
<div class="item">
<img src="data:image/gif;base64,R0lGODlhAQABAIAAAFVVVQAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==" alt="Third slide">
<div class="container">
- <div class="carousel-caption">
+ <div class="carousel-caption text-right">
<h1>One more for good measure.</h1>
<p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
<p><a class="btn btn-lg btn-primary" href="#" role="button">Browse gallery</a></p>
generated by cgit v1.2.3 (git 2.25.1) at 2026-06-06 13:01:54 +0000