Browse Source

fix: lint styles

pull/349/head
Ned Zimmerman 3 years ago
parent
commit
75c7a041c6
  1. 2
      assets/styles/aldine.scss
  2. 9
      assets/styles/components/_book.scss
  3. 4
      assets/styles/components/_forms.scss
  4. 10
      assets/styles/editor.scss
  5. 3
      assets/styles/layouts/_header.scss
  6. 7
      assets/styles/layouts/_page-catalog.scss
  7. 2
      assets/styles/layouts/_page-home.scss
  8. 1
      assets/styles/layouts/_signup.scss
  9. 2
      dist/mix-manifest.json
  10. 2
      dist/styles/aldine.css
  11. 5
      package.json

2
assets/styles/aldine.scss

@ -6,7 +6,7 @@
* Prefix your imports with `~` to grab from node_modules/ * Prefix your imports with `~` to grab from node_modules/
* @see https://github.com/webpack-contrib/sass-loader#imports * @see https://github.com/webpack-contrib/sass-loader#imports
*/ */
@import "~aetna/assets/styles/aetna.scss"; @import "~aetna/assets/styles/aetna";
/** Import theme styles */ /** Import theme styles */
@import "common/global"; @import "common/global";

9
assets/styles/components/_book.scss

@ -8,6 +8,7 @@
margin: 0 0 2rem; margin: 0 0 2rem;
padding: 1.5rem 1rem 2rem; padding: 1.5rem 1rem 2rem;
@media #{$breakpoint-not-small} { padding: 1.5rem 1.85rem 2.1875rem; } @media #{$breakpoint-not-small} { padding: 1.5rem 1.85rem 2.1875rem; }
border: solid 2px var(--accent); border: solid 2px var(--accent);
background: var(--accent); background: var(--accent);
@ -27,6 +28,7 @@
margin: 0; margin: 0;
font-size: 1.25rem; font-size: 1.25rem;
@media #{$breakpoint-not-small} { font-size: 1.75rem; } @media #{$breakpoint-not-small} { font-size: 1.75rem; }
font-weight: 500; font-weight: 500;
line-height: 1.2; line-height: 1.2;
text-align: left; text-align: left;
@ -38,14 +40,15 @@
@media #{$breakpoint-not-small} { @media #{$breakpoint-not-small} {
font-size: 1rem; font-size: 1rem;
} }
text-align: left; text-align: left;
} }
&__institutions { &__institutions {
margin: .5rem 0 0 0; margin: .5rem 0 0;
font-size: 0.875rem; font-size: 0.875rem;
text-align: left; text-align: left;
display: -webkit-box; display: box;
overflow: hidden; overflow: hidden;
-webkit-line-clamp: 2; -webkit-line-clamp: 2;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
@ -55,6 +58,7 @@
margin: auto 0 0; margin: auto 0 0;
font-size: 1rem; font-size: 1rem;
@media #{$breakpoint-not-small} { font-size: 1.125rem; } @media #{$breakpoint-not-small} { font-size: 1.125rem; }
text-align: left; text-align: left;
a { a {
@ -66,6 +70,7 @@
height: 1.125rem; height: 1.125rem;
margin-left: 0.5rem; margin-left: 0.5rem;
} }
vertical-align: middle; vertical-align: middle;
} }
} }

4
assets/styles/components/_forms.scss

@ -23,8 +23,7 @@ textarea {
font-weight: 600; font-weight: 600;
font-family: $font-family-sans-serif; font-family: $font-family-sans-serif;
background: transparent; background: transparent;
-webkit-appearance: none; appearance: none;
-moz-appearance: none;
&:focus { &:focus {
outline: none; outline: none;
@ -88,6 +87,7 @@ input[type="submit"] {
font-size: 0.75rem; font-size: 0.75rem;
} }
} }
&.error { &.error {
border-bottom: solid 2px var(--error); border-bottom: solid 2px var(--error);

10
assets/styles/editor.scss

@ -1,8 +1,10 @@
@import '~aetna/assets/styles/common/_variables.scss'; @import '~aetna/assets/styles/common/variables';
@import '~aetna/assets/styles/common/_global.scss'; @import '~aetna/assets/styles/common/global';
body#tinymce { body#tinymce {
margin: 12px !important; margin: 12px !important;
@import '~aetna/assets/styles/components/_buttons.scss'; /* stylelint-disable no-invalid-position-at-import-rule */
@import '~aetna/assets/styles/layouts/_page-sections.scss'; @import '~aetna/assets/styles/components/buttons';
@import '~aetna/assets/styles/layouts/page-sections';
/* stylelint-enable */
} }

3
assets/styles/layouts/_header.scss

