2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-14 18:42:30 +03:00

huuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuge update to doces and stuff

This commit is contained in:
Mark Otto
2012-01-27 13:20:02 -08:00
parent 97546adc90
commit e8647c1b11
22 changed files with 351 additions and 269 deletions
+2 -2
View File
@@ -1,5 +1,5 @@
// ACCORDION
// ---------
// COLLAPSE
// --------
// Parent container
+15 -12
View File
@@ -16,7 +16,7 @@
.box-shadow(@shadow);
}
// Text and links
// Brand, links, text, and buttons
.navbar {
// Hover and active states
.brand:hover {
@@ -35,9 +35,10 @@
color: @white;
}
// Plain text in topbar
p {
margin: 0;
.navbar-text {
margin-bottom: 0;
line-height: 40px;
color: @navbarText;
a:hover {
color: @white;
background-color: transparent;
@@ -105,6 +106,9 @@
}
// STATIC OR FIXED?
// ----------------
// Static navbar
.navbar-static {
margin-bottom: @baseLineHeight;
@@ -116,7 +120,7 @@
}
// Fixed navbar
.navbar-fixed {
.navbar-fixed-top {
position: fixed;
top: 0;
right: 0;
@@ -125,7 +129,6 @@
}
// NAVIGATION
// ----------
@@ -149,33 +152,33 @@
float: none;
padding: 10px 10px 11px;
line-height: 19px;
color: @grayLight;
color: @navbarLinkColor;
text-decoration: none;
text-shadow: 0 -1px 0 rgba(0,0,0,.25);
}
// Hover
.navbar .nav > li > a:hover {
background-color: transparent;
color: @white;
color: @navbarLinkColorHover;
text-decoration: none;
}
// Active nav items
.navbar .nav .active > a {
color: @white;
color: @navbarLinkColorHover;
text-decoration: none;
background-color: @grayDarker;
background-color: @navbarBackground;
background-color: rgba(0,0,0,.5);
}
// Dividers (basically a vertical hr)
.navbar .vertical-divider {
height: 40px;
height: @navbarHeight;
width: 1px;
margin: 0 5px;
overflow: hidden;
background-color: @grayDarker;
border-right: 1px solid #444;
background-color: @navbarBackground;
border-right: 1px solid @navbarBackgroundHighlight;
}
// Secondary (floated right) nav in topbar
+2
View File
@@ -175,6 +175,8 @@
// 16cols at 30px wide with 16px gutters
.container {
width: @siteWidth;
padding-left: 10px;
padding-right: 10px;
}
// Default columns
+4 -4
View File
@@ -22,8 +22,8 @@ body {
a {
color: @linkColor;
text-decoration: none;
&:hover {
color: @linkColorHover;
text-decoration: underline;
}
}
a:hover {
color: @linkColorHover;
text-decoration: underline;
}
+8 -4
View File
@@ -70,21 +70,25 @@
@navbarBackground: @grayDarker;
@navbarBackgroundHighlight: @grayDark;
@navbarText: @grayLight;
@navbarLinkColor: @grayLight;
@navbarLinkColorHover: @white;
// Form states and alerts
@warningText: #c09853;
@warningBackground: #fcf8e3;
@warningBorder: #f3edd2;
@warningBorder: darken(spin(@warningBackground, -10), 3%);
@errorText: #b94a48;
@errorBackground: #f2dede;
@errorBorder: #e9c7c7;
@errorBorder: darken(spin(@errorBackground, -10), 3%);
@successText: #468847;
@successBackground: #dff0d8;
@successBorder: #cfe8c4;
@successBorder: darken(spin(@successBackground, -10), 5%);
@infoText: #3a87ad;
@infoBackground: #d9edf7;
@infoBorder: #bfe1f2;
@infoBorder: darken(spin(@infoBackground, -10), 7%);