aboutsummaryrefslogtreecommitdiff
path: root/bootstrap-1.2.0.css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2011-09-02 23:01:38 -0700
committerMark Otto <[email protected]>2011-09-02 23:01:38 -0700
commit4dbd2334bd8156b7621e11c19a411db1308821d8 (patch)
treef809ca77c3d0b1371ee10506d07d8e091f66dde1 /bootstrap-1.2.0.css
parent6d118411e1d456553baf5d09aea15ff13f7b8ef4 (diff)
downloadbootstrap-4dbd2334bd8156b7621e11c19a411db1308821d8.tar.xz
bootstrap-4dbd2334bd8156b7621e11c19a411db1308821d8.zip
updated hero example, added fluid example, resolved issue with tabs and fluid nav
Diffstat (limited to 'bootstrap-1.2.0.css')
-rw-r--r--bootstrap-1.2.0.css14
1 files changed, 12 insertions, 2 deletions
diff --git a/bootstrap-1.2.0.css b/bootstrap-1.2.0.css
index 7c286fc54..a4f671ebf 100644
--- a/bootstrap-1.2.0.css
+++ b/bootstrap-1.2.0.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: Fri Sep 2 22:09:40 PDT 2011
+ * Date: Fri Sep 2 22:56:14 PDT 2011
*/
/* Reset.less
* Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
@@ -445,6 +445,12 @@ a:hover {
color: #0050a3;
text-decoration: underline;
}
+.pull-right {
+ float: right;
+}
+.pull-left {
+ float: left;
+}
/* Typography.less
* Headings, body text, lists, code, and more for a versatile and durable typography system
* ---------------------------------------------------------------------------------------- */
@@ -1159,6 +1165,10 @@ table .headerSortUp.purple, table .headerSortDown.purple {
font-weight: 200;
line-height: 1;
}
+.topbar p {
+ margin: 0;
+ line-height: 40px;
+}
.topbar form {
float: left;
margin: 5px 0 0 0;
@@ -1460,6 +1470,7 @@ a.menu:after, .dropdown-toggle:after {
display: block;
}
.tabs {
+ float: left;
width: 100%;
border-bottom: 1px solid #ddd;
}
@@ -1524,7 +1535,6 @@ a.menu:after, .dropdown-toggle:after {
}
.hero-unit {
background-color: #f5f5f5;
- margin-top: 60px;
margin-bottom: 30px;
padding: 60px;
-webkit-border-radius: 6px;