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

Merge branch '2.2.2-wip' into exploratory

Browse Source 
Conflicts:
	docs/assets/css/bootstrap.css
	less/navbar.less
	less/variables.less
This commit is contained in:
Mark Otto
2012-11-05 18:27:25 -08:00
parent 34880e3ef5 79b7017227
commit c0bbe1692c
40 changed files with 62 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/assets/css/bootstrap.css
Vendored
+6 -3
View File
@@ -1,5 +1,5 @@
/*!
* Bootstrap v2.2.1
* Bootstrap v2.2.2
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
@@ -3758,7 +3758,6 @@ input[type="button"].btn-block {
padding: 0 20px;
margin-bottom: 20px;
overflow: visible;
color: #777777;
background-color: #fafafa;
background-image: -moz-linear-gradient(top, #ffffff, #f2f2f2);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f2f2f2));
@@ -3811,6 +3810,7 @@ input[type="button"].btn-block {
.navbar-text {
margin-bottom: 0;
line-height: 44px;
color: #777777;
}
.navbar-link {
@@ -4129,7 +4129,6 @@ input[type="button"].btn-block {
}
.navbar-inverse {
color: #999999;
background-color: #1b1b1b;
background-image: -moz-linear-gradient(top, #222222, #111111);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#222222), to(#111111));
@@ -4152,6 +4151,10 @@ input[type="button"].btn-block {
color: #ffffff;
}
.navbar-inverse .navbar-text {
color: #999999;
}
.navbar-inverse .nav > li > a:focus,
.navbar-inverse .nav > li > a:hover {
color: #ffffff;