reverted theme changes,wrt semantic-ui-less

plone · Dec 21, 2018 · ee6a127 · ee6a127
1 parent 0793fbf
commit ee6a127
Show file tree

Hide file tree

Showing 30 changed files with 1,195 additions and 1,518 deletions.
diff --git a/package.json b/package.json
@@ -110,7 +110,7 @@
     "jest-file": "1.0.0",
     "jsonwebtoken": "8.3.0",
     "jwt-decode": "2.2.0",
-    "less": "3.9.0",
+    "less": "2.7.3",
     "less-loader": "4.1.0",
     "locale": "0.1.0",
     "lodash": "4.17.11",
@@ -148,7 +148,7 @@
     "redux-devtools-extension": "2.13.5",
     "redux-mock-store": "1.5.3",
     "redux-thunk": "2.3.0",
-    "semantic-ui-less": "2.4.1",
+    "semantic-ui-less": "2.3.1",
     "semantic-ui-react": "0.82.5",
     "serialize-javascript": "1.5.0",
     "style-loader": "0.23.0",

diff --git a/theme/theme.config b/theme/theme.config
@@ -20,7 +20,7 @@
 /* Global */
 @site       : 'pastanaga';
 @reset      : 'pastanaga';
-@placeholder: 'default';
+
 /* Elements */
 @button     : 'pastanaga';
 @container  : 'pastanaga';
@@ -87,7 +87,7 @@
          Import Theme
 *******************************/
 
-@import (multiple) "~semantic-ui-less/theme.less";
+@import "~semantic-ui-less/theme.less";
 @fontPath : "../../@{theme}/assets/fonts";
 
 /* End Config */
diff --git a/theme/themes/default/collections/menu.variables b/theme/themes/default/collections/menu.variables
@@ -321,7 +321,7 @@
 @tabularVerticalBackground: none @tabularBackgroundColor;
 
 @tabularFluidOffset: 1px;
-@tabularFluidWidth: calc(100% + (@tabularFluidOffset * 2));
+@tabularFluidWidth: ~"calc(100% + "(@tabularFluidOffset * 2)~")";
 
 @tabularActiveBackground: none @white;
 @tabularActiveColor: @selectedTextColor;
@@ -430,7 +430,7 @@
 @attachedTopOffset: 0px;
 @attachedBottomOffset: 0px;
 @attachedHorizontalOffset: -@borderWidth;
-@attachedWidth: calc(100% - (@attachedHorizontalOffset * 2));
+@attachedWidth: ~"calc(100% + "-@attachedHorizontalOffset * 2~")";
 @attachedBoxShadow: none;
 @attachedBorder: @borderWidth solid @solidBorderColor;
 @attachedBottomBoxShadow:

diff --git a/theme/themes/default/collections/table.variables b/theme/themes/default/collections/table.variables
@@ -152,7 +152,7 @@
 @attachedTopOffset: 0px;
 @attachedBottomOffset: 0px;
 @attachedHorizontalOffset: -@borderWidth;
-@attachedWidth: calc(100% - (@attachedHorizontalOffset * 2));
+@attachedWidth: ~"calc(100% + "-@attachedHorizontalOffset * 2~")";
 @attachedBoxShadow: none;
 @attachedBorder: @borderWidth solid @solidBorderColor;
 @attachedBottomBoxShadow:

diff --git a/theme/themes/default/elements/button.variables b/theme/themes/default/elements/button.variables
@@ -318,14 +318,12 @@
 /* Ordinality */
 @primaryBackgroundImage: @coloredBackgroundImage;
 @primaryTextColor: @invertedTextColor;
-@lightPrimaryTextColor: @invertedTextColor;
 @primaryTextShadow: @invertedTextShadow;
 @primaryBoxShadow: @coloredBoxShadow;
 
 @secondaryBackgroundImage: @coloredBackgroundImage;
 @secondaryTextColor: @invertedTextColor;
 @secondaryTextShadow: @invertedTextShadow;
