flexmonster 2.9.7 → 2.9.11

package/theme/flexmonster-base.less

@@ -1,5 +1,9 @@
 @import (reference) "default/flexmonster.less";
 
+:root {
+    --fm-version: "2.9.11";
+}
+
 /* ===== RESET STYLES ===== */
 #fm-pivot-view,
 #fm-toolbar-wrapper {
@@ -3282,8 +3286,9 @@
     }
 
     .fm-popup-header {
+        display: flex;
         .fm-ui-col:first-child {
-            max-width: 300px;
+            min-width: 100px;
 
             span.fm-ui-label {
                 white-space: nowrap;
@@ -3292,6 +3297,21 @@
             }
         }
 
+        .fm-ui-col:nth-child(1) {
+            flex: 1;
+
+            .fm-popup-subtitle {
+                width: fit-content;
+            }
+        }
+
+        .fm-ui-col:nth-child(2) {
+            min-width: 405px;
+            position: relative;
+            right: 0px;
+            margin-left: 30px;
+        }
+
         .fm-btn-add-measure {
             padding-right: 32px;
             max-width: 250px;
@@ -3906,9 +3926,21 @@
             height: ~"calc(100% - 50px)";
             height: ~"-webkit-calc(100% - 50px)";
         }
+
+        .fm-ui-col:nth-child(2) {
+            min-width: 260px;
+        }
     }
 
     &.fm-layout-mobile-small {
+        .fm-popup-header {
+            flex-direction: column;
+        }
+        
+        .fm-ui-col:nth-child(2) {
+            margin-left: auto;
+        }
+
         .fm-popup-content {
             height: ~"calc(100% - 95px)";
             height: ~"-webkit-calc(100% - 95px)";
@@ -3926,8 +3958,13 @@
         height: 467px;
 
         .fm-popup-header {
-            .fm-ui-col:first-child {
+            .fm-ui-col:nth-child(1) {
                 margin-right: 20px;
+                flex: none;
+            }
+
+            .fm-ui-col:nth-child(2) {
+                min-width: auto;
             }
 
             .fm-btn-add-measure {
@@ -6172,12 +6209,12 @@
     left: 0px;
 }
 
-#fm-toolbar-wrapper #fm-toolbar .fm-align-rigth .fm-dropdown-content:after {
+#fm-toolbar-wrapper #fm-toolbar .fm-align-right .fm-dropdown-content:after {
     left: inherit;
     right: 20px;
 }
 
-#fm-toolbar-wrapper #fm-toolbar .fm-align-rigth .fm-dropdown-content:before {
+#fm-toolbar-wrapper #fm-toolbar .fm-align-right .fm-dropdown-content:before {
     left: inherit;
     right: 19px;
 }
@@ -6358,32 +6395,29 @@
 #fm-toolbar-wrapper div.fm-panel.fm-popup {
     &.fm-layout-mobile {
         padding: 20px;
-    }
 
-    &.fm-layout-mobile-small {
         .fm-panel-content {
-            .fm-toolbox {
-                position: relative;
-                right: initial;
-                right: auto;
-                text-align: left;
-                width: 100%;
-
-                a.fm-ui-btn {
-                    width: ~"calc(50% - 10px)";
-                    width: ~"-webkit-calc(50% - 10px)";
-                }
-
-            }
             .fm-title-bar {
-                .fm-title-text {
+                display: flex;
+                flex-direction: column;
+                
+                .fm-title-text.fm-ui-col {
+                    max-width: none !important;
                     width: 100%;
-                    margin-bottom: 10px;
-                    text-align: left;
                     font-size: @ui-title-font-size-smaller;
+                    margin-bottom: 10px;
                 }
-            
+            }
+
+            .fm-toolbox {
+                display: flex;
+                max-width: none !important;
+                width: auto !important;
 
+                .fm-ui-btn:not(.fm-button-add) {
+                    max-width: none;
+                    flex: 1;
+                }
             }
         } 
     }
@@ -6394,7 +6428,13 @@
     width: 610px;
     min-width: 400px;
 
+    .fm-toolbox {
+        max-width: 54% !important;
+        width: 54% !important;
+    }
+
     .fm-title-text {
+        max-width: 46% !important;
         width: ~"-webkit-calc(100% - 270px)";
         width: ~"calc(100% - 270px)";
     }
@@ -6436,7 +6476,8 @@
         }
 
         .fm-values {
-            width: 150px;
+            width: ~"calc(100% - 390px)";
+            width: ~"-webkit-calc(100% - 390px)";
         }
 
         .fm-conditions {
@@ -6444,7 +6485,8 @@
         }
 
         .fm-font-family {
-            width: 150px;
+            width: ~"calc(100% - 390px)";
+            width: ~"-webkit-calc(100% - 390px)";
         }
 
         .fm-font-size {
@@ -6489,19 +6531,6 @@
             top: -90px;
         }
     }
-
-    &.fm-layout-mobile-small {
-        .fm-title-text {
-            width: 100%;
-        }
-
-        .fm-panel-content .fm-toolbox {
-            .fm-ui-btn:not(.fm-button-add) {
-                width: ~"calc(50% - 42px)";
-                width: ~"-webkit-calc(50% - 42px)";
-            }
-        }
-    }
 }
 
 #fm-toolbar-wrapper .fm-toolbar-ui .fm-cr-inner {