@ -12,6 +12,7 @@
@media #{$breakpoint-large} { @media #{$breakpoint-large} {
height: 880px; height: 880px;
.header__inside { .header__inside {
position: relative; position: relative;
z-index: 99; z-index: 99;
@ -47,6 +48,7 @@
line-height: 1.25em; line-height: 1.25em;
margin-top: 1.5em; margin-top: 1.5em;
} }
margin-bottom: 0; margin-bottom: 0;
text-align: center; text-align: center;
max-width: 100%; max-width: 100%;
@ -58,6 +60,7 @@
@media #{$breakpoint-large} { @media #{$breakpoint-large} {
font-size: 2rem; font-size: 2rem;
} }
margin-top: 0; margin-top: 0;
margin-bottom: 0; margin-bottom: 0;
text-align: center; text-align: center;

7
assets/styles/layouts/_page-catalog.scss

@ -12,7 +12,7 @@ fieldset {
text-align: left; text-align: left;
text-transform: none; text-transform: none;
&:before { &::before {
display: none; display: none;
} }
@ -127,6 +127,7 @@ fieldset {
padding: 0; padding: 0;
margin: 2rem 0 1rem 1rem; margin: 2rem 0 1rem 1rem;
} }
.book { .book {
height: 14.375rem; height: 14.375rem;
width: calc(50% - 1rem); width: calc(50% - 1rem);
@ -224,12 +225,12 @@ fieldset {
.subject-groups { .subject-groups {
width: calc(100% + 0.125rem); width: calc(100% + 0.125rem);
margin-left: -0.06125rem; margin-left: -0.0612rem;
div { div {
position: relative; position: relative;
width: calc(100% + 0.125rem); width: calc(100% + 0.125rem);
margin-left: -0.06125rem; margin-left: -0.0612rem;
border-bottom: 0; border-bottom: 0;
} }
} }

2
assets/styles/layouts/_page-home.scss

@ -74,6 +74,7 @@
width: calc(100vw - 5.125rem); width: calc(100vw - 5.125rem);
max-width: 75rem; max-width: 75rem;
} }
.books { .books {
flex-direction: row; flex-direction: row;
justify-content: center; justify-content: center;
@ -93,6 +94,7 @@
.previous, .previous,
.next { .next {
width: rem(32); width: rem(32);
svg { svg {
width: rem(32); width: rem(32);
height: rem(32); height: rem(32);

1
assets/styles/layouts/_signup.scss

@ -1,6 +1,7 @@
.wp-activate-container, .wp-activate-container,
.mu_register.wp-signup-container { .mu_register.wp-signup-container {
@extend .page-section; @extend .page-section;
margin: rem(120) auto 4rem; margin: rem(120) auto 4rem;
* { * {

2
dist/mix-manifest.json vendored

@ -6,7 +6,7 @@
"/scripts/customizer-toggle.js": "/scripts/customizer-toggle.js?id=c31594589675d7c5662aaddcf7a9669a", "/scripts/customizer-toggle.js": "/scripts/customizer-toggle.js?id=c31594589675d7c5662aaddcf7a9669a",
"/scripts/page-section.js": "/scripts/page-section.js?id=19d5c30146ea1a763bcf2bd733a75e77", "/scripts/page-section.js": "/scripts/page-section.js?id=19d5c30146ea1a763bcf2bd733a75e77",
"/styles/editor.css": "/styles/editor.css?id=3fd7086e0f2bcacabc5152bf57ca90ca", "/styles/editor.css": "/styles/editor.css?id=3fd7086e0f2bcacabc5152bf57ca90ca",
"/styles/aldine.css": "/styles/aldine.css?id=accdc9da7cfbe324a98fa31f514dbe20", "/styles/aldine.css": "/styles/aldine.css?id=45e9d79c2620145986f1572789ea60fa",
"/fonts/pressbooks-theme.woff": "/fonts/pressbooks-theme.woff?id=2a7aae81673f4707bbe78c8f12b72b64", "/fonts/pressbooks-theme.woff": "/fonts/pressbooks-theme.woff?id=2a7aae81673f4707bbe78c8f12b72b64",
"/images/banner.jpg": "/images/banner.jpg?id=04a813e0b4f94ddfef1951557166e417", "/images/banner.jpg": "/images/banner.jpg?id=04a813e0b4f94ddfef1951557166e417",
"/images/catalog-header.jpg": "/images/catalog-header.jpg?id=223b9f7a23985f2a72df72e4e4a2ffdc", "/images/catalog-header.jpg": "/images/catalog-header.jpg?id=223b9f7a23985f2a72df72e4e4a2ffdc",

2
dist/styles/aldine.css vendored

File diff suppressed because one or more lines are too long

5
package.json

@ -55,7 +55,10 @@
"assets/scripts/routes/common.js" "assets/scripts/routes/common.js"
], ],
"stylelint": { "stylelint": {
"extends": "./node_modules/pressbooks-build-tools/config/stylelint.js" "extends": "./node_modules/pressbooks-build-tools/config/stylelint.js",
"rules": {
"scss/at-extend-no-missing-placeholder": null
}
}, },
"scripts": { "scripts": {
"build": "mix", "build": "mix",

Loading…
Cancel
Save