github/bootstrap
1
1
Fork 0
mirror of https://github.com/jasny/bootstrap.git synced 2026-02-19 10:04:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	bootstrap-1.3.0.css
This commit is contained in:
Jacob Thornton
2011-09-09 22:48:57 -07:00
parent 5f4e30ed1d 0b43bc9bb9
commit 79d5f90713
5 changed files with 129 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bootstrap-1.3.0.css vendored
View File

@@ -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 9 20:23:37 PDT 2011
* Date: Fri Sep 9 22:48:53 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).
@@ -2006,6 +2006,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
box-shadow: inset 0 1px 0 #ffffff;
zoom: 1;
margin-bottom: 0;
text-align: right;
}
.modal-footer:before, .modal-footer:after {
display: table;
@@ -2015,8 +2016,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
clear: both;
}
.modal-footer .btn {
float: right;
margin-left: 10px;
margin-left: 5px;
}
.twipsy {
display: block;