Merge branch 'master' into FLUID-6325

fluid-project · Oct 30, 2018 · b72ec36 · b72ec36
2 parents 228b0fb + f977b0f
commit b72ec36
Show file tree

Hide file tree

Showing 22 changed files with 364 additions and 427 deletions.
diff --git a/demos/prefsFramework/css/main.css b/demos/prefsFramework/css/main.css
@@ -138,6 +138,7 @@ em {
 .fl-theme-bw #headTitle svg,
 .fl-theme-bbr #headTitle svg,
 .fl-theme-lgdg #headTitle svg,
+.fl-theme-gd #headTitle svg,
 .fl-theme-gw #headTitle svg {
     color: inherit;
     fill: currentColor;
@@ -160,6 +161,10 @@ em {
     vertical-align: middle;
 }
 
+#midBlock nav {
+    padding-top: 0.1rem;
+}
+
 /* SEARCH */
 #searchBox {
     position: absolute;
@@ -200,29 +205,23 @@ em {
     color: #0057A5;
 }
 
-.fl-theme-yb #midNavElements li:before,
-.fl-theme-yb #newsReleasesList li:before {
-    color: #ffff00;
-}
-.fl-theme-wb #midNavElements li:before,
-.fl-theme-wb #newsReleasesList li:before {
-    color: #ffffff;
-}
 .fl-theme-by #midNavElements li:before,
+.fl-theme-yb #midNavElements li:before,
 .fl-theme-bw #midNavElements li:before,
+.fl-theme-wb #midNavElements li:before,
+.fl-theme-lgdg #midNavElements li:before,
+.fl-theme-gd #midNavElements li:before,
+.fl-theme-gw #midNavElements li:before,
 .fl-theme-bbr #midNavElements li:before,
 .fl-theme-by #newsReleasesList li:before,
+.fl-theme-yb #newsReleasesList li:before,
 .fl-theme-bw #newsReleasesList li:before,
+.fl-theme-wb #newsReleasesList li:before,
+.fl-theme-lgdg #newsReleasesList li:before,
+.fl-theme-gd #newsReleasesList li:before,
+.fl-theme-gw #newsReleasesList li:before,
 .fl-theme-bbr #newsReleasesList li:before {
-    color: #000000;
-}
-.fl-theme-lgdg #midNavElements li:before,
-.fl-theme-lgdg #newsReleasesList li:before {
-    color: #bdbdbb;
-}
-.fl-theme-gw #midNavElements li:before,
-.fl-theme-gw #newsReleasesList li:before {
-    color: #6c6c6c;
+    color: inherit;
 }
 
 
