diff options
| author | Mark Otto <[email protected]> | 2013-07-15 12:00:10 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-07-15 12:00:10 -0700 |
| commit | ced641b1079ae9ab1b59c39ce9edf82b85b3fb37 (patch) | |
| tree | c7ec7a6d4634d4d0bc5532ae22b4355af050daa3 /less | |
| parent | 6aec8f36fcb87421f29207af1c6c93448c3a38f8 (diff) | |
| parent | fb75ffca5524fa97b05400e5dad04103ce7f1946 (diff) | |
| download | bootstrap-ced641b1079ae9ab1b59c39ce9edf82b85b3fb37.tar.xz bootstrap-ced641b1079ae9ab1b59c39ce9edf82b85b3fb37.zip | |
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Diffstat (limited to 'less')
| -rw-r--r-- | less/forms.less | 2 | ||||
| -rw-r--r-- | less/mixins.less | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/less/forms.less b/less/forms.less index 2389036da..add42ee9f 100644 --- a/less/forms.less +++ b/less/forms.less @@ -437,7 +437,7 @@ input[type="color"] { } // Only right align form labels here when the columns stop stacking -@media (min-width: 768px) { +@media (min-width: @screen-tablet) { .form-horizontal .control-label { text-align: right; } diff --git a/less/mixins.less b/less/mixins.less index 6d39d2aae..e5643721d 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -331,7 +331,7 @@ // -------------------------------------------------- // Short retina mixin for setting background-image and -size -.retina-image(@file-1x, @file-2x, @width-1x, @height-1x) { +.img-retina(@file-1x, @file-2x, @width-1x, @height-1x) { background-image: url("@{file-1x}"); @media |