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

Merge branch 'v4' into scss-lint

Browse Source 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	scss/_card.scss
This commit is contained in:
Mark Otto
2014-12-11 12:07:09 -08:00
parent 2a78159a20 f7e103a6ac
commit 2edc779391
17 changed files with 92 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/assets/css/docs.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/assets/css/docs.min.css.map
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/assets/scss/docs.scss
-2
View File
@@ -609,12 +609,10 @@ body {
float: none;
height: auto;
padding: 2rem 1.25rem;
/*padding: 20px;*/
font-size: 20px;
font-weight: 500;
line-height: 1;
color: #fff;
/*border-bottom: 1px solid rgba(255,255,255,.1);*/
}
.bs-docs-sidebar-brand:hover,
.bs-docs-sidebar-brand:focus {