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.

Sign up for GitHub

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 npm dependencies #8506

Merged
merged 3 commits into from
Sep 21, 2021
Merged

Upgrade npm dependencies #8506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5cd6238
Upgrade less and karma
riknoll Sep 21, 2021
fb9b861
Fix font size, fullscreen modal, hero banner, home page segments
riknoll Sep 21, 2021
5611062
fix print dialog, image editor toggle icons, highcontrast dropdown ho…
riknoll Sep 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cli/cli.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1933,7 +1933,7 @@ function buildSemanticUIAsync(parsed?: commandParser.ParsedCommand) {
const lessCPath = path.join(path.dirname(lessPath), '/bin/lessc');
return nodeutil.spawnAsync({
cmd: "node",
args: [lessCPath, "theme/style.less", "built/web/semantic.css", "--include-path=node_modules/semantic-ui-less:node_modules/pxt-core/theme:theme/foo/bar", "--no-ie-compat"]
args: [lessCPath, "theme/style.less", "built/web/semantic.css", "--include-path=node_modules/semantic-ui-less:node_modules/pxt-core/theme:theme/foo/bar"]
}).then(() => {
const fontFile = fs.readFileSync("node_modules/semantic-ui-less/themes/default/assets/fonts/icons.woff")
const url = "url(data:application/font-woff;charset=utf-8;base64,"
Expand All @@ -1954,7 +1954,7 @@ function buildSemanticUIAsync(parsed?: commandParser.ParsedCommand) {
return Promise.resolve();
return nodeutil.spawnAsync({
cmd: "node",
args: [lessCPath, "theme/blockly.less", "built/web/blockly.css", "--include-path=node_modules/semantic-ui-less:node_modules/pxt-core/theme:theme/foo/bar", "--no-ie-compat"]
args: [lessCPath, "theme/blockly.less", "built/web/blockly.css", "--include-path=node_modules/semantic-ui-less:node_modules/pxt-core/theme:theme/foo/bar"]
})
}).then(() => {
// run postcss with autoprefixer and rtlcss
Expand Down
8 changes: 4 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,11 @@
"cssnano": "4.1.10",
"dompurify": "2.0.8",
"faye-websocket": "0.11.1",
"karma": "4.4.1",
"karma": "6.3.4",
"karma-chai": "0.1.0",
"karma-chrome-launcher": "3.1.0",
"karma-mocha": "1.3.0",
"less": "2.7.3",
"karma-mocha": "2.0.1",
"less": "3.13.1",
"lzma": "2.3.2",
"marked": "0.3.19",
"mocha": "5.1.0",
Expand All @@ -80,7 +80,7 @@
"rimraf": "2.5.4",
"rtlcss": "2.2.1",
"sanitize-html": "1.22.0",
"semantic-ui-less": "2.2.14",
"semantic-ui-less": "2.4.1",
"terser": "5.6.0"
},
"lazyDependencies": {
Expand Down
3 changes: 1 addition & 2 deletions theme/common.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ html {
height: 100%;
width: 100%;
overflow: hidden;
font-size:16px;
font-size: 16px!important;
}

body {
Expand Down Expand Up @@ -1430,7 +1430,6 @@ p.ui.font.small {
}
}


/*******************************
Media Adjustments
*******************************/
Expand Down
4 changes: 3 additions & 1 deletion theme/highcontrast.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -741,8 +741,10 @@

.ui.dropdown .menu,
.ui.dropdown .menu > .item,
.ui.dropdown .menu > .item:hover,
.ui.menu .ui.dropdown .menu,
.ui.menu .ui.dropdown .menu > .item {
.ui.menu .ui.dropdown .menu > .item,
.ui.menu .ui.dropdown .menu > .item:hover {
background: @HCbackground !important;
color: @HCtextColor !important;

Expand Down
12 changes: 6 additions & 6 deletions theme/home.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
z-index: @homeScreenZIndex+2 !important;
}
}
.getting-started-segment {
.ui.segment.getting-started-segment {
border: 0;
margin-top: -2.1rem !important;
margin-bottom: 2.1rem !important;
Expand All @@ -57,7 +57,7 @@
text-shadow: -1px 0 rgb(87, 87, 87), 0 1px rgb(87, 87, 87), 1px 0 rgb(87, 87, 87), 0 -1px rgb(87, 87, 87);
}
}
.getting-started-segment.hero {
.ui.segment.getting-started-segment.hero {
-webkit-transition: background-image 0.2s ease-in;
transition: background-image 0.2s ease-in;
overflow: hidden;
Expand Down Expand Up @@ -126,7 +126,7 @@
min-height: 100%;
background: @homeScreenBackground;
}
.gallerysegment {
.ui.segment.gallerysegment {
background: none;
border: none;
box-shadow: none;
Expand Down Expand Up @@ -531,7 +531,7 @@
@media only screen and (max-width: @largestTabletScreen) {
/* Carousel */
.projectsdialog {
.getting-started-segment {
.ui.segment.getting-started-segment {
background-position: left center;
height: 250px;
.getting-started {
Expand Down Expand Up @@ -604,7 +604,7 @@
@media only screen and (max-width: @largestMobileScreen) {
/* Carousel */
.projectsdialog {
.getting-started-segment {
.ui.segment.getting-started-segment {
height: 10rem;
margin-bottom: 0.5rem !important;
.getting-started-header {
Expand Down Expand Up @@ -810,7 +810,7 @@
height: 220px;
}
}
.getting-started-segment {
.ui.segment.getting-started-segment {
margin-top: -3.1rem!important;
margin-bottom: 0rem!important;
height: 168px;
Expand Down
2 changes: 1 addition & 1 deletion theme/image-editor/imageEditor.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@
transition: color 0.3s;
user-select: none;

& > i {
& > i.icon {
display: flex;
align-items: center;
justify-content: center;
Expand Down
2 changes: 1 addition & 1 deletion theme/pxt.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* Import all components */
@import 'pxtsemantic';
@import 'themes/default/globals/site.variables';
@import 'themes/pxt/globals/site.variables';
@import 'pxtsemantic';

@import 'common';
@import 'common-components';
Expand Down
1 change: 0 additions & 1 deletion theme/style.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
/* Import all components */
@import 'pxtsemantic';
@import 'pxt';
4 changes: 3 additions & 1 deletion theme/theme.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
specify theme name below
*/

@placeholder: 'default';
Copy link
Contributor

Choose a reason for hiding this comment

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

what is this overriding?

Copy link
Member Author

Choose a reason for hiding this comment

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

this fixes a build issue with less. tbh, i have no idea what it does but here's where I got it: Semantic-Org/Semantic-UI-LESS#53


/* Global */
@site : 'pxt';
@reset : 'pxt';
Expand Down Expand Up @@ -87,7 +89,7 @@
Import Theme
*******************************/

@import "theme.less";
@import (multiple) "theme.less";

@fontPath : 'fonts';

Expand Down
57 changes: 57 additions & 0 deletions theme/themes/pxt/modules/modal.overrides
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
.modals.dimmer .ui.fullscreen.scrolling.modal {
position: absolute !important;
top: 0 !important;
left: 0 !important;
margin: 0 !important;
padding: 0 !important;
border: 0 !important;
Expand Down Expand Up @@ -195,6 +196,62 @@
}
}

body .dimmable.dimmed .ui.page.dimmer .ui.modal {
position: fixed;
top: 50%;
left: 50%;
}

@media only screen and (max-width: @largestMobileScreen) {
body .dimmable.dimmed .ui.page.dimmer .ui.modal {
margin: 0 0 0 -47.5%;
}
}

@media only screen and (min-width: @tabletBreakpoint) {
body .dimmable.dimmed .ui.page.dimmer {
.ui.modal {
margin: 0 0 0 -44%;
}
.ui.tiny.modal {
margin: 0 0 0 -26.4%;
}
}
}

@media only screen and (min-width: @computerBreakpoint) {
body .dimmable.dimmed .ui.page.dimmer {
.ui.modal {
margin: 0 0 0 -425px;
}

.ui.tiny.modal {
margin: 0 0 0 -255px;
}

.ui.large.modal {
margin: 0 0 0 -510px;
}
}
}

@media only screen and (min-width: @largeMonitorBreakpoint) {
body .dimmable.dimmed .ui.page.dimmer {
.ui.modal {
margin: 0 0 0 -450px;
}

.ui.tiny.modal {
margin: 0 0 0 -270px;
}

.ui.large.modal {
margin: 0 0 0 -540px;
}
}
}


/*******************************
Modal Close Icon
*******************************/
Expand Down
6 changes: 3 additions & 3 deletions theme/tutorial.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@ code.lang-filterblocks {
filter: brightness(0.8);
}

.modals .immersive-reader-button {
.modals .ui.button.immersive-reader-button {
background-image: @immersiveReaderIcon;
width: 2rem;
height: 2.8rem;
Expand All @@ -540,8 +540,8 @@ code.lang-filterblocks {
margin-left: 0!important;
}

.modals .immersive-reader-button:hover,
.modals .immersive-reader-button:focus {
.modals .ui.button.immersive-reader-button:hover,
.modals .ui.button.immersive-reader-button:focus {
box-shadow: none;
background-image: @immersiveReaderIcon;
background-repeat: no-repeat;
Expand Down