diff --git a/core/admin/assets/js/views/settings.js b/core/admin/assets/js/views/settings.js
index 1e7a408ca0..c165d96064 100644
--- a/core/admin/assets/js/views/settings.js
+++ b/core/admin/assets/js/views/settings.js
@@ -15,7 +15,7 @@
}));
this.$('input').iCheck({
- checkboxClass: 'icheckbox_square-grey'
+ checkboxClass: 'icheckbox_ghost'
});
}
});
diff --git a/core/admin/assets/lib/icheck/css/grey.png b/core/admin/assets/lib/icheck/css/grey.png
deleted file mode 100644
index f69375854d..0000000000
Binary files a/core/admin/assets/lib/icheck/css/grey.png and /dev/null differ
diff --git a/core/admin/assets/lib/icheck/css/grey@2x.png b/core/admin/assets/lib/icheck/css/grey@2x.png
deleted file mode 100644
index 5d6341c053..0000000000
Binary files a/core/admin/assets/lib/icheck/css/grey@2x.png and /dev/null differ
diff --git a/core/admin/assets/lib/icheck/css/icheck.css b/core/admin/assets/lib/icheck/css/icheck.css
deleted file mode 100644
index ffef066fcc..0000000000
--- a/core/admin/assets/lib/icheck/css/icheck.css
+++ /dev/null
@@ -1,62 +0,0 @@
-/* iCheck plugin Square skin, grey
------------------------------------ */
-.icheckbox_square-grey,
-.iradio_square-grey {
- display: block;
- margin: 0;
- padding: 0;
- width: 22px;
- height: 22px;
- background: url(grey.png) no-repeat;
- border: none;
- cursor: pointer;
- float: left;
- margin-right: 6px;
-}
-
-.icheckbox_square-grey {
- background-position: 0 0;
-}
-.icheckbox_square-grey.hover {
- background-position: -24px 0;
-}
-.icheckbox_square-grey.checked {
- background-position: -48px 0;
-}
-.icheckbox_square-grey.disabled {
- background-position: -72px 0;
- cursor: default;
-}
-.icheckbox_square-grey.checked.disabled {
- background-position: -96px 0;
-}
-
-.iradio_square-grey {
- background-position: -120px 0;
-}
-.iradio_square-grey.hover {
- background-position: -144px 0;
-}
-.iradio_square-grey.checked {
- background-position: -168px 0;
-}
-.iradio_square-grey.disabled {
- background-position: -192px 0;
- cursor: default;
-}
-.iradio_square-grey.checked.disabled {
- background-position: -216px 0;
-}
-
-/* Retina support */
-@media only screen and (-webkit-min-device-pixel-ratio: 1.5),
-only screen and (-moz-min-device-pixel-ratio: 1.5),
-only screen and (-o-min-device-pixel-ratio: 3/2),
-only screen and (min-device-pixel-ratio: 1.5) {
- .icheckbox_square-grey,
- .iradio_square-grey {
- background-image: url(grey@2x.png);
- -webkit-background-size: 240px 24px;
- background-size: 240px 24px;
- }
-}
\ No newline at end of file
diff --git a/core/admin/assets/sass/modules/forms.scss b/core/admin/assets/sass/modules/forms.scss
index bfb37f6ed6..fb2c42ed4a 100644
--- a/core/admin/assets/sass/modules/forms.scss
+++ b/core/admin/assets/sass/modules/forms.scss
@@ -109,7 +109,7 @@ form {
line-height:30px;
}
- .radio input[type="radio"],
+ .radio input[type="radio"],
.checkbox input[type="checkbox"] {
float: left;
width:auto;
@@ -248,12 +248,12 @@ input[type="reset"] {
position: relative;
font-size: 0; // hack to stop space after button
white-space: nowrap;
-
+
button {
font-size: 11px; // hack to restore font size
@include border-right-radius(0);
}
-
+
// This is the additional dropdown arrow, to the right of the button.
.options {
display: inline-block;
@@ -266,7 +266,7 @@ input[type="reset"] {
color: #fff;
background: #e5e5e5;
border-radius: 0 2px 2px 0;
- box-shadow:
+ box-shadow:
rgba(0,0,0,0.02) 0 1px 0 inset,
rgba(0,0,0,0.02) -1px 0 0 inset,
rgba(0,0,0,0.02) 0 -1px 0 inset;
@@ -278,7 +278,7 @@ input[type="reset"] {
margin-right: -5px;
@include transition(transform 0.3s ease, margin-top 0.3s ease);
};
-
+
// Spin the arrow on hover
&:hover {
box-shadow: none;
@@ -287,7 +287,7 @@ input[type="reset"] {
@include transform(rotate(360deg));
};
}
-
+
// If it has a class of "up" spin it an extra 180degress to point up
&.up:hover {
@include icon($i-chevron-down) {
@@ -305,7 +305,7 @@ input[type="reset"] {
.options {
color:#777;
&:hover {
- box-shadow:
+ box-shadow:
rgba(0,0,0,0.07) 0 1px 0 inset,
rgba(0,0,0,0.07) -1px 0 0 inset,
rgba(0,0,0,0.07) 0 -1px 0 inset;
@@ -349,3 +349,63 @@ input[type="reset"] {
}
}
+
+/* =============================================================================
+ iCheck
+ ============================================================================= */
+.icheckbox_ghost,
+.iradio_ghost {
+ @include box-sizing(border-box);
+ display: block;
+ width: 22px;
+ height: 22px;
+ float: left;
+ margin: 0;
+ padding: 0;
+ margin-right: 6px;
+ background: none;
+ border: none;
+ cursor: pointer;
+ box-shadow: 0 1px 5px rgba(0, 0, 0, 0.05);
+}
+
+.icheckbox_ghost {
+ border: 1px solid darken($lightbrown, 5%);
+}
+.icheckbox_ghost.hover {
+ border: $blue 2px solid;
+}
+.icheckbox_ghost.checked {
+ padding-left: 2px;
+ background: $blue;
+ border: none;
+ @include icon($i-check, 1em, #fff);
+}
+.icheckbox_ghost.disabled {
+ border: 1px solid $lightbrown;
+}
+.icheckbox_ghost.checked.disabled {
+ background: $lightbrown;
+}
+
+.iradio_ghost {
+ border-radius: 11px;
+ border: 1px solid darken($lightbrown, 5%);
+}
+.iradio_ghost.hover {
+ border: $blue 2px solid;
+}
+.iradio_ghost.checked {
+ padding-left: 2px;
+ background: $blue;
+ border: none;
+ @include icon($i-check, 1em, #fff);
+}
+.iradio_ghost.disabled {
+ border: 1px solid $lightbrown;
+ cursor: default;
+}
+.iradio_ghost.checked.disabled {
+ background: $lightbrown;
+}
+
diff --git a/core/admin/views/default.hbs b/core/admin/views/default.hbs
index 4d2f9cf1fe..03c7954a71 100644
--- a/core/admin/views/default.hbs
+++ b/core/admin/views/default.hbs
@@ -20,7 +20,6 @@
-
{{{block "pageStyles"}}}