mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-18 11:21:23 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:twbs/bootstrap

Browse Source 
Conflicts:
	dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto
2013-09-19 22:57:11 -05:00
parent ef636bd62d 22d308b2c1
commit e148923f27
14 changed files with 79 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
dist/css/bootstrap.css vendored
View File

@@ -1,4 +1,4 @@
/*! normalize.css v2.1.0 | MIT License | git.io/normalize */
/*! normalize.css v2.1.3 | MIT License | git.io/normalize */
article,
aside,
@@ -26,7 +26,8 @@ audio:not([controls]) {
height: 0;
}
[hidden] {
[hidden],
template {
display: none;
}
@@ -40,6 +41,10 @@ body {
margin: 0;
}
a {
background: transparent;
}
a:focus {
outline: thin dotted;
}
@@ -3950,7 +3955,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
}
.nav-pills > li > a {
border-radius: 5px;
border-radius: 4px;
}
.nav-pills > li + li {

2
dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long