mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-17 19:21:23 +03:00
Code Activity

Merge branch '2.3.0-wip' into 3.0.0-wip

Browse Source 
Conflicts:
	docs/assets/css/bootstrap-responsive.css
	docs/assets/js/bootstrap-popover.js
	docs/assets/js/bootstrap.js
	docs/css.html
	docs/templates/pages/base-css.mustache
	js/bootstrap-popover.js
	less/mixins.less
	less/tooltip.less
This commit is contained in:
Mark Otto
2013-02-05 22:42:54 -08:00
parent 6d21d86007 3b56227553
commit 421f9f67c4
19 changed files with 280 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
less/mixins.less
+5 -6
View File
@@ -472,17 +472,17 @@
.core(@grid-column-width, @grid-gutter-width) {
.spanX(@index) when (@index > 0) {
(~".span@{index}") { .span(@index); }
.spanX (@index) when (@index > 0) {
.span@{index} { .span(@index); }
.spanX(@index - 1);
}
.spanX(0) {}
.offsetX(@index) when (@index > 0) {
(~".offset@{index}") { .offset(@index); }
.offsetX (@index) when (@index > 0) {
.offset@{index} { .offset(@index); }
.offsetX(@index - 1);
}
.offsetX(0) {}
.offsetX (0) {}
// Base styles
.offset(@columns) {
@@ -497,5 +497,4 @@
.offsetX(@grid-columns);
}
}