aboutsummaryrefslogtreecommitdiff
path: root/bootstrap.css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-01-26 16:27:50 -0800
committerMark Otto <[email protected]>2012-01-26 16:27:50 -0800
commit7d292f5acc82cfc53a68b1452103c2367c0d8020 (patch)
treebc9ae7e2b71b1765cd347785b22ae6191a209d98 /bootstrap.css
parentb260544de02788bc921c4c713df0f754d96c5a27 (diff)
parentef4e3bc0f7549e327c45792884a264faab402400 (diff)
downloadbootstrap-7d292f5acc82cfc53a68b1452103c2367c0d8020.tar.xz
bootstrap-7d292f5acc82cfc53a68b1452103c2367c0d8020.zip
Merge pull request #1274 from linrock/patch-2
[2.0 wip] Bring back the hero unit css. Fixes #1185.
Diffstat (limited to 'bootstrap.css')
-rw-r--r--bootstrap.css23
1 files changed, 21 insertions, 2 deletions
diff --git a/bootstrap.css b/bootstrap.css
index cc5d7f019..b71432eb4 100644
--- a/bootstrap.css
+++ b/bootstrap.css
@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Thu Jan 26 15:39:24 PST 2012
+ * Date: Thu Jan 26 15:50:30 PST 2012
*/
article,
aside,
@@ -1828,7 +1828,7 @@ table .span12 {
.navbar-search .search-query :-moz-placeholder {
color: #eeeeee;
}
-.navbar-search .search-query ::-webkit-input-placeholder {
+.navbar-search .search-query::-webkit-input-placeholder {
color: #eeeeee;
}
.navbar-search .search-query:hover {
@@ -2998,6 +2998,25 @@ a.thumbnail:hover {
.carousel-caption h4, .carousel-caption p {
color: #ffffff;
}
+.hero-unit {
+ padding: 60px;
+ margin-bottom: 30px;
+ background-color: #f5f5f5;
+ -webkit-border-radius: 6px;
+ -moz-border-radius: 6px;
+ border-radius: 6px;
+}
+.hero-unit h1 {
+ margin-bottom: 0;
+ font-size: 60px;
+ line-height: 1;
+ letter-spacing: -1px;
+}
+.hero-unit p {
+ font-size: 18px;
+ font-weight: 200;
+ line-height: 27px;
+}
.pull-right {
float: right;
}