@@ -279,7 +278,8 @@ body {
 
 body.fl-theme-yb, body.fl-theme-by,
 body.fl-theme-wb, body.fl-theme-bw,
-body.fl-theme-lgdg, body.fl-theme-gw, body.fl-theme-bbr {
+body.fl-theme-lgdg, body.fl-theme-gw,
+body.fl-theme-gd, body.fl-theme-bbr {
     background-image: none !important;
 }
 
@@ -326,63 +326,35 @@ img.icon {
 .fl-theme-yb .left_tab,
 .fl-theme-yb .middle_tab,
 .fl-theme-yb .right_tab,
-.fl-theme-yb .middle_tab .h1_middle_text  {
-    color: #000000 !important;
-    background-color: #ffff00 !important;
-    background-image: none !important;
-}
-
+.fl-theme-yb .middle_tab .h1_middle_text,
 .fl-theme-wb .left_tab,
 .fl-theme-wb .middle_tab,
 .fl-theme-wb .right_tab,
-.fl-theme-wb .middle_tab .h1_middle_text  {
-    color: #000000 !important;
-    background-color: #ffffff !important;
-    background-image: none !important;
-}
-
+.fl-theme-wb .middle_tab .h1_middle_text,
 .fl-theme-by .left_tab,
 .fl-theme-by .middle_tab,
 .fl-theme-by .right_tab,
-.fl-theme-by .middle_tab .h1_middle_text  {
-    color: #ffff00 !important;
-    background-color: #000000 !important;
-    background-image: none !important;
-}
-
+.fl-theme-by .middle_tab .h1_middle_text,
 .fl-theme-bw .left_tab,
 .fl-theme-bw .middle_tab,
 .fl-theme-bw .right_tab,
-.fl-theme-bw .middle_tab .h1_middle_text  {
-    color: #ffffff !important;
-    background-color: #000000 !important;
-    background-image: none !important;
-}
-
+.fl-theme-bw .middle_tab .h1_middle_text,
 .fl-theme-lgdg .left_tab,
 .fl-theme-lgdg .middle_tab,
 .fl-theme-lgdg .right_tab,
-.fl-theme-lgdg .middle_tab .h1_middle_text {
-    color: #555555 !important;
-    background-color: #bdbdbb !important;
-    background-image: none !important;
-}
-
+.fl-theme-lgdg .middle_tab .h1_middle_text,
 .fl-theme-gw .left_tab,
 .fl-theme-gw .middle_tab,
 .fl-theme-gw .right_tab,
-.fl-theme-gw .middle_tab .h1_middle_text  {
-    color: #ffffff !important;
-    background-color: #6c6c6c !important;
-    background-image: none !important;
-}
-
+.fl-theme-gw .middle_tab .h1_middle_text,
+.fl-theme-gd .left_tab,
+.fl-theme-gd .middle_tab,
+.fl-theme-gd .right_tab,
+.fl-theme-gd .middle_tab .h1_middle_text,
 .fl-theme-bbr .left_tab,
 .fl-theme-bbr .middle_tab,
 .fl-theme-bbr .right_tab,
 .fl-theme-bbr .middle_tab .h1_middle_text  {
-    color: #bb9966 !important;
-    background-color: #000000 !important;
     background-image: none !important;
 }
 
@@ -392,6 +364,7 @@ img.icon {
 .fl-theme-bw #left_box .middle_tab,
 .fl-theme-lgdg #left_box .middle_tab,
 .fl-theme-gw #left_box .middle_tab,
+.fl-theme-gd #left_box .middle_tab,
 .fl-theme-bbr #left_box .middle_tab {
     width: 19.1em;
 }
@@ -410,6 +383,7 @@ img.icon {
     font-weight:bold;
     font-size: 1.08em;
     display: inline;
+    line-height: 1.3;
 }
 
 .theme_image_caption {
@@ -523,38 +497,17 @@ h5 {
     background-size: contain;
     background-color:#0080aa;
 }
-.fl-theme-yb #mainBlock {
-    background-image: none;
-    border-top: 1px solid #ffff00;
-    border-bottom: 1px solid #ffff00;
-    padding-bottom: 1px;
-}
-.fl-theme-wb #mainBlock {
-    background-image: none;
-    border-top: 1px solid #ffffff;
-    border-bottom: 1px solid #ffffff;
-    padding-bottom: 1px;
-}
+.fl-theme-yb #mainBlock,
+.fl-theme-wb #mainBlock,
 .fl-theme-by #mainBlock,
 .fl-theme-bw #mainBlock,
-.fl-theme-bbr #mainBlock {
-    background-image: none;
-    border-top: 1px solid #000000;
-    border-bottom: 1px solid #000000;
-    padding-bottom: 1px;
-}
-
-.fl-theme-lgdg #mainBlock {
-    background-image: none;
-    border-top: 1px solid #bdbdbb;
-    border-bottom: 1px solid #bdbdbb;
-    padding-bottom: 1px;
-}
-
-.fl-theme-gw #mainBlock {
+.fl-theme-bbr #mainBlock,
+.fl-theme-lgdg #mainBlock,
+.fl-theme-gw #mainBlock,
+.fl-theme-gd #mainBlock {
     background-image: none;
-    border-top: 1px solid #6c6c6c;
-    border-bottom: 1px solid #6c6c6c;
+    border-top: 1px solid currentColor;
+    border-bottom: 1px solid currentColor;
     padding-bottom: 1px;
 }
 

diff --git a/demos/prefsFramework/index.html b/demos/prefsFramework/index.html
@@ -418,12 +418,14 @@ <h1 class="ocean">Climate Change Impacts</h1>
 
                         <img class="icon" style="padding-right: 5px; float: right;" src="images/theme_climate_90.gif" alt="Oceans and Coasts" height="90" width="90">
                         <aside id="left_box">
-
-                            <div class="left_tab"></div>
-                            <div class="middle_tab">
-                                <h2 class="h1_middle_text fl-inverted-color">Resources</h2>
+                            <div class="fl-inverted-color">
+                                <div class="left_tab"></div>
+                                <div class="middle_tab">
+                                    <h2 class="h1_middle_text">Resources</h2>
+                                </div>
+                                <div class="right_tab"></div>
                             </div>
-                            <div class="right_tab"></div><div style="clear:both;"></div>
+                            <div style="clear:both;"></div>
                             <div id="newsReleasesList" style="overflow: hidden;border: 1px #CCC solid ;margin-bottom: 11px; ">
                                 <h3 style="padding:5px; padding-bottom:0px; background-color:#F0F8FF">Multimedia</h3>
                                 <ul>

diff --git a/demos/uiOptions/index.html b/demos/uiOptions/index.html
@@ -244,7 +244,7 @@ <h2>Leave some feedback</h2>
                             <textarea id="comments">This form is non-functional, and exists only for demonstrating Preferences Editor functionality</textarea>
                         </div>
                         <div>
-                            <button class="fl-force-right">Send</button>
+                            <button class="fl-force-right" disabled>Send</button>
                         </div>
                     </form>
                 </div>

diff --git a/examples/framework/preferences/usingGrades/index.html b/examples/framework/preferences/usingGrades/index.html
@@ -224,7 +224,7 @@ <h2>Leave some feedback</h2>
                             <textarea id="comments">This form is non-functional, and exists only for demonstrating Preferences Editorfunctionality</textarea>
                         </div>
                         <div>
-                            <button class="fl-force-right">Send</button>
+                            <button class="fl-force-right" disabled>Send</button>
                         </div>
                     </form>
                 </div>