mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-11 18:02:28 +03:00
Code Activity

Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

Browse Source 
Conflicts:
	bootstrap.css
This commit is contained in:
Jacob Thornton
2011-12-21 14:03:18 -08:00
parent 80cb760fac 069ef6a020
commit a5a98a8a98
9 changed files with 375 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/assets/css/docs.css
+2 -2
View File
@@ -25,7 +25,7 @@ body > .navbar-fixed .brand {
float: right;
font-weight: bold;
color: #000;
text-shadow: 0 1px 0 rgba(255,255,255,.1);
text-shadow: 0 1px 0 rgba(255,255,255,.1), 0 0 30px rgba(255,255,255,.125);
}
body > .navbar-fixed .brand:hover {
text-decoration: none;
@@ -455,7 +455,7 @@ h2 + table {
/* Provide enough space on right-hand side for benefits list */
.jumbotron h1,
.jumbotron p {
margin-right: 20%;
margin-right: 40%;
}
}