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

Update/publish calypso sass #36170

Closed
wants to merge 5 commits into from
Closed

Update/publish calypso sass #36170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e6a4b9d
Move shared SASS
sirreal Sep 16, 2019
a571622
Add package.json
sirreal Sep 16, 2019
70738af
Use package
sirreal Sep 16, 2019
f29e80f
Update deps
sirreal Sep 16, 2019
224d10b
Move the sass prelude
sirreal Sep 16, 2019
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
3 changes: 3 additions & 0 deletions apps/notifications/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,8 @@
"clean": "npx rimraf dist",
"prebuild": "npm run clean",
"build": "calypso-build --config='./webpack.config.js'"
},
"dependencies": {
"@automattic/calypso-sass-prelude": "../../packages/calypso-sass-prelude"
}
}
2 changes: 1 addition & 1 deletion apps/notifications/src/panel/boot/stylesheets/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '../../../../../../client/assets/stylesheets/shared/typography.scss';
@import '~@automattic/calypso-sass-prelude/sass/typography';

// Shared
@import './shared/reset';
Expand Down
4 changes: 2 additions & 2 deletions client/assets/stylesheets/directly.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
//
// QUIT AND RESTART YOUR BROWSER NORMALLY WHEN YOU'RE DONE MAKING LOCAL CSS CHANGES.

@import 'shared/utils';
@import 'shared/forms';
@import '~@automattic/calypso-sass-prelude/sass/utils';
@import '~@automattic/calypso-sass-prelude/sass/forms';

* {
font-family: $sans;
Expand Down
2 changes: 1 addition & 1 deletion client/assets/stylesheets/editor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import 'shared/utils';
@import '~@automattic/calypso-sass-prelude/sass/utils';
@import '~@automattic/calypso-color-schemes/src/calypso-color-schemes';

@import 'components/tinymce/iframe';
Expand Down
7 changes: 0 additions & 7 deletions client/assets/stylesheets/shared/_utils.scss
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions client/assets/stylesheets/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
@import '~@automattic/calypso-color-schemes/src/calypso-color-schemes';

// Shared
@import 'shared/reset'; // css reset before the rest of the styles are defined
@import 'shared/animation'; // all UI animation
@import 'shared/forms'; // form styling
@import '~@automattic/calypso-sass-prelude/sass/reset'; // css reset before the rest of the styles are defined
@import '~@automattic/calypso-sass-prelude/sass/animation'; // all UI animation
@import '~@automattic/calypso-sass-prelude/sass/forms'; // form styling

// Main
@import 'main'; // global layout and responsive styles
Loading