aboutsummaryrefslogtreecommitdiff
path: root/docs/examples
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-12-05 11:05:10 -0800
committerMark Otto <[email protected]>2012-12-05 11:05:10 -0800
commit33e14fe5bfd7a7091ab491a961d66a2a2580f1de (patch)
tree79c2c539e578877c3241e90402e47c4691c22a39 /docs/examples
parentb3019d7aab877cccf03fda3e6894c0fdaa7330f3 (diff)
parented74992853054c57f33ef5d21941f0869e287552 (diff)
downloadbootstrap-33e14fe5bfd7a7091ab491a961d66a2a2580f1de.tar.xz
bootstrap-33e14fe5bfd7a7091ab491a961d66a2a2580f1de.zip
Merge branch '2.2.2-wip' into 3.0.0-wip
Conflicts: README.md docs/assets/css/bootstrap.css docs/assets/js/bootstrap.js docs/assets/js/bootstrap.min.js docs/examples/fluid.html docs/scaffolding.html less/breadcrumbs.less less/popovers.less less/responsive.less
Diffstat (limited to 'docs/examples')
-rw-r--r--docs/examples/carousel.html110
-rw-r--r--docs/examples/hero.html6
-rw-r--r--docs/examples/marketing-alternate.html6
-rw-r--r--docs/examples/marketing-narrow.html6
-rw-r--r--docs/examples/signin.html6
-rw-r--r--docs/examples/starter-template.html6
-rw-r--r--docs/examples/sticky-footer.html6
7 files changed, 78 insertions, 68 deletions
diff --git a/docs/examples/carousel.html b/docs/examples/carousel.html
index 42b95dd7e..ed7740a94 100644
--- a/docs/examples/carousel.html
+++ b/docs/examples/carousel.html
@@ -28,11 +28,17 @@
/* Special class on .container surrounding .navbar, used for positioning it into place. */
.navbar-wrapper {
- position: relative;
+ position: absolute;
+ top: 0;
+ left: 0;
+ right: 0;
z-index: 10;
margin-top: 20px;
margin-bottom: -90px; /* Negative margin to pull up carousel. 90px is roughly margins and height of navbar. */
}
+ .navbar-wrapper .navbar {
+
+ }
/* Remove border and change up box shadow for more contrast */
.navbar .navbar-inner {
@@ -71,24 +77,26 @@
}
.carousel .container {
- position: absolute;
- right: 0;
- bottom: 0;
- left: 0;
+ position: relative;
+ z-index: 10;
}
.carousel-control {
- background-color: transparent;
- border: 0;
- font-size: 120px;
+ height: 80px;
margin-top: 0;
+ font-size: 120px;
text-shadow: 0 1px 1px rgba(0,0,0,.4);
+ background-color: transparent;
+ border: 0;
}
.carousel .item {
height: 500px;
}
.carousel img {
+ position: absolute;
+ top: 0;
+ left: 0;
min-width: 100%;
height: 500px;
}
@@ -98,7 +106,7 @@
position: static;
max-width: 550px;
padding: 0 20px;
- margin-bottom: 100px;
+ margin-top: 200px;
}
.carousel-caption h1,
.carousel-caption .lead {
@@ -219,7 +227,7 @@
.carousel-caption {
width: 65%;
padding: 0 70px;
- margin-bottom: 40px;
+ margin-top: 100px;
}
.carousel-caption h1 {
font-size: 30px;
@@ -250,11 +258,11 @@
<![endif]-->
<!-- Fav and touch icons -->
- <link rel="shortcut icon" href="../assets/ico/favicon.ico">
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">
- <link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">
+ <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">
+ <link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">
+ <link rel="shortcut icon" href="../assets/ico/favicon.png">
</head>
<body>
@@ -263,43 +271,45 @@
<!-- NAVBAR
================================================== -->
- <!-- Wrap the .navbar in .container to center it on the page and provide easy way to target it with .navbar-wrapper. -->
- <div class="container navbar-wrapper">
-
- <div class="navbar navbar-inverse">
- <div class="navbar-inner">
- <!-- Responsive Navbar Part 1: Button for triggering responsive navbar (not covered in tutorial). Include responsive CSS to utilize. -->
- <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </a>
- <a class="brand" href="#">Project name</a>
- <!-- Responsive Navbar Part 2: Place all navbar contents you want collapsed withing .navbar-collapse.collapse. -->
- <div class="nav-collapse collapse">
- <ul class="nav">
- <li class="active"><a href="#">Home</a></li>
- <li><a href="#about">About</a></li>
- <li><a href="#contact">Contact</a></li>
- <!-- Read about Bootstrap dropdowns at http://twitter.github.com/bootstrap/javascript.html#dropdowns -->
- <li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
- <ul class="dropdown-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="nav-header">Nav header</li>
- <li><a href="#">Separated link</a></li>
- <li><a href="#">One more separated link</a></li>
- </ul>
- </li>
- </ul>
- </div><!--/.nav-collapse -->
- </div><!-- /.navbar-inner -->
- </div><!-- /.navbar -->
-
- </div><!-- /.container -->
+ <div class="navbar-wrapper">
+ <!-- Wrap the .navbar in .container to center it within the absolutely positioned parent. -->
+ <div class="container">
+
+ <div class="navbar navbar-inverse">
+ <div class="navbar-inner">
+ <!-- Responsive Navbar Part 1: Button for triggering responsive navbar (not covered in tutorial). Include responsive CSS to utilize. -->
+ <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </a>
+ <a class="brand" href="#">Project name</a>
+ <!-- Responsive Navbar Part 2: Place all navbar contents you want collapsed withing .navbar-collapse.collapse. -->
+ <div class="nav-collapse collapse">
+ <ul class="nav">
+ <li class="active"><a href="#">Home</a></li>
+ <li><a href="#about">About</a></li>
+ <li><a href="#contact">Contact</a></li>
+ <!-- Read about Bootstrap dropdowns at http://twitter.github.com/bootstrap/javascript.html#dropdowns -->
+ <li class="dropdown">
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
+ <ul class="dropdown-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="nav-header">Nav header</li>
+ <li><a href="#">Separated link</a></li>
+ <li><a href="#">One more separated link</a></li>
+ </ul>
+ </li>
+ </ul>
+ </div><!--/.nav-collapse -->
+ </div><!-- /.navbar-inner -->
+ </div><!-- /.navbar -->
+
+ </div> <!-- /.container -->
+ </div><!-- /.navbar-wrapper -->
diff --git a/docs/examples/hero.html b/docs/examples/hero.html
index 97e0d2410..f0a5e1709 100644
--- a/docs/examples/hero.html
+++ b/docs/examples/hero.html
@@ -23,11 +23,11 @@
<![endif]-->
<!-- Fav and touch icons -->
- <link rel="shortcut icon" href="../assets/ico/favicon.ico">
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">
- <link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">
+ <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">
+ <link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">
+ <link rel="shortcut icon" href="../assets/ico/favicon.png">
</head>
<body>
diff --git a/docs/examples/marketing-alternate.html b/docs/examples/marketing-alternate.html
index b9011df13..8cbeb02a2 100644
--- a/docs/examples/marketing-alternate.html
+++ b/docs/examples/marketing-alternate.html
@@ -86,11 +86,11 @@
<![endif]-->
<!-- Fav and touch icons -->
- <link rel="shortcut icon" href="../assets/ico/favicon.ico">
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">
- <link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">
+ <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">
+ <link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">
+ <link rel="shortcut icon" href="../assets/ico/favicon.png">
</head>
<body>
diff --git a/docs/examples/marketing-narrow.html b/docs/examples/marketing-narrow.html
index a05d1ca4a..9ce1cd5bc 100644
--- a/docs/examples/marketing-narrow.html
+++ b/docs/examples/marketing-narrow.html
@@ -54,11 +54,11 @@
<![endif]-->
<!-- Fav and touch icons -->
- <link rel="shortcut icon" href="../assets/ico/favicon.ico">
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">
- <link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">
+ <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">
+ <link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">
+ <link rel="shortcut icon" href="../assets/ico/favicon.png">
</head>
<body>
diff --git a/docs/examples/signin.html b/docs/examples/signin.html
index 379bac708..17578483a 100644
--- a/docs/examples/signin.html
+++ b/docs/examples/signin.html
@@ -50,11 +50,11 @@
<![endif]-->
<!-- Fav and touch icons -->
- <link rel="shortcut icon" href="../assets/ico/favicon.ico">
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">
- <link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">
+ <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">
+ <link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">
+ <link rel="shortcut icon" href="../assets/ico/favicon.png">
</head>
<body>
diff --git a/docs/examples/starter-template.html b/docs/examples/starter-template.html
index 8f14bf7e1..93ba809e3 100644
--- a/docs/examples/starter-template.html
+++ b/docs/examples/starter-template.html
@@ -22,11 +22,11 @@
<![endif]-->
<!-- Fav and touch icons -->
- <link rel="shortcut icon" href="../assets/ico/favicon.ico">
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">
- <link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">
+ <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">
+ <link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">
+ <link rel="shortcut icon" href="../assets/ico/favicon.png">
</head>
<body>
diff --git a/docs/examples/sticky-footer.html b/docs/examples/sticky-footer.html
index 50fab606b..1c9c36149 100644
--- a/docs/examples/sticky-footer.html
+++ b/docs/examples/sticky-footer.html
@@ -71,11 +71,11 @@
<![endif]-->
<!-- Fav and touch icons -->
- <link rel="shortcut icon" href="../assets/ico/favicon.ico">
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">
- <link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">
+ <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">
+ <link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">
+ <link rel="shortcut icon" href="../assets/ico/favicon.png">
</head>
<body>
generated by cgit v1.2.3 (git 2.25.1) at 2026-06-06 23:32:40 +0000