mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-21 13:24:08 +03:00
Code Activity

Merge branch 'master' into docs_derp

Browse Source 
Conflicts:
	docs/assets/css/docs.css
This commit is contained in:
Mark Otto
2014-01-09 20:33:55 -08:00
parent 04161a8c75 7f153974e1
commit ea20f44815
65 changed files with 2742 additions and 1919 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/assets/css/docs.css
+10 -1
View File
@@ -1,5 +1,6 @@
/*csslint ids: false, overqualified-elements: false*/
/*!
* Copyright 2013 Twitter, Inc.
* Copyright 2011-2014 Twitter, Inc.
*
* Licensed under the Creative Commons Attribution 3.0 Unported License. For
* details, see http://creativecommons.org/licenses/by/3.0/.
@@ -1255,6 +1256,13 @@ h1[id] {
font-weight: normal;
}
.bs-customizer-input {
float: left;
width: 33.333333%;
padding-left: 15px;
padding-right: 15px;
}
/* Downloads */
.bs-customize-download .btn-outline {
padding: 20px;
@@ -1379,6 +1387,7 @@ h1[id] {
/* Pseudo :focus state for showing how it looks in the docs */
#focusedInput {
border-color: rgb(204,204,204); /* Restate unfocused value to make CSSLint happy that there's a pre-CSS3 fallback*/
border-color: rgba(82,168,236,.8);
outline: 0;
outline: thin dotted \9; /* IE6-9 */