@@ -7156,7 +7185,7 @@
 
 #fm-toolbar-wrapper .fm-toolbar-ui .fm-button-add {
   padding-right: 30px;
-  min-width: unset;
+  min-width: auto;
 }
 
 #fm-toolbar-wrapper .fm-toolbar-ui .fm-button-add-large {

package/theme/green/flexmonster.css

@@ -1,3 +1,6 @@
+:root {
+  --fm-version: "2.9.11";
+}
 /* ===== RESET STYLES ===== */
 #fm-pivot-view,
 #fm-toolbar-wrapper {
@@ -3438,14 +3441,29 @@
 #fm-pivot-view .fm-fields-view .fm-btn-add-measure-2:hover:before {
   color: #59a10e;
 }
+#fm-pivot-view .fm-fields-view .fm-popup-header {
+  display: flex;
+}
 #fm-pivot-view .fm-fields-view .fm-popup-header .fm-ui-col:first-child {
-  max-width: 300px;
+  min-width: 100px;
 }
 #fm-pivot-view .fm-fields-view .fm-popup-header .fm-ui-col:first-child span.fm-ui-label {
   white-space: nowrap;
   text-overflow: ellipsis;
   overflow: hidden;
 }
+#fm-pivot-view .fm-fields-view .fm-popup-header .fm-ui-col:nth-child(1) {
+  flex: 1;
+}
+#fm-pivot-view .fm-fields-view .fm-popup-header .fm-ui-col:nth-child(1) .fm-popup-subtitle {
+  width: fit-content;
+}
+#fm-pivot-view .fm-fields-view .fm-popup-header .fm-ui-col:nth-child(2) {
+  min-width: 405px;
+  position: relative;
+  right: 0px;
+  margin-left: 30px;
+}
 #fm-pivot-view .fm-fields-view .fm-popup-header .fm-btn-add-measure {
   padding-right: 32px;
   max-width: 250px;
@@ -4310,6 +4328,15 @@
   height: calc(100% - 50px);
   height: -webkit-calc(100% - 50px);
 }
+#fm-pivot-view .fm-fields-view.fm-layout-mobile .fm-ui-col:nth-child(2) {
+  min-width: 260px;
+}
+#fm-pivot-view .fm-fields-view.fm-layout-mobile-small .fm-popup-header {
+  flex-direction: column;
+}
+#fm-pivot-view .fm-fields-view.fm-layout-mobile-small .fm-ui-col:nth-child(2) {
+  margin-left: auto;
+}
 #fm-pivot-view .fm-fields-view.fm-layout-mobile-small .fm-popup-content {
   height: calc(100% - 95px);
   height: -webkit-calc(100% - 95px);
@@ -4323,8 +4350,12 @@
   min-height: 467px;
   height: 467px;
 }
-#fm-pivot-view .fm-fields-view.fm-flat-fields .fm-popup-header .fm-ui-col:first-child {
+#fm-pivot-view .fm-fields-view.fm-flat-fields .fm-popup-header .fm-ui-col:nth-child(1) {
   margin-right: 20px;
+  flex: none;
+}
+#fm-pivot-view .fm-fields-view.fm-flat-fields .fm-popup-header .fm-ui-col:nth-child(2) {
+  min-width: auto;
 }
 #fm-pivot-view .fm-fields-view.fm-flat-fields .fm-popup-header .fm-btn-add-measure {
   min-width: 40px;
@@ -6372,11 +6403,11 @@
 #fm-toolbar-wrapper #fm-toolbar .fm-dropdown-scrollable-left:before {
   left: 0px;
 }
-#fm-toolbar-wrapper #fm-toolbar .fm-align-rigth .fm-dropdown-content:after {
+#fm-toolbar-wrapper #fm-toolbar .fm-align-right .fm-dropdown-content:after {
   left: inherit;
   right: 20px;
 }
