aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/css/fixes.css5
-rw-r--r--core/css/styles.css20
-rw-r--r--core/js/multiselect.js3
-rw-r--r--core/templates/login.php2
4 files changed, 15 insertions, 15 deletions
diff --git a/core/css/fixes.css b/core/css/fixes.css
index e5dbeb137ab..7ef44ba6909 100644
--- a/core/css/fixes.css
+++ b/core/css/fixes.css
@@ -115,8 +115,3 @@ select {
line-height: 38px;
}
-.lte8 input[type="checkbox"] + label:before { background-image: url('../img/actions/checkbox.png'); }
-.lte8 input[type="checkbox"].white + label:before { background-image: url('../img/actions/checkbox-white.png'); }
-.lte8 input[type="checkbox"]:checked + label:before { background-image: url('../img/actions/checkbox-checked.png'); }
-.lte8 input[type="checkbox"].white:checked + label:before { background-image: url('../img/actions/checkbox-checked-white.png'); }
-
diff --git a/core/css/styles.css b/core/css/styles.css
index aefc0ff755a..d952a33c24a 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -158,7 +158,9 @@ textarea:hover, textarea:focus, textarea:active {
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
opacity: 1;
}
-input[type="checkbox"] {
+
+/* ie8 doesn't support :checked */
+html:not(.ie8) input[type="checkbox"].checkbox {
margin:0;
padding:0;
height:auto;
@@ -166,7 +168,7 @@ input[type="checkbox"] {
display: none;
}
-input[type="checkbox"] + label:before {
+html:not(.ie8) input[type="checkbox"].checkbox + label:before {
content: "";
display: inline-block;
@@ -174,27 +176,27 @@ input[type="checkbox"] + label:before {
width: 20px;
vertical-align: middle;
- background: url('../img/actions/checkbox.svg') left center no-repeat;
+ background: url('../img/actions/checkbox.svg') left top no-repeat;
opacity: 0.7;
}
-input[type="checkbox"]:disabled +label:before { opacity: .6; }
+html:not(.ie8) input[type="checkbox"].checkbox:disabled +label:before { opacity: .6; }
-input[type="checkbox"].u-left +label:before { float: left; }
+html:not(.ie8) input[type="checkbox"].checkbox.u-left +label:before { float: left; }
-input[type="checkbox"].white + label:before {
+html:not(.ie8) input[type="checkbox"].checkbox--white + label:before {
background-image: url('../img/actions/checkbox-white.svg');
}
-input[type="checkbox"]:checked + label:before {
+html:not(.ie8) input[type="checkbox"].checkbox:checked + label:before {
background-image: url('../img/actions/checkbox-checked.svg');
}
-input[type="checkbox"].white:checked + label:before {
+html:not(.ie8) input[type="checkbox"].checkbox--white:checked + label:before {
background-image: url('../img/actions/checkbox-checked-white.svg');
}
-input[type="checkbox"]:hover+label:before, input[type="checkbox"]:focus+label:before {
+html:not(.ie8) input[type="checkbox"].checkbox:hover+label:before, input[type="checkbox"]:focus+label:before {
color:#111 !important;
}
diff --git a/core/js/multiselect.js b/core/js/multiselect.js
index 41dc68ac051..6d5c54ac0f5 100644
--- a/core/js/multiselect.js
+++ b/core/js/multiselect.js
@@ -109,6 +109,9 @@
var id='ms'+multiSelectId+'-option-'+item;
var input=$('<input type="' + inputType + '"/>');
input.attr('id',id);
+ if(inputType === 'checkbox') {
+ input.addClass('checkbox');
+ }
if(settings.singleSelect) {
input.attr('name', 'ms'+multiSelectId+'-option');
}
diff --git a/core/templates/login.php b/core/templates/login.php
index 2057b1034d0..db77f63bbd0 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -65,7 +65,7 @@ script('core', [
<?php endif; ?>
<?php if ($_['rememberLoginAllowed'] === true) : ?>
<div class="remember-login-container">
- <input type="checkbox" name="remember_login" value="1" id="remember_login" class="white">
+ <input type="checkbox" name="remember_login" value="1" id="remember_login" class="checkbox checkbox--white">
<label for="remember_login"><?php p($l->t('remember')); ?></label>
</div>
<?php endif; ?>