⚒️ Restructured Sass organisation #83
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tatianamac
added
Type · Frontend
|
My build is failing for some reason. Looking into it. 🤓 |
|
Build is good! Ready for review. |
ovlb
reviewed
Feb 19, 2020
There was a problem hiding this comment.
I’ve started similar work for the detail pages. I think we do have a similar outcome with slightly different names (e.g. your components folder is named atoms in my PR). The only thing that is different is that I have separated whole page layouts into layouts and have a utilities folder instead of base/_helpers.scss.
In any way, those are – as the rest of my comments – mostly preferences. I’ll be happy to go either way and, if necessary, adapt as the project grows :)
|
@ovlb I tmade some edits and tried to "best of both worlds" our two approaches in a way that made sense to me. It wouldn't offend me if you change/adjust it when you finish #75 ! Also sorry about the duplicate work! I didn't realise you had already been breaking up the sass into partials. But hopefully us both doing it will mean it's even stronger! Let me know if there's anything you'd like to see specifically and I can make it. 👀 |
It looks good for now. I will integrate this into my work and we can have a third look on the structure together before #75 gets merged :) |
tatianamac
added a commit
that referenced
this pull request
Mar 11, 2020
* Add a Sass function to convert pixels to rems (resolve #67) * chore(packages): eleventy@0.10.0 * Rename function, replace pixel usage with rem conversions * typo gaslighting * Move pxToRem to functions partial * feat(eslint): install eslint && prettier config * chore: move findExistingDefinition into own file * chore: set up ava # Conflicts: # package-lock.json # package.json * feat(filters): move permalink function into file, add test # Conflicts: # .eleventy.js * feat(permalink): revert cherry-picked changes to structure * chore: update package-lock with ava * config(eslint): specify source type * Issue #51: Updated definition of polyamory. * ✏️ Typo * 🌈 Organise colors with vars only * ⚒️ Restructured Sass organisation (#83) * 🌈 Organise colors with vars only * ➕ New file structure * File restructuring * ⚒️ Fix build issue * Rearranged files * ➕ Adding "hysterical" to the list (#90) * ➕ Add definition for hysteria * ✏️ Crazy: A few alternatives: obnoxious, wild (#91) * ⚙️ Add linting and CI infrastructure (#85) * Add husky and lint-staged, run lint and test in precommit hook * Add CI for test and lint * Apply eslint fixes in precommit hook * ⚙️ Add stylelint and base configuration (see #74) (#92) * tooling: add stylelint and base configuration (see #74) * Autofix with stylelint on commit * 🚫 Ignore sass-cache * 🐛 Fixed red flag splitting across two lines (#79) * Fix red flag splitting across two lines Added white-space: nowrap to .flag_red and added new properties to link within toc to compensate for nowrap. * Reverting back to original state. * Revisited line wrap issue. Co-authored-by: Tatiana Mac <github@tatianamac.com> * 📄 Add Detail Pages for Definitions (#75) * fix: untrack definitions in dist * feat(detail pages): update item link * feat(detail pages): add layout * feat(detail pages): render whole definition content * feat(detail pages): remove definitons from homepage * 🧹 def list component * feat(layout): render site footer in all pages * feat(detail pages): rename definition root class && move css into partials * chore: abstract further css into own files * feat(detail pages): update headling level of definition content * feat(styles): set box sizing * feat(styles): add margin bottom utility * feat(styles): selection * feat(components): sub page header own component * feat(detail pages): add sections * feat(style): mian headline * feat(page layout): rename page content grid * feat(page layout): add wide content class * feat(detail pages): set document title * feat(detail pages): set uniform document title for docs and definitions * feat(page title): add comment * feat(detail pages): add meta description * feat(detail pages): wrap def header in article tag * chore: set up ava * feat(filters): move permalink function into file, add test * chore: rename _temp to _util, remove creation script * feat(detail pages): helper function to find additional definitions * chore: move helpers to single directory * feat(detail pages): create shortcode for further definition navigation * feat(detail pages): fix find defs function * feat(detail pages): shortcode for browse nav markup * chore: fix collection mock data * feat(detail pages): render browse nav * feat(detail pages): style browse nav, style improvements * feat(detail pages): test redirect * feat(detail pages): client side redirect * feat(homepage): set title * 💅 * feat(detail pages): incorporate design changes * feat(detail pages): hide browse headlines * feat(detail pages): label lists * feat(footer): add aria label * feat(detail pages): redice heading level in md * feat(detail pages): spacing in browse nav * feat(detail pages): reduce line height * feat(detail pages): set max width w/o breaking homepage * feat(detail pages): replace in-definition definition links * 🧹 * feat(detail pages): recover spacing utility * 🧹 * chore(packages): update ava * config: specify nvm version * 💅 * 💅 * chore: update package-lock * chore: specify engines * chore: run lint and test before pushing Co-authored-by: Ned Zimmerman <ned@bight.dev> Co-authored-by: Damien Cosset <damcossetfreelance@gmail.com> Co-authored-by: Tatiana Mac <github@tatianamac.com> Co-authored-by: Alexis Watson <47117571+alexiswatson@users.noreply.github.com> Co-authored-by: tatianamac <tatiana.t.mac@gmail.com> Co-authored-by: Aaron Gustafson <aaron@easy-designs.net> Co-authored-by: Michael Spellacy (Spell) <spell@spellacy.net>
Tagada85
pushed a commit
to Tagada85/selfdefined
that referenced
this pull request
May 10, 2020
* 🌈 Organise colors with vars only * ➕ New file structure * File restructuring * ⚒️ Fix build issue * Rearranged files
Tagada85
added a commit
to Tagada85/selfdefined
that referenced
this pull request
May 10, 2020
* Add a Sass function to convert pixels to rems (resolve selfdefined#67) * chore(packages): eleventy@0.10.0 * Rename function, replace pixel usage with rem conversions * typo gaslighting * Move pxToRem to functions partial * feat(eslint): install eslint && prettier config * chore: move findExistingDefinition into own file * chore: set up ava # Conflicts: # package-lock.json # package.json * feat(filters): move permalink function into file, add test # Conflicts: # .eleventy.js * feat(permalink): revert cherry-picked changes to structure * chore: update package-lock with ava * config(eslint): specify source type * Issue selfdefined#51: Updated definition of polyamory. * ✏️ Typo * 🌈 Organise colors with vars only * ⚒️ Restructured Sass organisation (selfdefined#83) * 🌈 Organise colors with vars only * ➕ New file structure * File restructuring * ⚒️ Fix build issue * Rearranged files * ➕ Adding "hysterical" to the list (selfdefined#90) * ➕ Add definition for hysteria * ✏️ Crazy: A few alternatives: obnoxious, wild (selfdefined#91) * ⚙️ Add linting and CI infrastructure (selfdefined#85) * Add husky and lint-staged, run lint and test in precommit hook * Add CI for test and lint * Apply eslint fixes in precommit hook * ⚙️ Add stylelint and base configuration (see selfdefined#74) (selfdefined#92) * tooling: add stylelint and base configuration (see selfdefined#74) * Autofix with stylelint on commit * 🚫 Ignore sass-cache * 🐛 Fixed red flag splitting across two lines (selfdefined#79) * Fix red flag splitting across two lines Added white-space: nowrap to .flag_red and added new properties to link within toc to compensate for nowrap. * Reverting back to original state. * Revisited line wrap issue. Co-authored-by: Tatiana Mac <github@tatianamac.com> * 📄 Add Detail Pages for Definitions (selfdefined#75) * fix: untrack definitions in dist * feat(detail pages): update item link * feat(detail pages): add layout * feat(detail pages): render whole definition content * feat(detail pages): remove definitons from homepage * 🧹 def list component * feat(layout): render site footer in all pages * feat(detail pages): rename definition root class && move css into partials * chore: abstract further css into own files * feat(detail pages): update headling level of definition content * feat(styles): set box sizing * feat(styles): add margin bottom utility * feat(styles): selection * feat(components): sub page header own component * feat(detail pages): add sections * feat(style): mian headline * feat(page layout): rename page content grid * feat(page layout): add wide content class * feat(detail pages): set document title * feat(detail pages): set uniform document title for docs and definitions * feat(page title): add comment * feat(detail pages): add meta description * feat(detail pages): wrap def header in article tag * chore: set up ava * feat(filters): move permalink function into file, add test * chore: rename _temp to _util, remove creation script * feat(detail pages): helper function to find additional definitions * chore: move helpers to single directory * feat(detail pages): create shortcode for further definition navigation * feat(detail pages): fix find defs function * feat(detail pages): shortcode for browse nav markup * chore: fix collection mock data * feat(detail pages): render browse nav * feat(detail pages): style browse nav, style improvements * feat(detail pages): test redirect * feat(detail pages): client side redirect * feat(homepage): set title * 💅 * feat(detail pages): incorporate design changes * feat(detail pages): hide browse headlines * feat(detail pages): label lists * feat(footer): add aria label * feat(detail pages): redice heading level in md * feat(detail pages): spacing in browse nav * feat(detail pages): reduce line height * feat(detail pages): set max width w/o breaking homepage * feat(detail pages): replace in-definition definition links * 🧹 * feat(detail pages): recover spacing utility * 🧹 * chore(packages): update ava * config: specify nvm version * 💅 * 💅 * chore: update package-lock * chore: specify engines * chore: run lint and test before pushing Co-authored-by: Ned Zimmerman <ned@bight.dev> Co-authored-by: Damien Cosset <damcossetfreelance@gmail.com> Co-authored-by: Tatiana Mac <github@tatianamac.com> Co-authored-by: Alexis Watson <47117571+alexiswatson@users.noreply.github.com> Co-authored-by: tatianamac <tatiana.t.mac@gmail.com> Co-authored-by: Aaron Gustafson <aaron@easy-designs.net> Co-authored-by: Michael Spellacy (Spell) <spell@spellacy.net>
tatianamac
added a commit
that referenced
this pull request
May 23, 2020
* added french translations ok-sign * added gaslighting french translation * translation gaslighting * fix some typos * added ableism traduction * added ableism traduction * fix some missing accents * Improve CONTRIBUTING.md * Add a Sass function to convert pixels to rems (resolve #67) * Update CONTRIBUTING.md Addressed comments * Removed wrong link * Update CONTRIBUTING.md Add help info and fix style * Update CONTRIBUTING.md * Propose definition: biromantic * Fix typo on the link text of Minoritized * ➕ Add funding * Rename function, replace pixel usage with rem conversions * added french translations ok-sign * typo gaslighting * added gaslighting french translation * Move pxToRem to functions partial * chore: set up ava # Conflicts: # package-lock.json # package.json * feat(filters): move permalink function into file, add test # Conflicts: # .eleventy.js * feat(eslint): install eslint && prettier config * chore: move findExistingDefinition into own file * feat(permalink): revert cherry-picked changes to structure * chore: update package-lock with ava * config(eslint): specify source type * Issue #51: Updated definition of polyamory. * translation gaslighting * ✏️ Typo * 🌈 Organise colors with vars only * fix some typos * added ableism traduction * added ableism traduction * ⚒️ Restructured Sass organisation (#83) * 🌈 Organise colors with vars only * ➕ New file structure * File restructuring * ⚒️ Fix build issue * Rearranged files * ➕ Adding "hysterical" to the list (#90) * ➕ Add definition for hysteria * ✏️ Crazy: A few alternatives: obnoxious, wild (#91) * ⚙️ Add linting and CI infrastructure (#85) * Add husky and lint-staged, run lint and test in precommit hook * Add CI for test and lint * Apply eslint fixes in precommit hook * ⚙️ Add stylelint and base configuration (see #74) (#92) * tooling: add stylelint and base configuration (see #74) * Autofix with stylelint on commit * 🚫 Ignore sass-cache * 🐛 Fixed red flag splitting across two lines (#79) * Fix red flag splitting across two lines Added white-space: nowrap to .flag_red and added new properties to link within toc to compensate for nowrap. * Reverting back to original state. * Revisited line wrap issue. Co-authored-by: Tatiana Mac <github@tatianamac.com> * 📄 Add Detail Pages for Definitions (#75) * fix: untrack definitions in dist * feat(detail pages): update item link * feat(detail pages): add layout * feat(detail pages): render whole definition content * feat(detail pages): remove definitons from homepage * 🧹 def list component * feat(layout): render site footer in all pages * feat(detail pages): rename definition root class && move css into partials * chore: abstract further css into own files * feat(detail pages): update headling level of definition content * feat(styles): set box sizing * feat(styles): add margin bottom utility * feat(styles): selection * feat(components): sub page header own component * feat(detail pages): add sections * feat(style): mian headline * feat(page layout): rename page content grid * feat(page layout): add wide content class * feat(detail pages): set document title * feat(detail pages): set uniform document title for docs and definitions * feat(page title): add comment * feat(detail pages): add meta description * feat(detail pages): wrap def header in article tag * chore: set up ava * feat(filters): move permalink function into file, add test * chore: rename _temp to _util, remove creation script * feat(detail pages): helper function to find additional definitions * chore: move helpers to single directory * feat(detail pages): create shortcode for further definition navigation * feat(detail pages): fix find defs function * feat(detail pages): shortcode for browse nav markup * chore: fix collection mock data * feat(detail pages): render browse nav * feat(detail pages): style browse nav, style improvements * feat(detail pages): test redirect * feat(detail pages): client side redirect * feat(homepage): set title * 💅 * feat(detail pages): incorporate design changes * feat(detail pages): hide browse headlines * feat(detail pages): label lists * feat(footer): add aria label * feat(detail pages): redice heading level in md * feat(detail pages): spacing in browse nav * feat(detail pages): reduce line height * feat(detail pages): set max width w/o breaking homepage * feat(detail pages): replace in-definition definition links * 🧹 * feat(detail pages): recover spacing utility * 🧹 * chore(packages): update ava * config: specify nvm version * 💅 * 💅 * 🏡 eleventy@0.10.0 (#76) * Add a Sass function to convert pixels to rems (resolve #67) * chore(packages): eleventy@0.10.0 * Rename function, replace pixel usage with rem conversions * typo gaslighting * Move pxToRem to functions partial * feat(eslint): install eslint && prettier config * chore: move findExistingDefinition into own file * chore: set up ava # Conflicts: # package-lock.json # package.json * feat(filters): move permalink function into file, add test # Conflicts: # .eleventy.js * feat(permalink): revert cherry-picked changes to structure * chore: update package-lock with ava * config(eslint): specify source type * Issue #51: Updated definition of polyamory. * ✏️ Typo * 🌈 Organise colors with vars only * ⚒️ Restructured Sass organisation (#83) * 🌈 Organise colors with vars only * ➕ New file structure * File restructuring * ⚒️ Fix build issue * Rearranged files * ➕ Adding "hysterical" to the list (#90) * ➕ Add definition for hysteria * ✏️ Crazy: A few alternatives: obnoxious, wild (#91) * ⚙️ Add linting and CI infrastructure (#85) * Add husky and lint-staged, run lint and test in precommit hook * Add CI for test and lint * Apply eslint fixes in precommit hook * ⚙️ Add stylelint and base configuration (see #74) (#92) * tooling: add stylelint and base configuration (see #74) * Autofix with stylelint on commit * 🚫 Ignore sass-cache * 🐛 Fixed red flag splitting across two lines (#79) * Fix red flag splitting across two lines Added white-space: nowrap to .flag_red and added new properties to link within toc to compensate for nowrap. * Reverting back to original state. * Revisited line wrap issue. Co-authored-by: Tatiana Mac <github@tatianamac.com> * 📄 Add Detail Pages for Definitions (#75) * fix: untrack definitions in dist * feat(detail pages): update item link * feat(detail pages): add layout * feat(detail pages): render whole definition content * feat(detail pages): remove definitons from homepage * 🧹 def list component * feat(layout): render site footer in all pages * feat(detail pages): rename definition root class && move css into partials * chore: abstract further css into own files * feat(detail pages): update headling level of definition content * feat(styles): set box sizing * feat(styles): add margin bottom utility * feat(styles): selection * feat(components): sub page header own component * feat(detail pages): add sections * feat(style): mian headline * feat(page layout): rename page content grid * feat(page layout): add wide content class * feat(detail pages): set document title * feat(detail pages): set uniform document title for docs and definitions * feat(page title): add comment * feat(detail pages): add meta description * feat(detail pages): wrap def header in article tag * chore: set up ava * feat(filters): move permalink function into file, add test * chore: rename _temp to _util, remove creation script * feat(detail pages): helper function to find additional definitions * chore: move helpers to single directory * feat(detail pages): create shortcode for further definition navigation * feat(detail pages): fix find defs function * feat(detail pages): shortcode for browse nav markup * chore: fix collection mock data * feat(detail pages): render browse nav * feat(detail pages): style browse nav, style improvements * feat(detail pages): test redirect * feat(detail pages): client side redirect * feat(homepage): set title * 💅 * feat(detail pages): incorporate design changes * feat(detail pages): hide browse headlines * feat(detail pages): label lists * feat(footer): add aria label * feat(detail pages): redice heading level in md * feat(detail pages): spacing in browse nav * feat(detail pages): reduce line height * feat(detail pages): set max width w/o breaking homepage * feat(detail pages): replace in-definition definition links * 🧹 * feat(detail pages): recover spacing utility * 🧹 * chore(packages): update ava * config: specify nvm version * 💅 * 💅 * chore: update package-lock * chore: specify engines * chore: run lint and test before pushing Co-authored-by: Ned Zimmerman <ned@bight.dev> Co-authored-by: Damien Cosset <damcossetfreelance@gmail.com> Co-authored-by: Tatiana Mac <github@tatianamac.com> Co-authored-by: Alexis Watson <47117571+alexiswatson@users.noreply.github.com> Co-authored-by: tatianamac <tatiana.t.mac@gmail.com> Co-authored-by: Aaron Gustafson <aaron@easy-designs.net> Co-authored-by: Michael Spellacy (Spell) <spell@spellacy.net> * Updated "Ways to Help" section (#93) * Updated Ways to Help section * Update index.njk * Update _grid.scss * Update index.njk Co-authored-by: Mekhnetsova, Ekaterina <ekaterina.mekhnetsova@intel.com> * ⚒️ Add a `pageStyles` block to base template (#98) * Import typekit fonts as link * Declare pageStyles block in base template * Uninstall prism-themes package * 🖌️ fix order of rule set (#99) Co-authored-by: Tatiana Mac <github@tatianamac.com> * ➕ Add dumb definition * ➕ Add dumb definition * ➕ Added Asian terms and subterms, Orientalism * ➕ Add definitions for Hispanic, Latino and Latinx (#89) * Add definitions for Hispanic, Latino and Latinx * Update hispanic, latino and latinx definitions to indicate their pan-ethnic connotations. * 🎨 Enhance :focus style for a11y * Adding link changes with text-decoration and background * Update assets/css/base/_a.scss Co-Authored-By: EJ Mason <eliasjmason@gmail.com> * Add SCSS variable Co-authored-by: Conlin Durbin <conlin@lessonly.com> Co-authored-by: EJ Mason <eliasjmason@gmail.com> Co-authored-by: Tatiana Mac <github@tatianamac.com> * 🐛 Add headings, label lists, remove aria-labels for a11y (#109) Co-authored-by: Tatiana Mac <github@tatianamac.com> * 📎 Added financial contributors to the README (#107) Co-authored-by: Tatiana Mac <github@tatianamac.com> * ➕ Add definition for tone-deaf (#112) * ➕ Added Asian terms and subterms, Orientalism * ➕ Add misia, update fatphobia * ➕ Add tone-deaf * 🚩 Changed flag to medical appropriation * 🐛 Fixed indentation issue, broke build * ➕ feat: add overrepresented majoirty (#115) * ✏️ Add "shallow" as possible alternative for "dumb" (#113) eg: This may sound shallow, but I'd really like my next job to have excellent food. Co-authored-by: Tatiana Mac <github@tatianamac.com> * ➕ Add definition for overrepresented majority, underrepresented minority (#116) * ➕ Added Asian terms and subterms, Orientalism * feat: add overrepresented majoirty * ➕ [DRAFT] Added overrepresented-majority * Adding underrepresented minority * 🐛 Fixes flag build issue * Improve interlinking * flag: Co-authored-by: Tierney Cyren <hello@bnb.im> * Fixes term link issue * Flag update * Fixes link issues * Adds manual interlinking to minoritised * fix some missing accents * cisgenre + white fragility def Co-authored-by: Ekaterina Mekhnetsova <outoftardis@users.noreply.github.com> Co-authored-by: Ned Zimmerman <ned@bight.dev> Co-authored-by: Dan <dan.abramov@gmail.com> Co-authored-by: Nathanael CHERRIER <dev@nathanaelcherrier.com> Co-authored-by: Tatiana Mac <github@tatianamac.com> Co-authored-by: Oscar <o@ovl.design> Co-authored-by: Alexis Watson <47117571+alexiswatson@users.noreply.github.com> Co-authored-by: tatianamac <tatiana.t.mac@gmail.com> Co-authored-by: Aaron Gustafson <aaron@easy-designs.net> Co-authored-by: Michael Spellacy (Spell) <spell@spellacy.net> Co-authored-by: Oscar <ovlb@users.noreply.github.com> Co-authored-by: Mekhnetsova, Ekaterina <ekaterina.mekhnetsova@intel.com> Co-authored-by: EJ Mason <eliasjmason@gmail.com> Co-authored-by: Kevin Garcia <hello@kevingarcia.me> Co-authored-by: Conlin Durbin <conlindurbin@protonmail.com> Co-authored-by: Conlin Durbin <conlin@lessonly.com> Co-authored-by: Sarah Higley <smhigley@users.noreply.github.com> Co-authored-by: jess <jessachandler@gmail.com> Co-authored-by: Tierney Cyren <accounts@bnb.im> Co-authored-by: Sophie Alpert <git@sophiebits.com> Co-authored-by: Tierney Cyren <hello@bnb.im>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Used 7-1 pattern to make sass files more readable and easier to maintain as the codebase grows.
Commented out unused aspects of 7-1 for now in the main _base.scss file.
Would recommend considering the following steps:
base.scsstomain.scssto prevent confusion withbase/baseas both serve different functions imhocsstoscssI could be the only one confused by this, but I typically think of thecssfolder as being where the compiled css lives?