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

Merge branch 'v4' of https://github.com/twbs/derpstrap into v4

Browse Source 
Conflicts:
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	docs/assets/css/docs.min.css
This commit is contained in:
Mark Otto
2015-05-27 15:49:55 -07:00
parent bd971c49b0 3fe894ba36
commit 663576a7ae
128 changed files with 24790 additions and 17469 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scss/_utilities.scss
View File

@@ -49,7 +49,7 @@
.m-a { margin: $spacer; }
.m-t { margin-top: $spacer-y; }
.m-r { margin-right: $spacer-x }
.m-r { margin-right: $spacer-x; }
.m-b { margin-bottom: $spacer-y; }
.m-l { margin-left: $spacer-x; }
.m-x {
@@ -97,7 +97,7 @@
.p-a { padding: $spacer; }
.p-t { padding-top: $spacer-y; }
.p-r { padding-right: $spacer-x }
.p-r { padding-right: $spacer-x; }
.p-b { padding-bottom: $spacer-y; }
.p-l { padding-left: $spacer-x; }
.p-x {