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

Jump to bottom

Tidy/simplify SCSS imports #6073

Merged
merged 6 commits into from
Aug 28, 2018
Merged

Tidy/simplify SCSS imports #6073

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5a03bce
Simplify SCSS import for "amo"
willdurand Aug 27, 2018
e9c7760
Simplify SCSS import for "disco"
willdurand Aug 27, 2018
a1796ef
Simplify SCSS import for "ui"
willdurand Aug 27, 2018
461f133
Fix lib import
willdurand Aug 27, 2018
6744e62
add styles.scss for core
willdurand Aug 28, 2018
805655f
fix sass deprecation
willdurand Aug 28, 2018
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: 1 addition & 3 deletions src/amo/components/Addon/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
@import '~core/css/inc/mixins';
@import '~amo/css/inc/vars';
@import '~ui/css/vars';
@import '~amo/css/styles';

.Addon {
@include page-padding();
Expand Down
4 changes: 1 addition & 3 deletions src/amo/components/AddonBadges/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
@import '~core/css/inc/mixins';
@import '~amo/css/inc/vars';
@import '~ui/css/vars';
@import '~amo/css/styles';

.AddonBadges {
width: 100%;
Expand Down
2 changes: 1 addition & 1 deletion src/amo/components/AddonCompatibilityError/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~core/css/inc/mixins';
@import '~amo/css/styles';

.AddonCompatibilityError {
margin-top: 12px;
Expand Down
4 changes: 1 addition & 3 deletions src/amo/components/AddonMeta/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
@import '~core/css/inc/mixins';
@import '~amo/css/inc/vars';
@import '~ui/css/vars';
@import '~amo/css/styles';

.AddonMeta-item {
display: flex;
Expand Down
4 changes: 1 addition & 3 deletions src/amo/components/AddonRecommendations/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
@import '~core/css/inc/mixins';
@import '~amo/css/inc/vars';
@import '~ui/css/vars';
@import '~amo/css/styles';

.AddonRecommendations {
// stylelint-disable max-nesting-depth
Expand Down
3 changes: 1 addition & 2 deletions src/amo/components/AddonReview/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@import '~amo/css/inc/vars';
@import '~core/css/inc/mixins';
@import '~amo/css/styles';

.Overlay-contents .AddonReview-overlay {
.Card-contents {
Expand Down
7 changes: 2 additions & 5 deletions src/amo/components/AddonReviewList/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
@import '~photon-colors/photon-colors';
@import '~core/css/inc/mixins';
@import '~amo/css/inc/vars';
@import '~ui/css/vars';
@import '~amo/css/styles';

.AddonReviewList {
@include page-padding();
Expand All @@ -19,7 +16,7 @@
}

.CardList {
margin: 0 0 $vertical-space-xs;
margin: 0 0 8px;
// https://stackoverflow.com/questions/36150458
min-width: 50%;
}
Expand Down
5 changes: 1 addition & 4 deletions src/amo/components/AddonReviewListItem/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
@import '~photon-colors/photon-colors';
@import '~core/css/inc/vars';
@import '~core/css/inc/mixins';
@import '~amo/css/inc/vars';
@import '~amo/css/styles';

.AddonReviewListItem {
.Rating {
Expand Down
4 changes: 1 addition & 3 deletions src/amo/components/AddonsByAuthorsCard/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
@import '~core/css/inc/mixins';
@import '~amo/css/inc/vars';
@import '~ui/css/vars';
@import '~amo/css/styles';

.AddonsByAuthorsCard {
margin-top: 0;
Expand Down
4 changes: 1 addition & 3 deletions src/amo/components/AddonsCard/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
@import '~amo/css/inc/vars';
@import '~core/css/inc/mixins';
@import '~ui/css/vars';
@import '~amo/css/styles';

.AddonsCard--horizontal {
@include respond-to(large) {
Expand Down
8 changes: 2 additions & 6 deletions src/amo/components/App/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
@import '~normalize.css';
@import '~photon-colors/photon-colors';
@import '~core/css/inc/vars';
@import '~normalize';
@import '~core/css/inc/lib';
@import '~core/css/inc/mixins';
@import '~amo/css/inc/vars';
@import '~ui/css/vars';
@import '~amo/css/styles';

html,
body {
Expand Down
4 changes: 1 addition & 3 deletions src/amo/components/AutoSearchInput/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
@import '~core/css/inc/mixins';
@import '~amo/css/inc/vars';
@import '~ui/css/vars';
@import '~amo/css/styles';

.AutoSearchInput-search-box {
position: relative;
Expand Down
4 changes: 1 addition & 3 deletions src/amo/components/Categories/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
@import '~amo/css/inc/vars';
@import '~core/css/inc/mixins';
@import '~ui/css/vars';
@import '~amo/css/styles';

.Categories .Card-contents {
@include respond-to(large) {
Expand Down
3 changes: 1 addition & 2 deletions src/amo/components/CategoriesPage/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@import '~amo/css/inc/vars';
@import '~core/css/inc/mixins';
@import '~amo/css/styles';

.CategoriesPage {
@include page-padding();
Expand Down
3 changes: 1 addition & 2 deletions src/amo/components/Category/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@import '~amo/css/inc/vars';
@import '~core/css/inc/mixins';
@import '~amo/css/styles';

.Category {
@include page-padding();
Expand Down
4 changes: 1 addition & 3 deletions src/amo/components/CategoryHeader/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
@import '~amo/css/inc/vars';
@import '~core/css/inc/mixins';
@import '~ui/css/vars';
@import '~amo/css/styles';

.CategoryHeader {
border-radius: $border-radius-default;
Expand Down
4 changes: 1 addition & 3 deletions src/amo/components/CategoryIcon/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
@import '~core/css/inc/mixins';
@import '~amo/css/inc/vars';
@import '~ui/css/vars';
@import '~amo/css/styles';

$default-icon-size: 64px;

Expand Down
5 changes: 1 addition & 4 deletions src/amo/components/Collection/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
@import '~amo/css/inc/vars';
@import '~core/css/inc/mixins';
@import '~photon-colors/photon-colors';
@import '~ui/css/vars';
@import '~amo/css/styles';

.Collection {
@include page-padding();
Expand Down
4 changes: 1 addition & 3 deletions src/amo/components/CollectionAddAddon/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
@import '~photon-colors/photon-colors';
@import '~amo/css/inc/vars';
@import '~core/css/inc/mixins';
@import '~amo/css/styles';

.CollectionAddAddon {
margin: $padding-page 0;
Expand Down
2 changes: 1 addition & 1 deletion src/amo/components/CollectionControls/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~core/css/inc/mixins';
@import '~amo/css/styles';

.CollectionControls {
margin-top: $padding-page;
Expand Down
4 changes: 1 addition & 3 deletions src/amo/components/CollectionDetails/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
@import '~amo/css/inc/vars';
@import '~core/css/inc/mixins';
@import '~ui/css/vars';
@import '~amo/css/styles';

.CollectionDetails {
.MetadataCard {
Expand Down
4 changes: 1 addition & 3 deletions src/amo/components/CollectionList/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
@import '~core/css/inc/mixins';
@import '~photon-colors/photon-colors';
@import '~ui/css/vars';
@import '~amo/css/styles';

.CollectionList {
@include page-padding();
Expand Down
5 changes: 1 addition & 4 deletions src/amo/components/CollectionManager/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
@import '~photon-colors/photon-colors';
@import '~core/css/inc/mixins';
@import '~core/css/inc/vars.scss';
@import '~amo/css/inc/vars';
@import '~amo/css/styles';

.CollectionManager {
label {
Expand Down
2 changes: 1 addition & 1 deletion src/amo/components/CollectionSort/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~photon-colors/photon-colors';
@import '~amo/css/styles';

.CollectionSort-label {
color: $grey-50;
Expand Down
6 changes: 1 addition & 5 deletions src/amo/components/EditableCollectionAddon/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
@import '~photon-colors/photon-colors';
@import '~amo/css/inc/vars';
@import '~core/css/inc/mixins';
@import '~core/css/inc/vars';
@import '~ui/css/vars';
@import '~amo/css/styles';

$icon-size: 32px;

Expand Down
4 changes: 1 addition & 3 deletions src/amo/components/ErrorPage/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
@import '~core/css/inc/vars';
@import '~core/css/inc/mixins';
@import '~amo/css/inc/vars';
@import '~amo/css/styles';

.ErrorPage {
@include page-padding();
Expand Down
4 changes: 1 addition & 3 deletions src/amo/components/Footer/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
@import '~core/css/inc/mixins';
@import '~amo/css/inc/vars';
@import '~ui/css/vars';
@import '~amo/css/styles';

.Footer {
@include font-opensans-regular();
Expand Down
6 changes: 1 addition & 5 deletions src/amo/components/Header/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
@import '~photon-colors/photon-colors';

@import '~core/css/inc/mixins';
@import '~amo/css/inc/vars';
@import '~ui/css/vars';
@import '~amo/css/styles';

.Header {
background: $ink-90;
Expand Down
6 changes: 1 addition & 5 deletions src/amo/components/Home/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
@import '~amo/css/inc/vars';
@import '~core/css/inc/mixins';
@import '~core/css/inc/vars';
@import '~photon-colors/photon-colors';
@import '~ui/css/vars';
@import '~amo/css/styles';

.Home {
@include page-padding();
Expand Down
2 changes: 1 addition & 1 deletion src/amo/components/HomeHeroBanner/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~core/css/inc/vars';
@import '~amo/css/styles';

/* stylelint-disable indentation */
$colors-first-item: ('violet', #7950f2, #6741d9) ('grape', #be4bdb, #ae3ec9);
Expand Down
4 changes: 1 addition & 3 deletions src/amo/components/LandingPage/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
@import '~amo/css/inc/vars';
@import '~core/css/inc/mixins';
@import '~ui/css/vars';
@import '~amo/css/styles';

.LandingPage {
@include page-padding();
Expand Down
4 changes: 1 addition & 3 deletions src/amo/components/LanguageTools/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
@import '~photon-colors/photon-colors';
@import '~core/css/inc/mixins';
@import '~ui/css/vars';
@import '~amo/css/styles';

$cell-padding: 6px;

Expand Down
3 changes: 1 addition & 2 deletions src/amo/components/PermissionsCard/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@import '~core/css/inc/mixins';
@import '~photon-colors/photon-colors';
@import '~amo/css/styles';

.PermissionCard-learn-more {
margin: 16px auto 0;
Expand Down
2 changes: 1 addition & 1 deletion src/amo/components/RatingManager/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~core/css/inc/mixins';
@import '~amo/css/styles';

.RatingManager-ratingControl {
align-items: center;
Expand Down
4 changes: 1 addition & 3 deletions src/amo/components/RatingsByStar/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
@import '~photon-colors/photon-colors';
@import '~core/css/inc/vars';
@import '~core/css/inc/mixins';
@import '~amo/css/styles';

.RatingsByStar-graph {
color: $grey-50;
Expand Down
2 changes: 1 addition & 1 deletion src/amo/components/ReportAbuseButton/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~ui/css/vars';
@import '~amo/css/styles';

.ReportAbuseButton {
margin: 12px auto 0;
Expand Down
3 changes: 1 addition & 2 deletions src/amo/components/ScreenShots/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@import '~core/css/inc/mixins';
@import '~amo/css/inc/vars';
@import '~amo/css/styles';

// image-height has to be 20px smaller to prevent screenshot overflow.
// See: https://github.com/mozilla/addons-frontend/issues/4887
Expand Down
3 changes: 1 addition & 2 deletions src/amo/components/Search/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@import '~amo/css/inc/vars';
@import '~core/css/inc/mixins';
@import '~amo/css/styles';

.Search {
@include respond-to(large) {
Expand Down
2 changes: 1 addition & 1 deletion src/amo/components/SearchContextCard/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~ui/css/vars';
@import '~amo/css/styles';

.SearchContextCard-header {
font-size: $font-size-l;
Expand Down
5 changes: 1 addition & 4 deletions src/amo/components/SearchFilters/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
@import '~photon-colors/photon-colors';

@import '~core/css/inc/mixins';
@import '~ui/css/vars';
@import '~amo/css/styles';

.SearchFilters-label {
color: $grey-50;
Expand Down
2 changes: 1 addition & 1 deletion src/amo/components/SearchSuggestion/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~core/css/inc/mixins';
@import '~amo/css/styles';

.SearchSuggestion {
display: flex;
Expand Down
4 changes: 1 addition & 3 deletions src/amo/components/SectionLinks/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
@import '~core/css/inc/mixins';
@import '~amo/css/inc/vars';
@import '~ui/css/vars';
@import '~amo/css/styles';

.SectionLinks {
display: flex;
Expand Down
5 changes: 1 addition & 4 deletions src/amo/components/StaticPages/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
@import '~core/css/inc/vars';
@import '~core/css/inc/mixins';
@import '~amo/css/inc/vars';
@import '~photon-colors/photon-colors';
@import '~amo/css/styles';

.StaticPage {
@include page-padding();
Expand Down
5 changes: 1 addition & 4 deletions src/amo/components/UserProfile/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
@import '~core/css/inc/vars';
@import '~amo/css/inc/vars';
@import '~core/css/inc/mixins';
@import '~ui/css/vars';
@import '~amo/css/styles';

$avatar-size: 64px;

Expand Down
4 changes: 1 addition & 3 deletions src/amo/components/UserProfileEdit/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
@import '~amo/css/inc/vars';
@import '~core/css/inc/mixins';
@import '~ui/css/vars';
@import '~amo/css/styles';

$font-size-aside: 10px;

Expand Down
6 changes: 1 addition & 5 deletions src/amo/components/UserProfileEditNotifications/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
@import '~photon-colors/photon-colors';

@import '~amo/css/inc/vars';
@import '~core/css/inc/mixins';
@import '~ui/css/vars';
@import '~amo/css/styles';

$input-height: 16px;

Expand Down
4 changes: 1 addition & 3 deletions src/amo/components/UserProfileEditPicture/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
@import '~amo/css/inc/vars';
@import '~core/css/inc/mixins';
@import '~ui/css/vars';
@import '~amo/css/styles';

$picture-size: 128px;

Expand Down
Loading