Skip to content
This repository has been archived by the owner on Mar 31, 2023. It is now read-only.

244: Remove Singularity #247

Merged
merged 11 commits into from
Jun 19, 2018
Merged

244: Remove Singularity #247

merged 11 commits into from
Jun 19, 2018

Conversation

evanmwillhite
Copy link
Contributor

@evanmwillhite evanmwillhite commented Jun 5, 2018

Addresses #244

Along with fourkitchens/emulsify-gulp#78, this PR removes singularity for layout and replaces it with a flexbox implementation with a CSS Grid one commented out.

What it does

  1. Removes singularity references and implementation in main layout file
  2. Implements a simple flexbox layout instead
  3. Adds a CSS Grid layout that is commented out

To Test

  1. Checkout this branch and link the Emulsify Gulp instance with the corresponding branch
  2. View the sidebar template and full-width template and ensure content is displayed correctly at all screen sizes

Copy link
Contributor

@ModulesUnraveled ModulesUnraveled left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@evanmwillhite This looks great! Thanks for including the css grid variation. I learned a lot just from playing with it.

As long as your okay with my changes, this is ready to merge!

@@ -35,8 +35,6 @@ $main-width: calc(100% - (#{$sidebar-width} + #{$gutter}));
}

.main-content {
width: 100%;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added this back, because it is needed for the non-sidebar layout

// .main-sidebar {
// grid-area: sidebar;
// margin-bottom: $space-double;
// margin-bottom: $gutter;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like what's been done here, but I personally prefer to use space for bottom margins between things. I also like it to be space-double instead of just space visually. If you prefer to have these be the same, let's make a gutter-double that uses space-double. We could also just use space for all of these instead of making our own vars just for this file. What do you think?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm fine with this the way it is. This is just an example after-all. :)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the more vs less vertical space is probably a personal preference thing, so I'm not going to push back.

Let's :shipit: !

@evanmwillhite
Copy link
Contributor Author

I made some tweaks and added some comments. Let me know what you think.

@evanmwillhite evanmwillhite merged commit 22efca3 into develop Jun 19, 2018
@evanmwillhite evanmwillhite deleted the 244-remove-singularity branch June 19, 2018 14:41
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants