From 181bb9a6a797240e497c2d2d403501fed54b25f9 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 20 Aug 2015 15:49:44 -0400 Subject: [PATCH] theme selection buttons --- public/less/admin/appearance/themes.less | 4 ++++ public/src/admin/appearance/skins.js | 15 +++++++++++++-- public/src/admin/appearance/themes.js | 15 +++++++++++++-- 3 files changed, 30 insertions(+), 4 deletions(-) diff --git a/public/less/admin/appearance/themes.less b/public/less/admin/appearance/themes.less index e43d7c53dd..132dd4c08d 100644 --- a/public/less/admin/appearance/themes.less +++ b/public/less/admin/appearance/themes.less @@ -43,6 +43,10 @@ } } + [data-theme].selected .mdl-button { + color: black; + } + [data-type="bootswatch"] { .mdl-card__title { height: 198px; diff --git a/public/src/admin/appearance/skins.js b/public/src/admin/appearance/skins.js index a8b8ed151b..861757c130 100644 --- a/public/src/admin/appearance/skins.js +++ b/public/src/admin/appearance/skins.js @@ -63,8 +63,19 @@ define('admin/appearance/skins', function() { }; function highlightSelectedTheme(themeId) { - $('.themes li[data-theme]').removeClass('selected').find('[data-action="use"]').html('Use Theme').removeClass('btn-success').addClass('btn-primary'); - $('.themes li[data-theme="' + themeId + '"]').addClass('selected').find('[data-action="use"]').html('Current Theme').removeClass('btn-primary').addClass('btn-success'); + $('[data-theme]') + .removeClass('selected') + .find('[data-action="use"]') + .html('Select Theme') + .removeClass('btn-success') + .addClass('btn-primary'); + + $('[data-theme="' + themeId + '"]') + .addClass('selected') + .find('[data-action="use"]') + .html('Current Theme') + .removeClass('btn-primary') + .addClass('btn-success'); } return Skins; diff --git a/public/src/admin/appearance/themes.js b/public/src/admin/appearance/themes.js index 9ddcb58faa..17bae639d7 100644 --- a/public/src/admin/appearance/themes.js +++ b/public/src/admin/appearance/themes.js @@ -84,8 +84,19 @@ define('admin/appearance/themes', function() { }; function highlightSelectedTheme(themeId) { - $('.themes li[data-theme]').removeClass('selected'); - $('.themes li[data-theme="' + themeId + '"]').addClass('selected'); + $('[data-theme]') + .removeClass('selected') + .find('[data-action="use"]') + .html('Select Theme') + .removeClass('btn-success') + .addClass('btn-primary'); + + $('[data-theme="' + themeId + '"]') + .addClass('selected') + .find('[data-action="use"]') + .html('Current Theme') + .removeClass('btn-primary') + .addClass('btn-success'); } return Themes;