Skip to content
Permalink
Browse files

prettier for css/scss (#2807)

* prettier for css/scss
  • Loading branch information...
Pomax committed Mar 14, 2019
1 parent 52dfefd commit 9e6e52de440c4631099ef687ecf296934c81473b
Showing with 261 additions and 180 deletions.
  1. +2 −4 .stylelintrc
  2. +4 −4 network-api/networkapi/wagtail_l10n_customization/static/css/language_toggles.css
  3. +25 −24 network-api/networkapi/wagtailcustomization/static/wagtailadmin/css/layouts/404-additionals.css
  4. +41 −14 package-lock.json
  5. +2 −0 package.json
  6. +3 −1 source/js/buyers-guide/components/creep-vote/creep-vote.scss
  7. +3 −2 source/js/buyers-guide/components/creepometer/creepometer.scss
  8. +6 −5 source/js/buyers-guide/components/filter/filter.scss
  9. +1 −1 source/js/buyers-guide/components/likelyhood-chart/likelyhood-chart.scss
  10. +1 −1 source/js/buyers-guide/components/social-share/social-share.scss
  11. +8 −3 source/js/components/join/join.scss
  12. +2 −2 source/js/components/multipage-nav-mobile/multipage-nav-mobile.scss
  13. +5 −5 source/js/components/people/people.scss
  14. +1 −1 source/js/components/petition/petition.scss
  15. +2 −2 source/js/donate-modal/donate-modal.scss
  16. +1 −1 source/sass/buttons.scss
  17. +31 −30 source/sass/buyers-guide/bg-main.scss
  18. +2 −1 source/sass/buyers-guide/components/header.scss
  19. +2 −2 source/sass/buyers-guide/includes/draft-product.scss
  20. +16 −2 source/sass/buyers-guide/mixins.scss
  21. +2 −2 source/sass/buyers-guide/views/about.scss
  22. +8 −1 source/sass/buyers-guide/views/category.scss
  23. +8 −2 source/sass/buyers-guide/views/homepage.scss
  24. +4 −3 source/sass/buyers-guide/views/product.scss
  25. +4 −4 source/sass/components/multipage-nav.scss
  26. +1 −1 source/sass/components/nav.scss
  27. +6 −1 source/sass/components/primary-nav.scss
  28. +2 −2 source/sass/glyphs.scss
  29. +43 −43 source/sass/main.scss
  30. +6 −1 source/sass/mixins.scss
  31. +3 −2 source/sass/type.scss
  32. +1 −1 source/sass/utilities.scss
  33. +2 −1 source/sass/views/contact.scss
  34. +5 −5 source/sass/views/fellowships/people.scss
  35. +4 −2 source/sass/views/fellowships/shared.scss
  36. +1 −1 source/sass/wagtail.scss
  37. +1 −1 source/sass/wagtail/blocks.scss
  38. +2 −2 source/sass/wagtail/profiles.scss
@@ -1,9 +1,7 @@
{
"extends": "stylelint-config-standard",
"plugins": ["stylelint-prettier"],
"rules": {
"at-rule-no-unknown": null,
"font-family-no-missing-generic-family-keyword": null,
"no-descending-specificity": null,
"prettier/prettier": true,
"color-hex-length": "long"
}
}
@@ -1,5 +1,5 @@
form .l10n-hidden {
display: none;
display: none;
}

div.locale-picker {
@@ -14,7 +14,7 @@ form > div.locale-picker {
wagtail's header has a 2em margin-bottom,
and so we correct that for the 1.5em
margin-bottom used in the normal definition
for the div.locale-picker, above */;
for the div.locale-picker, above */
margin-top: calc(1.5em - 2em);
margin-bottom: 1em;
}
@@ -41,8 +41,8 @@ div.locale-picker ul.locales li.locale button.locale-toggle {
font-weight: 700;
font-size: 1.2em;
text-decoration: none;
color: #fff;
padding: .25em;
color: #ffffff;
padding: 0.25em;
max-height: 2em;
}

@@ -1,39 +1,40 @@
.wagtail-logo-container__desktop {
float: none!important;
width: auto!important;
height: auto!important;
float: none !important;
width: auto !important;
height: auto !important;
}

@media screen and (max-width: $breakpoint-desktop-small) { // 900px
.wagtail-logo-container__desktop {
display: none;
}
@media screen and (max-width: $breakpoint-desktop-small) {
// 900px
.wagtail-logo-container__desktop {
display: none;
}
}

.page404__text-container {
float: none;
width: auto;
height: auto;
text-align: left;
font-size: 90%;
margin-left: 3rem;
float: none;
width: auto;
height: auto;
text-align: left;
font-size: 90%;
margin-left: 3rem;
}

.page404__text-container .page404__header {
text-transform: none;
text-transform: none;
}

.page404__text-container p {
white-space: nowrap;
white-space: nowrap;
}

@media screen and (max-width: $breakpoint-mobile) {
// 800px
.page404__text-container {
width: 400px;
}

@media screen and (max-width: $breakpoint-mobile) { // 800px
.page404__text-container {
width: 400px;
}

.page404__header {
font-size: 5em;
}
}
.page404__header {
font-size: 5em;
}
}

Some generated files are not rendered by default. Learn more.

@@ -29,6 +29,7 @@
"test:procfile": "node test/test-procfile.js",
"test:eslint": "eslint --config ./.eslintrc.json \"source/js/**/*.js\" \"source/js/**/*.jsx\" webpack.config.js",
"test:scss": "stylelint \"source/sass/**/*.scss\" \"source/js/**/*.scss\" --syntax scss",
"test:css": "stylelint \"network-api/networkapi/{,!(frontend)/**/}*.css\" --syntax scss",
"test": "run-s test:** build",
"watch:images": "chokidar \"source/images/**/*\" -c \"npm run build:images\"",
"watch:js": "chokidar \"source/js/**/*.js\" \"source/js/**/*.jsx\" -c \"npm run build:js-uncompressed\"",
@@ -76,6 +77,7 @@
"snyk": "^1.136.1",
"stylelint": "^9.10.1",
"stylelint-config-standard": "^18.2.0",
"stylelint-prettier": "^1.0.6",
"svgo": "^1.2.0",
"webpack": "^4.29.6",
"webpack-cli": "^3.2.3",
@@ -91,7 +91,9 @@ $btn-shadow-width: 3px;
width: 100%;
}

input { display: none; }
input {
display: none;
}

label:first-of-type span {
border-radius: $radio-button-radius 0 0 $radio-button-radius;
@@ -2,7 +2,8 @@
margin-top: 70px;

.slider {
background: url("/_images/buyers-guide/gradient-bar.svg") no-repeat 0 center / contain;
background: url("/_images/buyers-guide/gradient-bar.svg") no-repeat 0 center /
contain;
position: relative;
height: 100px;
cursor: pointer;
@@ -51,7 +52,7 @@
background: transparent;

&::after {
content: ' ';
content: " ";
background: white;
border-radius: 20px;
box-shadow: 2px 2px 3px grey;
@@ -146,7 +146,8 @@
margin: 10px;

&.selected {
box-shadow: 0 0 0 6px $option-color, 0 0 0 9px white, 0 0 0 10px $option-color;
box-shadow: 0 0 0 6px $option-color, 0 0 0 9px white,
0 0 0 10px $option-color;
background: $option-color;
}

@@ -157,7 +158,7 @@
box-shadow: 0 0 0 10px $option-color;

&::after {
content: ' ';
content: " ";
display: block;
width: 22px;
height: 22px;
@@ -181,16 +182,16 @@
background-size: 16px;
}

&[data-label=Both] {
&[data-label="Both"] {
text-indent: 0.7em;
}

&[data-label=Likely] {
&[data-label="Likely"] {
background-image: url(/_images/buyers-guide/icon-thumb-up.svg);
background-position: 12px 4px;
}

&[data-label='Not likely'] {
&[data-label="Not likely"] {
background-image: url(/_images/buyers-guide/icon-thumb-down.svg);
background-position: 12px 7px;
}
@@ -38,7 +38,7 @@
}

th::before {
content: '';
content: "";
display: block;
height: 1em;
margin: 0 0.5em;

0 comments on commit 9e6e52d

Please sign in to comment.
You can’t perform that action at this time.