Merge branch 'master' of https://github.com/Acquisio/bootstrap-stylus

maxmx · maxmx · commit c14826bc1d26 · 2014-03-19T18:21:54.000-04:00
Conflicts:
	stylus/modals.styl
diff --git a/stylus/modals.styl b/stylus/modals.styl
@@ -39,6 +39,7 @@
   }
 }
 
+
 // Shell div to position the modal with bottom padding
 .modal-dialog {
   position: relative;

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`
	`42`	`+`
`42`	`43`	`// Shell div to position the modal with bottom padding`
`43`	`44`	`.modal-dialog {`
`44`	`45`	`position: relative;`