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

Packages: Move Custom CSS Properties to new calypso-css-custom-properties package #30933

Merged
merged 36 commits into from
Mar 6, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
460ecb0
Move assets/stylesheets/shared/ to packages/calypso-shared-style/src/
ockham Feb 21, 2019
8f719da
Move moar stuff
ockham Feb 21, 2019
f8bd083
Fix paths
ockham Feb 21, 2019
dbdd0ed
Add package.json
ockham Feb 21, 2019
008cf02
Fix a path
ockham Feb 21, 2019
c992ba1
Remove now-obsolete prebuild-css script
ockham Feb 21, 2019
50f7f4e
Drop now-obsolete BuildCustomPropertiesCssPlugin
ockham Feb 21, 2019
f8bce81
Add new @automattic/calypso-shared-style dependency
ockham Feb 21, 2019
927ff12
Move stuff back
ockham Feb 21, 2019
98a3a72
Fix paths
ockham Feb 21, 2019
2d81db5
Moar path fixes
ockham Feb 21, 2019
04e78db
Rename to calypso-css-custom-properties
ockham Feb 21, 2019
79d1bc3
shrinkwrap
ockham Feb 21, 2019
ff8b964
Add README
ockham Feb 21, 2019
5017a6d
Small README follow-up
ockham Feb 21, 2019
8d6b823
Remove color-studio dependency
ockham Feb 21, 2019
f236805
Simplify postcss.config.js
ockham Feb 22, 2019
1945341
Nicer external SASS import paths
ockham Feb 25, 2019
2cac29a
Make sure output dir exists
ockham Feb 28, 2019
0b6cf2f
Shut up eslint
ockham Feb 28, 2019
4141963
Add package-lock.json
ockham Feb 28, 2019
ba2d25a
Update README
ockham Feb 28, 2019
1e753c9
Add package eslint
sirreal Mar 1, 2019
6ddaffd
Use standard sass imports by copying required file
sirreal Mar 1, 2019
d501480
Remove package-lock.json
ockham Mar 1, 2019
d1479de
Update deps
sirreal Mar 1, 2019
5e8baa2
Make scripts more consistent and robust
sirreal Mar 1, 2019
afdb29f
Build packages before css
sirreal Mar 1, 2019
04c0c79
Add clean scripts
sirreal Mar 1, 2019
43e0adc
Drop build steps from package readme
sirreal Mar 1, 2019
502b56c
Use npx lerna
sirreal Mar 1, 2019
0ef1c22
Update new package name
sirreal Mar 5, 2019
6df1215
Update README
sirreal Mar 5, 2019
9eb4956
Rename files to calypso-color-schemes
sirreal Mar 5, 2019
79b88b8
update name of the css file in package
blowery Mar 5, 2019
82ec0a7
Update deps
sirreal Mar 6, 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
2 changes: 1 addition & 1 deletion assets/stylesheets/directly.scss
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
// QUIT AND RESTART YOUR BROWSER NORMALLY WHEN YOU'RE DONE MAKING LOCAL CSS CHANGES.

@import 'shared/mixins/mixins';
@import 'shared/colors';
@import '~@automattic/calypso-color-schemes/src/shared/colors';
@import 'shared/extends-forms';
@import 'shared/forms';
@import 'shared/typography';
Expand Down
5 changes: 2 additions & 3 deletions assets/stylesheets/editor.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@

@import 'shared/colors';
@import 'shared/color-schemes';
@import '~@automattic/calypso-color-schemes/src/shared/colors';
@import '~@automattic/calypso-color-schemes/src/shared/color-schemes';
@import 'shared/typography';
@import 'shared/mixins/breakpoints';

Expand Down
3 changes: 1 addition & 2 deletions assets/stylesheets/shared/_utils.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@

@import '../shared/functions'; // functions that we've used from Compass, ported over
@import '../shared/functions/functions'; // sass functions for z-index, etc.
@import '../shared/colors'; // import all of our wpcom colors
@import '~@automattic/calypso-color-schemes/src/shared/colors'; // import all of our wpcom colors
@import '../shared/typography'; // all the typographic rules, variables, etc.
@import '../shared/variables'; // other variables
@import '../shared/mixins/mixins'; // sass mixins for gradients, bordius radii, etc.
Expand Down
3 changes: 1 addition & 2 deletions assets/stylesheets/shared/functions/_functions.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

@import 'hex-to-rgb';
@import '~@automattic/calypso-color-schemes/src/shared/functions/_hex-to-rgb';
@import 'overflow-gradient';
@import 'z-index';
3 changes: 1 addition & 2 deletions assets/stylesheets/style.scss
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@

// External Dependencies
@import 'vendor';

// Shared
@import 'shared/reset'; // css reset before the rest of the styles are defined
@import 'shared/utils'; // utilities that are used by all CSS but don't produce any code
@import 'shared/color-schemes'; // import color schemes
@import '~@automattic/calypso-color-schemes/src/shared/color-schemes'; // import color schemes
@import 'shared/animation'; // all UI animation
@import 'shared/forms'; // form styling
@import 'shared/welcome'; // welcome messages
Expand Down
9 changes: 0 additions & 9 deletions bin/build-custom-properties-css.js

This file was deleted.

Loading