Simplify SCSS import for "amo"

mozilla · Aug 27, 2018 · 54372f2 · 54372f2
1 parent 00b3a7b
commit 54372f2
Show file tree

Hide file tree

Showing 78 changed files with 90 additions and 229 deletions.
diff --git a/src/amo/components/Addon/styles.scss b/src/amo/components/Addon/styles.scss
@@ -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();

diff --git a/src/amo/components/AddonBadges/styles.scss b/src/amo/components/AddonBadges/styles.scss
@@ -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%;

diff --git a/src/amo/components/AddonCompatibilityError/style.scss b/src/amo/components/AddonCompatibilityError/style.scss
@@ -1,4 +1,4 @@
-@import '~core/css/inc/mixins';
+@import '~amo/css/styles';
 
 .AddonCompatibilityError {
   margin-top: 12px;

diff --git a/src/amo/components/AddonMeta/styles.scss b/src/amo/components/AddonMeta/styles.scss
@@ -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;

diff --git a/src/amo/components/AddonRecommendations/styles.scss b/src/amo/components/AddonRecommendations/styles.scss
@@ -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

diff --git a/src/amo/components/AddonReview/styles.scss b/src/amo/components/AddonReview/styles.scss
@@ -1,5 +1,4 @@
-@import '~amo/css/inc/vars';
-@import '~core/css/inc/mixins';
+@import '~amo/css/styles';
 
 .Overlay-contents .AddonReview-overlay {
   .Card-contents {

diff --git a/src/amo/components/AddonReviewList/styles.scss b/src/amo/components/AddonReviewList/styles.scss
@@ -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();
@@ -19,7 +16,7 @@
   }
 
   .CardList {
-    margin: 0 0 $vertical-space-xs;
+    margin: 0 0 8px;
     // https://stackoverflow.com/questions/36150458
     min-width: 50%;
   }

diff --git a/src/amo/components/AddonReviewListItem/styles.scss b/src/amo/components/AddonReviewListItem/styles.scss
@@ -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 {

diff --git a/src/amo/components/AddonsByAuthorsCard/styles.scss b/src/amo/components/AddonsByAuthorsCard/styles.scss
@@ -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;

diff --git a/src/amo/components/AddonsCard/styles.scss b/src/amo/components/AddonsCard/styles.scss
@@ -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) {

diff --git a/src/amo/components/App/styles.scss b/src/amo/components/App/styles.scss
@@ -1,10 +1,5 @@
 @import '~normalize.css';
-@import '~photon-colors/photon-colors';
-@import '~core/css/inc/vars';
-@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 {

diff --git a/src/amo/components/AutoSearchInput/styles.scss b/src/amo/components/AutoSearchInput/styles.scss
@@ -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;

diff --git a/src/amo/components/Categories/styles.scss b/src/amo/components/Categories/styles.scss
@@ -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) {

diff --git a/src/amo/components/CategoriesPage/styles.scss b/src/amo/components/CategoriesPage/styles.scss
@@ -1,5 +1,4 @@
-@import '~amo/css/inc/vars';
-@import '~core/css/inc/mixins';
+@import '~amo/css/styles';
 
 .CategoriesPage {
   @include page-padding();

diff --git a/src/amo/components/Category/styles.scss b/src/amo/components/Category/styles.scss
@@ -1,5 +1,4 @@
-@import '~amo/css/inc/vars';
-@import '~core/css/inc/mixins';
+@import '~amo/css/styles';
 
 .Category {
   @include page-padding();

diff --git a/src/amo/components/CategoryHeader/styles.scss b/src/amo/components/CategoryHeader/styles.scss
@@ -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;

diff --git a/src/amo/components/CategoryIcon/styles.scss b/src/amo/components/CategoryIcon/styles.scss
@@ -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;
 

diff --git a/src/amo/components/Collection/styles.scss b/src/amo/components/Collection/styles.scss
@@ -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();

diff --git a/src/amo/components/CollectionAddAddon/styles.scss b/src/amo/components/CollectionAddAddon/styles.scss
@@ -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;

diff --git a/src/amo/components/CollectionControls/styles.scss b/src/amo/components/CollectionControls/styles.scss
@@ -1,4 +1,4 @@
-@import '~core/css/inc/mixins';
+@import '~amo/css/styles';
 
 .CollectionControls {
   margin-top: $padding-page;

diff --git a/src/amo/components/CollectionDetails/styles.scss b/src/amo/components/CollectionDetails/styles.scss
@@ -1,6 +1,4 @@
-@import '~amo/css/inc/vars';
-@import '~core/css/inc/mixins';
-@import '~ui/css/vars';
+@import '~amo/css/styles';
 
 .CollectionDetails {
   .MetadataCard {

diff --git a/src/amo/components/CollectionList/styles.scss b/src/amo/components/CollectionList/styles.scss
@@ -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();

diff --git a/src/amo/components/CollectionManager/styles.scss b/src/amo/components/CollectionManager/styles.scss
@@ -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 {

diff --git a/src/amo/components/CollectionSort/styles.scss b/src/amo/components/CollectionSort/styles.scss
@@ -1,4 +1,4 @@
-@import '~photon-colors/photon-colors';
+@import '~amo/css/styles';
 
 .CollectionSort-label {
   color: $grey-50;

diff --git a/src/amo/components/EditableCollectionAddon/styles.scss b/src/amo/components/EditableCollectionAddon/styles.scss
@@ -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;
 

diff --git a/src/amo/components/ErrorPage/styles.scss b/src/amo/components/ErrorPage/styles.scss
@@ -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();

diff --git a/src/amo/components/Footer/styles.scss b/src/amo/components/Footer/styles.scss
@@ -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();

diff --git a/src/amo/components/Header/styles.scss b/src/amo/components/Header/styles.scss
@@ -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;

diff --git a/src/amo/components/Home/styles.scss b/src/amo/components/Home/styles.scss
@@ -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();

diff --git a/src/amo/components/HomeHeroBanner/styles.scss b/src/amo/components/HomeHeroBanner/styles.scss
@@ -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);

diff --git a/src/amo/components/LandingPage/styles.scss b/src/amo/components/LandingPage/styles.scss
@@ -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();

diff --git a/src/amo/components/LanguageTools/styles.scss b/src/amo/components/LanguageTools/styles.scss
@@ -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;
 

diff --git a/src/amo/components/PermissionsCard/styles.scss b/src/amo/components/PermissionsCard/styles.scss
@@ -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;

diff --git a/src/amo/components/RatingManager/styles.scss b/src/amo/components/RatingManager/styles.scss
@@ -1,4 +1,4 @@
-@import '~core/css/inc/mixins';
+@import '~amo/css/styles';
 
 .RatingManager-ratingControl {
   align-items: center;

diff --git a/src/amo/components/RatingsByStar/styles.scss b/src/amo/components/RatingsByStar/styles.scss
@@ -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;

diff --git a/src/amo/components/ReportAbuseButton/styles.scss b/src/amo/components/ReportAbuseButton/styles.scss
@@ -1,4 +1,4 @@
-@import '~ui/css/vars';
+@import '~amo/css/styles';
 
 .ReportAbuseButton {
   margin: 12px auto 0;

diff --git a/src/amo/components/ScreenShots/styles.scss b/src/amo/components/ScreenShots/styles.scss
@@ -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

diff --git a/src/amo/components/Search/styles.scss b/src/amo/components/Search/styles.scss
@@ -1,5 +1,4 @@
-@import '~amo/css/inc/vars';
-@import '~core/css/inc/mixins';
+@import '~amo/css/styles';
 
 .Search {
   @include respond-to(large) {

diff --git a/src/amo/components/SearchContextCard/styles.scss b/src/amo/components/SearchContextCard/styles.scss
@@ -1,4 +1,4 @@
-@import '~ui/css/vars';
+@import '~amo/css/styles';
 
 .SearchContextCard-header {
   font-size: $font-size-l;

diff --git a/src/amo/components/SearchFilters/styles.scss b/src/amo/components/SearchFilters/styles.scss
@@ -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;

diff --git a/src/amo/components/SearchSuggestion/styles.scss b/src/amo/components/SearchSuggestion/styles.scss
@@ -1,4 +1,4 @@
-@import '~core/css/inc/mixins';
+@import '~amo/css/styles';
 
 .SearchSuggestion {
   display: flex;

diff --git a/src/amo/components/SectionLinks/styles.scss b/src/amo/components/SectionLinks/styles.scss
@@ -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;

diff --git a/src/amo/components/StaticPages/styles.scss b/src/amo/components/StaticPages/styles.scss
@@ -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();

diff --git a/src/amo/components/UserProfile/styles.scss b/src/amo/components/UserProfile/styles.scss
@@ -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;
 

diff --git a/src/amo/components/UserProfileEdit/styles.scss b/src/amo/components/UserProfileEdit/styles.scss
@@ -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;
 

diff --git a/src/amo/components/UserProfileEditNotifications/styles.scss b/src/amo/components/UserProfileEditNotifications/styles.scss
@@ -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;
 

diff --git a/src/amo/components/UserProfileEditPicture/styles.scss b/src/amo/components/UserProfileEditPicture/styles.scss
@@ -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;