-@lightSecondaryTextColor: @invertedTextColor;
 @secondaryBoxShadow: @coloredBoxShadow;
 
 @positiveBackgroundImage: @coloredBackgroundImage;

diff --git a/theme/themes/default/elements/container.variables b/theme/themes/default/elements/container.variables
@@ -33,19 +33,19 @@
 @veryRelaxedGridGutterWidth: 5rem;
 
 @mobileGridWidth: @mobileWidth;
-@tabletGridWidth: e(%("calc(%d + %d)", @tabletWidth, @gridGutterWidth));
-@computerGridWidth: e(%("calc(%d + %d)", @computerWidth, @gridGutterWidth));
-@largeMonitorGridWidth: e(%("calc(%d + %d)", @largeMonitorWidth, @gridGutterWidth));
+@tabletGridWidth: ~"calc("@tabletWidth~" + "@gridGutterWidth~")";
+@computerGridWidth: ~"calc("@computerWidth~" + "@gridGutterWidth~")";
+@largeMonitorGridWidth: ~"calc("@largeMonitorWidth~" + "@gridGutterWidth~")";
 
 @mobileRelaxedGridWidth: @mobileWidth;
-@tabletRelaxedGridWidth: e(%("calc(%d + %d)", @tabletWidth, @relaxedGridGutterWidth));
-@computerRelaxedGridWidth: e(%("calc(%d + %d)", @computerWidth, @relaxedGridGutterWidth));
-@largeMonitorRelaxedGridWidth: e(%("calc(%d + %d)", @largeMonitorWidth, @relaxedGridGutterWidth));
+@tabletRelaxedGridWidth: ~"calc("@tabletWidth~" + "@relaxedGridGutterWidth~")";
+@computerRelaxedGridWidth: ~"calc("@computerWidth~" + "@relaxedGridGutterWidth~")";
+@largeMonitorRelaxedGridWidth: ~"calc("@largeMonitorWidth~" + "@relaxedGridGutterWidth~")";
 
 @mobileVeryRelaxedGridWidth: @mobileWidth;
-@tabletVeryRelaxedGridWidth: e(%("calc(%d + %d)", @tabletWidth, @veryRelaxedGridGutterWidth));
-@computerVeryRelaxedGridWidth: e(%("calc(%d + %d)", @computerWidth, @veryRelaxedGridGutterWidth));
-@largeMonitorVeryRelaxedGridWidth: e(%("calc(%d + %d)", @largeMonitorWidth, @veryRelaxedGridGutterWidth));
+@tabletVeryRelaxedGridWidth: ~"calc("@tabletWidth~" + "@veryRelaxedGridGutterWidth~")";
+@computerVeryRelaxedGridWidth: ~"calc("@computerWidth~" + "@veryRelaxedGridGutterWidth~")";
+@largeMonitorVeryRelaxedGridWidth: ~"calc("@largeMonitorWidth~" + "@veryRelaxedGridGutterWidth~")";
 
 /*-------------------
        Types

diff --git a/theme/themes/default/elements/divider.variables b/theme/themes/default/elements/divider.variables
@@ -36,10 +36,10 @@
 /* Horizontal / Vertical */
 @horizontalMargin: '';
 @horizontalDividerMargin: 1em;
-@horizontalRulerOffset: e(%("calc(-50%% - %d)", @horizontalDividerMargin));
+@horizontalRulerOffset: ~"calc(-50% - "(@horizontalDividerMargin)~")";
 
 @verticalDividerMargin: 1rem;
-@verticalDividerHeight: e(%("calc(100%% - %d)", @verticalDividerMargin));
+@verticalDividerHeight: ~"calc(100% - "(@verticalDividerMargin)~")";
 
 /* Inverted */
 @invertedTextColor: @white;

diff --git a/theme/themes/default/elements/flag.overrides b/theme/themes/default/elements/flag.overrides
@@ -310,7 +310,6 @@ i.flag.gabon:before {
   background-position: -36px 0px;
 }
 i.flag.gb:before,
-i.flag.uk:before,
 i.flag.united.kingdom:before {
   background-position: -36px -26px;
 }