From d37d2692309eb65784672665508c51bc8cf019d1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 3 Dec 2012 13:01:27 -0800 Subject: [PATCH 1/2] Improve rendering of carousel example for IE10 --- carousel.html | 100 +++++++++++++++++++++++++++----------------------- 1 file changed, 55 insertions(+), 45 deletions(-) diff --git a/carousel.html b/carousel.html index 42b95dd7e4..b71e746172 100644 --- a/carousel.html +++ b/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 { + height: 80px; + margin-top: 0; + font-size: 120px; + text-shadow: 0 1px 1px rgba(0,0,0,.4); background-color: transparent; border: 0; - font-size: 120px; - margin-top: 0; - text-shadow: 0 1px 1px rgba(0,0,0,.4); } .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; @@ -263,43 +271,45 @@ - -
+
+ +
-
-
- - - - - - - Project name - -
- -
-
-
+
+
+ + + + + + + Project name + +
+ +
+
+
-
+
+
From 5cf2e8a1cbd86a2c3c4d3683c2ffda248eb27355 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 3 Dec 2012 13:25:56 -0800 Subject: [PATCH 2/2] Once more, update all the favicons to retina --- carousel.html | 6 +++--- fluid.html | 6 +++--- hero.html | 6 +++--- marketing-alternate.html | 6 +++--- marketing-narrow.html | 6 +++--- signin.html | 6 +++--- starter-template.html | 6 +++--- sticky-footer.html | 6 +++--- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/carousel.html b/carousel.html index b71e746172..ed7740a943 100644 --- a/carousel.html +++ b/carousel.html @@ -258,11 +258,11 @@ - - - + + + diff --git a/fluid.html b/fluid.html index 517e209b71..4ca2920efd 100644 --- a/fluid.html +++ b/fluid.html @@ -26,11 +26,11 @@ - - - + + + diff --git a/hero.html b/hero.html index 97e0d24100..f0a5e17093 100644 --- a/hero.html +++ b/hero.html @@ -23,11 +23,11 @@ - - - + + + diff --git a/marketing-alternate.html b/marketing-alternate.html index b9011df13c..8cbeb02a25 100644 --- a/marketing-alternate.html +++ b/marketing-alternate.html @@ -86,11 +86,11 @@ - - - + + + diff --git a/marketing-narrow.html b/marketing-narrow.html index a05d1ca4a3..9ce1cd5bc6 100644 --- a/marketing-narrow.html +++ b/marketing-narrow.html @@ -54,11 +54,11 @@ - - - + + + diff --git a/signin.html b/signin.html index 379bac7081..17578483a3 100644 --- a/signin.html +++ b/signin.html @@ -50,11 +50,11 @@ - - - + + + diff --git a/starter-template.html b/starter-template.html index 8f14bf7e13..93ba809e38 100644 --- a/starter-template.html +++ b/starter-template.html @@ -22,11 +22,11 @@ - - - + + + diff --git a/sticky-footer.html b/sticky-footer.html index 50fab606b1..1c9c36149e 100644 --- a/sticky-footer.html +++ b/sticky-footer.html @@ -71,11 +71,11 @@ - - - + + +