-#fm-toolbar-wrapper #fm-toolbar .fm-align-rigth .fm-dropdown-content:before {
+#fm-toolbar-wrapper #fm-toolbar .fm-align-right .fm-dropdown-content:before {
   left: inherit;
   right: 19px;
 }
@@ -6506,29 +6537,36 @@
 #fm-toolbar-wrapper div.fm-panel.fm-popup.fm-layout-mobile {
   padding: 20px;
 }
-#fm-toolbar-wrapper div.fm-panel.fm-popup.fm-layout-mobile-small .fm-panel-content .fm-toolbox {
-  position: relative;
-  right: initial;
-  right: auto;
-  text-align: left;
-  width: 100%;
-}
-#fm-toolbar-wrapper div.fm-panel.fm-popup.fm-layout-mobile-small .fm-panel-content .fm-toolbox a.fm-ui-btn {
-  width: calc(50% - 10px);
-  width: -webkit-calc(50% - 10px);
+#fm-toolbar-wrapper div.fm-panel.fm-popup.fm-layout-mobile .fm-panel-content .fm-title-bar {
+  display: flex;
+  flex-direction: column;
 }
-#fm-toolbar-wrapper div.fm-panel.fm-popup.fm-layout-mobile-small .fm-panel-content .fm-title-bar .fm-title-text {
+#fm-toolbar-wrapper div.fm-panel.fm-popup.fm-layout-mobile .fm-panel-content .fm-title-bar .fm-title-text.fm-ui-col {
+  max-width: none !important;
   width: 100%;
-  margin-bottom: 10px;
-  text-align: left;
   font-size: 18px;
+  margin-bottom: 10px;
+}
+#fm-toolbar-wrapper div.fm-panel.fm-popup.fm-layout-mobile .fm-panel-content .fm-toolbox {
+  display: flex;
+  max-width: none !important;
+  width: auto !important;
+}
+#fm-toolbar-wrapper div.fm-panel.fm-popup.fm-layout-mobile .fm-panel-content .fm-toolbox .fm-ui-btn:not(.fm-button-add) {
+  max-width: none;
+  flex: 1;
 }
 /* Conditional formatting */
 #fm-toolbar-wrapper .fm-popup-conditional {
   width: 610px;
   min-width: 400px;
 }
+#fm-toolbar-wrapper .fm-popup-conditional .fm-toolbox {
+  max-width: 54% !important;
+  width: 54% !important;
+}
 #fm-toolbar-wrapper .fm-popup-conditional .fm-title-text {
+  max-width: 46% !important;
   width: -webkit-calc(100% - 270px);
   width: calc(100% - 270px);
 }
@@ -6564,13 +6602,15 @@
   color: #59a10e;
 }
 #fm-toolbar-wrapper .fm-popup-conditional .fm-condition-row .fm-values {
-  width: 150px;
+  width: calc(100% - 390px);
+  width: -webkit-calc(100% - 390px);
 }
 #fm-toolbar-wrapper .fm-popup-conditional .fm-condition-row .fm-conditions {
   width: 150px;
 }
 #fm-toolbar-wrapper .fm-popup-conditional .fm-condition-row .fm-font-family {
-  width: 150px;
+  width: calc(100% - 390px);
+  width: -webkit-calc(100% - 390px);
 }
 #fm-toolbar-wrapper .fm-popup-conditional .fm-condition-row .fm-font-size {
   width: 100px;
@@ -6604,13 +6644,6 @@
 #fm-toolbar-wrapper .fm-popup-conditional.fm-layout-mobile .fm-cr-delete {
   top: -90px;
 }
-#fm-toolbar-wrapper .fm-popup-conditional.fm-layout-mobile-small .fm-title-text {
-  width: 100%;
-}
-#fm-toolbar-wrapper .fm-popup-conditional.fm-layout-mobile-small .fm-panel-content .fm-toolbox .fm-ui-btn:not(.fm-button-add) {
-  width: calc(50% - 42px);
-  width: -webkit-calc(50% - 42px);
-}
 #fm-toolbar-wrapper .fm-toolbar-ui .fm-cr-inner {
   font-size: 0;
   margin-bottom: 10px;
@@ -7168,7 +7201,7 @@
 }
 #fm-toolbar-wrapper .fm-toolbar-ui .fm-button-add {
   padding-right: 30px;
-  min-width: unset;
+  min-width: auto;
 }
 #fm-toolbar-wrapper .fm-toolbar-ui .fm-button-add-large {
   padding-left: 36px;