Skip to content

Commit

Permalink
Remove sass tilde imports (#52800)
Browse files Browse the repository at this point in the history
* Remove sass tilde imports

* Fix wp stylesheet import
  • Loading branch information
noahtallen authored May 25, 2021
1 parent 59e77ed commit e3465af
Show file tree
Hide file tree
Showing 117 changed files with 329 additions and 329 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import '~@wordpress/base-styles/mixins';
@import '~@wordpress/base-styles/variables';
@import '~@wordpress/base-styles/breakpoints';
@import '@wordpress/base-styles/mixins';
@import '@wordpress/base-styles/variables';
@import '@wordpress/base-styles/breakpoints';

.interface-pinned-items > button:not( :first-child ) {
@media ( max-width: $break-medium ) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~@automattic/onboarding/styles/mixins';
@import '@automattic/onboarding/styles/mixins';

.nux-launch-menu {
h4 {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
@import '~@wordpress/base-styles/mixins';
@import '~@wordpress/base-styles/variables';
@import '~@wordpress/base-styles/breakpoints';
@import '~@wordpress/base-styles/z-index';
@import '~@automattic/typography/styles/variables';
@import '~@automattic/onboarding/styles/variables';
@import '~@automattic/onboarding/styles/mixins';
@import '@wordpress/base-styles/mixins';
@import '@wordpress/base-styles/variables';
@import '@wordpress/base-styles/breakpoints';
@import '@wordpress/base-styles/z-index';
@import '@automattic/typography/styles/variables';
@import '@automattic/onboarding/styles/variables';
@import '@automattic/onboarding/styles/mixins';

body.has-nux-launch-modal {
overflow: hidden;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import '~@wordpress/base-styles/breakpoints';
@import '~@automattic/onboarding/styles/mixins';
@import '@wordpress/base-styles/breakpoints';
@import '@automattic/onboarding/styles/mixins';

.nux-launch-sidebar {
@include onboarding-block-margin;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@import '~@wordpress/base-styles/variables';
@import '~@wordpress/base-styles/breakpoints';
@import '~@automattic/typography/styles/fonts';
@import '~@automattic/onboarding/styles/mixins';
@import '@wordpress/base-styles/variables';
@import '@wordpress/base-styles/breakpoints';
@import '@automattic/typography/styles/fonts';
@import '@automattic/onboarding/styles/mixins';

.nux-launch-step__header {
@include onboarding-heading-padding;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import '~@automattic/typography/styles/variables';
@import '~@automattic/onboarding/styles/mixins';
@import '@automattic/typography/styles/variables';
@import '@automattic/onboarding/styles/mixins';

// TODO: This is former dark-gray-500 from @wordpress/base-styles.
// Replace with a color from the standard palette.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~@automattic/onboarding/styles/variables';
@import '@automattic/onboarding/styles/variables';

.nux-launch-step__input {
position: relative;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import '~@automattic/onboarding/styles/mixins';
@import '~@automattic/plans-grid/src/variables';
@import '@automattic/onboarding/styles/mixins';
@import '@automattic/plans-grid/src/variables';

.nux-launch-modal.step-plan {
// Remove extraneous whitespace after plans details.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~@automattic/page-pattern-modal/src/styles/page-pattern-modal';
@import '@automattic/page-pattern-modal/src/styles/page-pattern-modal';

.sidebar-modal-opener {
display: flex;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~@wordpress/base-styles/colors';
@import '@wordpress/base-styles/colors';

// TODO: This is former light-gray-900 from @wordpress/base-styles.
// Replace with a color from the standard palette.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import '~@wordpress/base-styles/colors';
@import '~@wordpress/base-styles/variables';
@import '@wordpress/base-styles/colors';
@import '@wordpress/base-styles/variables';

// TODO: These colors used to be in @wordpress/base-styles.
// Replace them with colors from the updated standard palette.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@import '~@wordpress/base-styles/colors';
@import '~@wordpress/base-styles/mixins';
@import '~@wordpress/base-styles/variables';
@import '~@wordpress/base-styles/z-index';
@import '@wordpress/base-styles/colors';
@import '@wordpress/base-styles/mixins';
@import '@wordpress/base-styles/variables';
@import '@wordpress/base-styles/z-index';

$sidebar-width: 272px;
$sidebar-transition-period: 100ms;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import '~@wordpress/base-styles/variables';
@import '~@wordpress/base-styles/mixins';
@import '@wordpress/base-styles/variables';
@import '@wordpress/base-styles/mixins';
@import '../nav-sidebar/style.scss';

.wpcom-block-editor-nav-sidebar-toggle-sidebar-button__button {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// @TODO: remove the ignore rule and replace font sizes accordingly
/* stylelint-disable scales/font-size */

@import '~@automattic/typography/styles/fonts';
@import '~@automattic/onboarding/styles/mixins';
@import '@automattic/typography/styles/fonts';
@import '@automattic/onboarding/styles/mixins';

$wpcom-modal-breakpoint: 660px;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@import '~@wordpress/base-styles/colors';
@import '~@wordpress/base-styles/mixins';
@import '~@wordpress/base-styles/variables';
@import '~@wordpress/base-styles/z-index';
@import '@wordpress/base-styles/colors';
@import '@wordpress/base-styles/mixins';
@import '@wordpress/base-styles/variables';
@import '@wordpress/base-styles/z-index';

$welcome-tour-button-background-color: #32373c; // former $dark-gray-700. TODO: replace with standard color

Expand Down
2 changes: 1 addition & 1 deletion apps/o2-blocks/src/todo/editor.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~@wordpress/base-styles/colors';
@import '@wordpress/base-styles/colors';

$color-accent-green: #31843f;
$color-move-button-icon: #555d66; // dark-gray-500
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~@wordpress/base-styles/variables';
@import '@wordpress/base-styles/variables';

@media ( max-width: 600px ) {
// stylelint-disable-next-line selector-max-id
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~@automattic/typography/styles/fonts';
@import '@automattic/typography/styles/fonts';

.use-classic-block-guide__heading {
font-family: $brand-serif;
Expand Down
12 changes: 6 additions & 6 deletions client/assets/stylesheets/gutenberg-base-styles.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import '~@wordpress/base-styles/z-index';
@import '~@wordpress/base-styles/colors';
@import '~@wordpress/base-styles/variables';
@import '~@wordpress/base-styles/breakpoints';
@import '~@wordpress/base-styles/mixins';
@import '~@wordpress/base-styles/animations';
@import '@wordpress/base-styles/z-index';
@import '@wordpress/base-styles/colors';
@import '@wordpress/base-styles/variables';
@import '@wordpress/base-styles/breakpoints';
@import '@wordpress/base-styles/mixins';
@import '@wordpress/base-styles/animations';
2 changes: 1 addition & 1 deletion client/assets/stylesheets/gutenboarding.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Color Schemes
// Currently used only by Calypso dev badge shown in development mode
@import '~@automattic/calypso-color-schemes/src/calypso-color-schemes';
@import '@automattic/calypso-color-schemes/src/calypso-color-schemes';

// Shared
@import 'shared/reset'; // css reset before the rest of the styles are defined
Expand Down
4 changes: 2 additions & 2 deletions client/assets/stylesheets/shared/_typography.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import '~@automattic/typography/styles/fonts';
@import '~@automattic/typography/styles/variables';
@import '@automattic/typography/styles/fonts';
@import '@automattic/typography/styles/variables';
@import './mixins/breakpoints';

$signup-sans: 'Noto Sans', $sans;
Expand Down
4 changes: 2 additions & 2 deletions client/assets/stylesheets/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
@import 'vendor';

// Color Schemes
@import '~@automattic/calypso-color-schemes/src/calypso-color-schemes';
@import '@automattic/calypso-color-schemes/src/calypso-color-schemes';

// Shared
@import 'shared/reset'; // css reset before the rest of the styles are defined
Expand All @@ -19,7 +19,7 @@
@import './_nav-unification';

// @wordpress/components stylesheet
@import '~@wordpress/components/build-style/style.css';
@import '@wordpress/components/build-style/style';

// Overrides for @wordpress/components
@import './_wp-components-overrides.scss';
6 changes: 3 additions & 3 deletions client/blocks/editor-checkout-modal/style.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import '~@automattic/typography/styles/variables';
@import '~@wordpress/base-styles/breakpoints';
@import '~@wordpress/base-styles/mixins';
@import '@automattic/typography/styles/variables';
@import '@wordpress/base-styles/breakpoints';
@import '@wordpress/base-styles/mixins';

.editor-checkout-modal {
z-index: z-index( 'root', '.main.calypsoify.is-iframe' );
Expand Down
4 changes: 2 additions & 2 deletions client/blocks/login/style.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import '~@wordpress/base-styles/breakpoints';
@import '~@wordpress/base-styles/mixins';
@import '@wordpress/base-styles/breakpoints';
@import '@wordpress/base-styles/mixins';

.layout:not( .is-jetpack-woocommerce-flow ):not( .is-jetpack-woo-dna-flow ):not( .is-wccom-oauth-flow ) {
.login.is-jetpack {
Expand Down
6 changes: 3 additions & 3 deletions client/blocks/nav-unification-modal/style.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// @TODO: remove the ignore rule and replace font sizes accordingly
/* stylelint-disable scales/font-size */

@import '~@automattic/typography/styles/fonts';
@import '~@automattic/onboarding/styles/mixins';
@import '~@wordpress/base-styles/breakpoints';
@import '@automattic/typography/styles/fonts';
@import '@automattic/onboarding/styles/mixins';
@import '@wordpress/base-styles/breakpoints';

$modal-breakpoint: 600px;
$modal-padding-v: 40px;
Expand Down
4 changes: 2 additions & 2 deletions client/blocks/signup-form/style.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import 'woocommerce/components/text-control/style.scss';
@import '~@wordpress/base-styles/breakpoints';
@import '~@wordpress/base-styles/mixins';
@import '@wordpress/base-styles/breakpoints';
@import '@wordpress/base-styles/mixins';

.signup-form .signup-form__input.form-text-input {
margin-bottom: 20px;
Expand Down
4 changes: 2 additions & 2 deletions client/components/domains/domain-search-results/style.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import '~@wordpress/base-styles/breakpoints';
@import '~@wordpress/base-styles/mixins';
@import '@wordpress/base-styles/breakpoints';
@import '@wordpress/base-styles/mixins';

.domain-search-results__transfer-card {
display: flex;
Expand Down
4 changes: 2 additions & 2 deletions client/components/domains/domain-suggestion/style.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import '~@wordpress/base-styles/breakpoints';
@import '~@wordpress/base-styles/mixins';
@import '@wordpress/base-styles/breakpoints';
@import '@wordpress/base-styles/mixins';

.domain-suggestion {
&.is-clickable {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import '~@wordpress/base-styles/breakpoints';
@import '~@wordpress/base-styles/mixins';
@import '@wordpress/base-styles/breakpoints';
@import '@wordpress/base-styles/mixins';

.featured-domain-suggestions {
display: flex;
Expand Down
4 changes: 2 additions & 2 deletions client/components/domains/free-domain-explainer/style.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import '~@wordpress/base-styles/breakpoints';
@import '~@wordpress/base-styles/mixins';
@import '@wordpress/base-styles/breakpoints';
@import '@wordpress/base-styles/mixins';

.free-domain-explainer {
.banner__description {
Expand Down
4 changes: 2 additions & 2 deletions client/components/domains/register-domain-step/style.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import '~@wordpress/base-styles/breakpoints';
@import '~@wordpress/base-styles/mixins';
@import '@wordpress/base-styles/breakpoints';
@import '@wordpress/base-styles/mixins';

.register-domain-step__search {
padding-bottom: 12px;
Expand Down
4 changes: 2 additions & 2 deletions client/components/domains/reskin-side-explainer/style.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import '~@wordpress/base-styles/breakpoints';
@import '~@wordpress/base-styles/mixins';
@import '@wordpress/base-styles/breakpoints';
@import '@wordpress/base-styles/mixins';

.reskin-side-explainer {
width: 100%;
Expand Down
4 changes: 2 additions & 2 deletions client/components/domains/search-filters/style.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import '~@wordpress/base-styles/breakpoints';
@import '~@wordpress/base-styles/mixins';
@import '@wordpress/base-styles/breakpoints';
@import '@wordpress/base-styles/mixins';

.search-filters__dropdown-filters {
align-items: center;
Expand Down
4 changes: 2 additions & 2 deletions client/components/foldable-faq/style.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import '~@wordpress/base-styles/breakpoints';
@import '~@wordpress/base-styles/mixins';
@import '@wordpress/base-styles/breakpoints';
@import '@wordpress/base-styles/mixins';

.foldable-faq {
padding: 0 15px;
Expand Down
4 changes: 2 additions & 2 deletions client/components/jetpack/backup-card/style.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import '~@wordpress/base-styles/breakpoints';
@import '~@wordpress/base-styles/mixins';
@import '@wordpress/base-styles/breakpoints';
@import '@wordpress/base-styles/mixins';

/* Header */

Expand Down
4 changes: 2 additions & 2 deletions client/components/jetpack/card/jetpack-free-card/style.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import '~@wordpress/base-styles/breakpoints';
@import '~@wordpress/base-styles/mixins';
@import '@wordpress/base-styles/breakpoints';
@import '@wordpress/base-styles/mixins';

.jetpack-free-card {
padding: 24px 32px;
Expand Down
4 changes: 2 additions & 2 deletions client/components/promo-section/promo-card/style.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import '~@wordpress/base-styles/breakpoints';
@import '~@wordpress/base-styles/mixins';
@import '@wordpress/base-styles/breakpoints';
@import '@wordpress/base-styles/mixins';

.promo-card {
display: flex;
Expand Down
4 changes: 2 additions & 2 deletions client/components/web-preview/style.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import '~@wordpress/base-styles/breakpoints';
@import '~@wordpress/base-styles/mixins';
@import '@wordpress/base-styles/breakpoints';
@import '@wordpress/base-styles/mixins';

.web-preview {
position: fixed;
Expand Down
2 changes: 1 addition & 1 deletion client/gutenberg/editor/style.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~@wordpress/edit-post/build-style/style';
@import '@wordpress/edit-post/build-style/style';

.is-group-gutenberg.layout {
background-color: var( --color-surface );
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import '~@wordpress/base-styles/_breakpoints.scss';
@import '~@wordpress/base-styles/_mixins.scss';
@import '@wordpress/base-styles/_breakpoints.scss';
@import '@wordpress/base-styles/_mixins.scss';

.billing-details {
&__row {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import '~@wordpress/base-styles/_breakpoints.scss';
@import '~@wordpress/base-styles/_mixins.scss';
@import '@wordpress/base-styles/_breakpoints.scss';
@import '@wordpress/base-styles/_mixins.scss';

.billing-summary {
display: flex;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~@wordpress/base-styles/_mixins.scss';
@import '@wordpress/base-styles/_mixins.scss';

.issue-license-form {
p {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import '~@wordpress/base-styles/_breakpoints.scss';
@import '~@wordpress/base-styles/_mixins.scss';
@import '@wordpress/base-styles/_breakpoints.scss';
@import '@wordpress/base-styles/_mixins.scss';

.license-details {
margin: 0;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import '~@wordpress/base-styles/_breakpoints.scss';
@import '~@wordpress/base-styles/_mixins.scss';
@import '@wordpress/base-styles/_breakpoints.scss';
@import '@wordpress/base-styles/_mixins.scss';

$column-domain: 1;
$column-actions: 4;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import '~@wordpress/base-styles/_breakpoints.scss';
@import '~@wordpress/base-styles/_mixins.scss';
@import '@wordpress/base-styles/_breakpoints.scss';
@import '@wordpress/base-styles/_mixins.scss';

.license-list {
&__header {
Expand Down
Loading

0 comments on commit e3465af

Please sign in to comment.