From 8d66cbd6e8baa5268c0c2d7bb066948dfe2c76e5 Mon Sep 17 00:00:00 2001 From: Matthew Harrison-Jones Date: Thu, 13 Jun 2013 12:54:57 +0100 Subject: [PATCH] Removed the need for iCheck CSS dependency. Made all iCheck images into CSS and removed the iCheck CSS stylesheet. --- core/admin/assets/js/views/settings.js | 2 +- core/admin/assets/lib/icheck/css/grey.png | Bin 2186 -> 0 bytes core/admin/assets/lib/icheck/css/grey@2x.png | Bin 4483 -> 0 bytes core/admin/assets/lib/icheck/css/icheck.css | 62 ---------------- core/admin/assets/sass/modules/forms.scss | 74 +++++++++++++++++-- core/admin/views/default.hbs | 1 - 6 files changed, 68 insertions(+), 71 deletions(-) delete mode 100644 core/admin/assets/lib/icheck/css/grey.png delete mode 100644 core/admin/assets/lib/icheck/css/grey@2x.png delete mode 100644 core/admin/assets/lib/icheck/css/icheck.css 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 f69375854d3c5a283121d10352be8a1729a16cc4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2186 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 G$^QeNB@0pj 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"}}}