Merge remote-tracking branch 'justin/FLUID-6166'

* justin/FLUID-6166: FLUID-6166: Fixing class names to use themePicker
fluid-project · Jul 11, 2017 · 1c59e60 · 1c59e60
2 parents 8402ae7 + 7ca6728
commit 1c59e60
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/framework/preferences/css/stylus/PrefsEditor.styl b/src/framework/preferences/css/stylus/PrefsEditor.styl
@@ -211,7 +211,7 @@
 
     // control icons
 
-    .fl-icon-crossout:before, .fl-choice .fl-prefsEditor-contrast-defaultThemeLabel .fl-crossout:before {
+    .fl-icon-crossout:before, .fl-choice .fl-prefsEditor-themePicker-defaultThemeLabel .fl-crossout:before {
         content: "\e004";
     }
     .fl-icon-big-a:before {
@@ -238,15 +238,15 @@
             height: 1em;
         }
 
-        .fl-prefsEditor-contrast-defaultThemeLabel .fl-crossout {
+        .fl-prefsEditor-themePicker-defaultThemeLabel .fl-crossout {
             font-family: 'InfusionIcons' !important;
             margin-top: -1.25em;
             font-size: 1.85em;
         }
 
         label.fl-theme-prefsEditor-default,
         label.fl-theme-prefsEditor-default span,
-        label.fl-prefsEditor-contrast-defaultThemeLabel .fl-crossout {
+        label.fl-prefsEditor-themePicker-defaultThemeLabel .fl-crossout {
             background-color: #FFFFFF !important;
             border-color: #433F3D !important;
             color: #433F3D !important;

diff --git a/src/framework/preferences/html/PrefsEditorTemplate-contrast.html b/src/framework/preferences/html/PrefsEditorTemplate-contrast.html
@@ -1,9 +1,9 @@
 <h2>
     <span class="fl-icon-contrast"></span>
-    <span class="flc-prefsEditor-styledRadioButton-label fl-heading-text"></span>
+    <span class="flc-prefsEditor-themePicker-label fl-heading-text"></span>
 </h2>
 <fieldset>
-    <legend class="flc-prefsEditor-styledRadioButton-descr fl-prefsEditor-panel-descr"></legend>
+    <legend class="flc-prefsEditor-themePicker-descr fl-prefsEditor-panel-descr"></legend>
     <div class="fl-choices">
         <div class="flc-prefsEditor-themeRow fl-choice">
             <input type="radio" class="flc-prefsEditor-themeInput fl-hidden-accessible" name="theme" id="default" value="default" />

diff --git a/src/framework/preferences/js/Panels.js b/src/framework/preferences/js/Panels.js
@@ -719,11 +719,11 @@ var fluid_3_0_0 = fluid_3_0_0 || {};
             themeRow: ".flc-prefsEditor-themeRow",
             themeLabel: ".flc-prefsEditor-theme-label",
             themeInput: ".flc-prefsEditor-themeInput",
-            label: ".flc-prefsEditor-styledRadioButton-label",
-            description: ".flc-prefsEditor-styledRadioButton-descr"
+            label: ".flc-prefsEditor-themePicker-label",
+            description: ".flc-prefsEditor-themePicker-descr"
         },
         styles: {
-            defaultThemeLabel: "fl-prefsEditor-styledRadioButton-defaultThemeLabel"
+            defaultThemeLabel: "fl-prefsEditor-themePicker-defaultThemeLabel"
         },
         repeatingSelectors: ["themeRow"],
         protoTree: {