Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade less and semantic ui to latests versions #585

Merged
merged 3 commits into from
Dec 24, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
- Fix download file links @mikejmets
- Upgrade to Node 8.14.0 @timo
- Relaxed node runtime constraints @sneridagh
- Update to latest LESS and Semantic UI version @sneridagh

## Added

Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
"jest-file": "1.0.0",
"jsonwebtoken": "8.3.0",
"jwt-decode": "2.2.0",
"less": "2.7.3",
"less": "3.9.0",
"less-loader": "4.1.0",
"locale": "0.1.0",
"lodash": "4.17.11",
Expand Down Expand Up @@ -129,14 +129,14 @@
"react-share": "2.3.1",
"react-side-effect": "1.1.5",
"react-test-renderer": "16.5.2",
"redux-mock-store": "1.5.3",
"redraft": "0.10.1",
"redux": "4.0.0",
"redux-connect": "8.0.0",
"redux-devtools-extension": "2.13.5",
"redux-mock-store": "1.5.3",
"redux-thunk": "2.3.0",
"semantic-ui-less": "2.3.1",
"semantic-ui-react": "0.82.5",
"semantic-ui-less": "2.4.1",
"semantic-ui-react": "0.84.0",
"serialize-javascript": "1.5.0",
"style-loader": "0.23.0",
"superagent": "4.0.0-beta.5",
Expand Down
95 changes: 48 additions & 47 deletions theme/theme.config
Original file line number Diff line number Diff line change
Expand Up @@ -18,66 +18,67 @@
*/

/* Global */
@site : 'pastanaga';
@reset : 'pastanaga';
@site : 'pastanaga';
@reset : 'pastanaga';

/* Elements */
@button : 'pastanaga';
@container : 'pastanaga';
@divider : 'pastanaga';
@flag : 'pastanaga';
@header : 'pastanaga';
@icon : 'pastanaga';
@image : 'pastanaga';
@input : 'pastanaga';
@label : 'pastanaga';
@list : 'pastanaga';
@loader : 'pastanaga';
@rail : 'pastanaga';
@reveal : 'pastanaga';
@segment : 'pastanaga';
@step : 'pastanaga';
@button : 'pastanaga';
@container : 'pastanaga';
@divider : 'pastanaga';
@flag : 'pastanaga';
@header : 'pastanaga';
@icon : 'pastanaga';
@image : 'pastanaga';
@input : 'pastanaga';
@label : 'pastanaga';
@list : 'pastanaga';
@loader : 'pastanaga';
@placeholder : 'pastanaga';
@rail : 'pastanaga';
@reveal : 'pastanaga';
@segment : 'pastanaga';
@step : 'pastanaga';

/* Collections */
@breadcrumb : 'pastanaga';
@form : 'pastanaga';
@grid : 'pastanaga';
@menu : 'pastanaga';
@message : 'pastanaga';
@table : 'pastanaga';
@breadcrumb : 'pastanaga';
@form : 'pastanaga';
@grid : 'pastanaga';
@menu : 'pastanaga';
@message : 'pastanaga';
@table : 'pastanaga';

/* Modules */
@accordion : 'pastanaga';
@checkbox : 'pastanaga';
@dimmer : 'pastanaga';
@dropdown : 'pastanaga';
@embed : 'pastanaga';
@modal : 'pastanaga';
@nag : 'pastanaga';
@popup : 'pastanaga';
@progress : 'pastanaga';
@rating : 'pastanaga';
@search : 'pastanaga';
@shape : 'pastanaga';
@sidebar : 'pastanaga';
@sticky : 'pastanaga';
@tab : 'pastanaga';
@transition : 'pastanaga';
@accordion : 'pastanaga';
@checkbox : 'pastanaga';
@dimmer : 'pastanaga';
@dropdown : 'pastanaga';
@embed : 'pastanaga';
@modal : 'pastanaga';
@nag : 'pastanaga';
@popup : 'pastanaga';
@progress : 'pastanaga';
@rating : 'pastanaga';
@search : 'pastanaga';
@shape : 'pastanaga';
@sidebar : 'pastanaga';
@sticky : 'pastanaga';
@tab : 'pastanaga';
@transition : 'pastanaga';

/* Views */
@ad : 'pastanaga';
@card : 'pastanaga';
@comment : 'pastanaga';
@feed : 'pastanaga';
@item : 'pastanaga';
@statistic : 'pastanaga';
@ad : 'pastanaga';
@card : 'pastanaga';
@comment : 'pastanaga';
@feed : 'pastanaga';
@item : 'pastanaga';
@statistic : 'pastanaga';

/*******************************
Folders
*******************************/

/* Path to theme packages */
@themesFolder : '../../theme/themes';
@themesFolder : '../../theme/themes';

/* Path to site override folder */
@siteFolder : "../../theme";
Expand All @@ -87,7 +88,7 @@
Import Theme
*******************************/

