mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-22 13:13:03 +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-11 12:31:21 -07:00
parent 5d1707a25c c62426daeb
commit 37933a9e08
14 changed files with 41 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
dist/css/bootstrap.css vendored
View File

@@ -1,13 +1,3 @@
/*!
* Bootstrap v3.0.0
*
* Copyright 2013 Twitter, Inc
* Licensed under the Apache License v2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world by @mdo and @fat.
*/
/*! normalize.css v2.1.0 | MIT License | git.io/normalize */
article,
@@ -703,14 +693,15 @@ blockquote:after {
}
address {
display: block;
margin-bottom: 20px;
font-style: normal;
line-height: 1.428571429;
}
code,
pre {
kdb,
pre,
samp {
font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
}
@@ -6286,7 +6277,8 @@ body.modal-open,
@media screen and (min-width: 768px) {
.carousel-control .glyphicons-chevron-left,
.carousel-control .glyphicons-chevron-right .icon-prev,
.carousel-control .glyphicons-chevron-right,
.carousel-control .icon-prev,
.carousel-control .icon-next {
width: 30px;
height: 30px;