@import "~semantic-ui-less/theme.less";
@import (multiple) "~semantic-ui-less/theme.less";
@fontPath : "../../@{theme}/assets/fonts";

/* End Config */
Binary file added theme/themes/default/assets/fonts/brand-icons.eot
Binary file not shown.
1,008 changes: 1,008 additions & 0 deletions theme/themes/default/assets/fonts/brand-icons.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added theme/themes/default/assets/fonts/brand-icons.ttf
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified theme/themes/default/assets/fonts/icons.eot
Binary file not shown.
2,459 changes: 1,515 additions & 944 deletions theme/themes/default/assets/fonts/icons.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified theme/themes/default/assets/fonts/icons.ttf
Binary file not shown.
Binary file modified theme/themes/default/assets/fonts/icons.woff
Binary file not shown.
Binary file modified theme/themes/default/assets/fonts/icons.woff2
Binary file not shown.
Binary file not shown.
366 changes: 366 additions & 0 deletions theme/themes/default/assets/fonts/outline-icons.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Empty file modified theme/themes/default/assets/images/flags.png
100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified theme/themes/default/collections/breadcrumb.overrides
100755 → 100644
Empty file.
Empty file modified theme/themes/default/collections/form.overrides
100755 → 100644
Empty file.
Empty file modified theme/themes/default/collections/grid.overrides
100755 → 100644
Empty file.
Empty file modified theme/themes/default/collections/grid.variables
100755 → 100644
Empty file.
Empty file modified theme/themes/default/collections/menu.overrides
100755 → 100644
Empty file.
4 changes: 2 additions & 2 deletions theme/themes/default/collections/menu.variables
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@
@tabularVerticalBackground: none @tabularBackgroundColor;

@tabularFluidOffset: 1px;
@tabularFluidWidth: ~"calc(100% + "(@tabularFluidOffset * 2)~")";
@tabularFluidWidth: calc(100% + (@tabularFluidOffset * 2));

@tabularActiveBackground: none @white;
@tabularActiveColor: @selectedTextColor;
Expand Down Expand Up @@ -430,7 +430,7 @@
@attachedTopOffset: 0px;
@attachedBottomOffset: 0px;
@attachedHorizontalOffset: -@borderWidth;
@attachedWidth: ~"calc(100% + "-@attachedHorizontalOffset * 2~")";
@attachedWidth: calc(100% - (@attachedHorizontalOffset * 2));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe you should keep the ~" " around less/less.js#974 (comment)

@attachedBoxShadow: none;
@attachedBorder: @borderWidth solid @solidBorderColor;
@attachedBottomBoxShadow:
Expand Down
Empty file modified theme/themes/default/collections/message.overrides
100755 → 100644
Empty file.
Empty file modified theme/themes/default/collections/table.overrides
100755 → 100644
Empty file.
2 changes: 1 addition & 1 deletion theme/themes/default/collections/table.variables
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
@attachedTopOffset: 0px;
@attachedBottomOffset: 0px;
@attachedHorizontalOffset: -@borderWidth;
@attachedWidth: ~"calc(100% + "-@attachedHorizontalOffset * 2~")";
@attachedWidth: calc(100% - (@attachedHorizontalOffset * 2));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe you should keep the ~" " around less/less.js#974 (comment)

@attachedBoxShadow: none;
@attachedBorder: @borderWidth solid @solidBorderColor;
@attachedBottomBoxShadow:
Expand Down
Empty file modified theme/themes/default/elements/button.overrides
100755 → 100644
Empty file.
2 changes: 2 additions & 0 deletions theme/themes/default/elements/button.variables
Original file line number Diff line number Diff line change
Expand Up @@ -318,12 +318,14 @@
/* Ordinality */
@primaryBackgroundImage: @coloredBackgroundImage;
@primaryTextColor: @invertedTextColor;
@lightPrimaryTextColor: @invertedTextColor;
@primaryTextShadow: @invertedTextShadow;
@primaryBoxShadow: @coloredBoxShadow;

@secondaryBackgroundImage: @coloredBackgroundImage;
@secondaryTextColor: @invertedTextColor;
@secondaryTextShadow: @invertedTextShadow;
@lightSecondaryTextColor: @invertedTextColor;
@secondaryBoxShadow: @coloredBoxShadow;

@positiveBackgroundImage: @coloredBackgroundImage;
Expand Down
Empty file modified theme/themes/default/elements/container.overrides
100755 → 100644
Empty file.
Empty file modified theme/themes/default/elements/container.variables
100755 → 100644
Empty file.
Empty file modified theme/themes/default/elements/divider.overrides
100755 → 100644
Empty file.
1 change: 1 addition & 0 deletions theme/themes/default/elements/flag.overrides
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,7 @@ 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;
}
Expand Down
Empty file modified theme/themes/default/elements/flag.variables
100755 → 100644
Empty file.
Empty file modified theme/themes/default/elements/header.overrides
100755 → 100644
Empty file.