From c2bf3e488feaa3de5e7fe0b4f70d6a448a8c6ca7 Mon Sep 17 00:00:00 2001 From: Joe Dinsdale Date: Mon, 28 Nov 2016 00:09:41 +0000 Subject: [PATCH 1/3] Added more elegant way to retrieve breakpoint definitions --- objects/grid/_unit.scss | 8 ++++++-- settings/_grid.scss | 16 ++++------------ 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/objects/grid/_unit.scss b/objects/grid/_unit.scss index 376e176..6f760bd 100644 --- a/objects/grid/_unit.scss +++ b/objects/grid/_unit.scss @@ -18,9 +18,13 @@ vertical-align: top; } -// Loop through all the breakpoints defined in `$cactus-breakpoint-config` +// Loop through all the breakpoints defined in `$cactus-unit-config` -@each $bp in $cactus-breakpoint-config { +// Fetch keys for easy looping +$cactus-unit-keys: map-keys($cactus-unit-config); + +// Loop through keys and generate classes +@each $bp in $cactus-unit-keys { $bp-name: map-deep-get($cactus-unit-config, $bp, "name"); $bp-breakpoint: map-deep-get($cactus-unit-config, $bp, "breakpoint"); $bp-units: map-deep-get($cactus-unit-config, $bp, "units"); diff --git a/settings/_grid.scss b/settings/_grid.scss index ab8566f..ef40e29 100644 --- a/settings/_grid.scss +++ b/settings/_grid.scss @@ -43,34 +43,26 @@ $cactus-gutter-config: ( //==================================================== // Map of each breakpoint, with name, width (em) and array of unit size ratios. -$cactus-unit-ratio-default: 1 1, 1 2, 1 3, 2 3, 1 4, 3 4 !default; -$cactus-unit-ratio-medium: 1 1, 1 2, 1 3, 2 3 !default; - -$cactus-breakpoint-config: ( - default, - medium, - small -) !default; $cactus-unit-config: ( default: ( name: false, breakpoint: false, - units: $cactus-unit-ratio-default + units: (1 1, 1 2, 1 3, 2 3, 1 4, 3 4) ), large: ( name: m, breakpoint: 75em, - units: $cactus-unit-ratio-default + units: (1 1, 1 2, 1 3, 2 3, 1 4, 3 4) ), medium: ( name: m, breakpoint: 56em, - units: $cactus-unit-ratio-medium + units: (1 1, 1 2, 1 3, 2 3) ), small: ( name: s, breakpoint: 32em, - units: $cactus-unit-ratio-medium + units: (1 1, 1 2) ) ) !default; From 287ccc0337f50d2d5e88c99498d6e3cc0138fd42 Mon Sep 17 00:00:00 2001 From: Joe Dinsdale Date: Fri, 2 Dec 2016 20:34:34 +0000 Subject: [PATCH 2/3] v1.1.0 prep restructure and tidy --- CHANGELOG.md | 16 ++ LICENSE.md | 22 ++ README.md | 76 ++--- generic/_all.scss | 1 + generic/_normalize.scss | 461 +++++++++++++++++++++++++++++++ objects/_all.scss | 4 +- objects/{grid => }/_group.scss | 4 +- objects/{grid => }/_unit.scss | 16 +- objects/{grid => }/_wrapper.scss | 0 objects/grid/_all.scss | 3 - package.json | 2 +- settings/_grid.scss | 2 +- 12 files changed, 559 insertions(+), 48 deletions(-) create mode 100644 CHANGELOG.md create mode 100644 generic/_normalize.scss rename objects/{grid => }/_group.scss (94%) rename objects/{grid => }/_unit.scss (71%) rename objects/{grid => }/_wrapper.scss (100%) delete mode 100644 objects/grid/_all.scss diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..f74734b --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,16 @@ +# V1.1.0 + +## Improvements + +* Streamlined unit gutter generation to avoid repetition. +* Restructured objects to avoid nesting. +* Included Normalize 5.0. +* Updated README. +* Updated LICENSE. +* Included CHANGELOG. + +## Fixes + +* Corrected default `$cactus-unit-config` map. + +--- diff --git a/LICENSE.md b/LICENSE.md index 8346244..11314a9 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -19,3 +19,25 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Normalize.css License +===================== + +Copyright (c) Nicolas Gallagher and Jonathan Neal + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/README.md b/README.md index 3ab4c7e..b316908 100644 --- a/README.md +++ b/README.md @@ -17,13 +17,25 @@ Cactus has a suite of automated tests, to run: For linting run: `npm run lint` -## Build +## Building To build a static CSS version of Cactus run: `npm run build` ## Cactus Structure -Cactus is structured acording to ITCSS, this allows separation of concerns and gives greater context for what each class is used for. For more information checkout this [blog post on ITCSS](https://www.xfive.co/blog/itcss-scalable-maintainable-css-architecture). +Cactus is structured acording to ITCSS, this allows separation of concerns and gives greater context for what each class is used for. For more information checkout this [blog post on ITCSS](https://www.xfive.co/blog/itcss-scalable-maintainable-css-architecture). The framework is split up into the following categories: + +* **Settings** - Settings contains all of the configuration settings for Cactus. These should never be overwritten directly. + +* **Tools** - Tools contains functions and mixins required for Cactus. + +* **Generic** - Generic is used for any generic global styling, this should be avoided where possible. + +* **Elements** - Elements contains styling for HTML elements such as ``. + +* **Objects** - Objects contains class-based styling for non-cosmetic design patterns such as containers and layout. + +* **Debug** - Debug is an optional set of styling which enables some debug styling to highlight incorrect grid usage. ## Cactus Classes @@ -39,24 +51,32 @@ Cactus makes use of BEM like naming convention for classes making for far more r For more information have a look at [MindBEMding - Getting your head round BEM syntax](http://csswizardry.com/2013/01/mindbemding-getting-your-head-round-bem-syntax/) by Harry Roberts, it's a great read! ### Cactus wrapper -The Wrapper element sets the max width `$cactus-wrapper-width` of the content and centers it on the page, by default this is 60em (960px). +The Wrapper element sets the a max-width constraint. The wrapper widths are define in`$cactus-wrapper-config` which expects a map: ``` scss -.o-cactus__w +$cactus-wrapper-config: ( + sizes: ( + default: 48em, + large: 56em, + small: 40em + ) +); ``` -An optional wide modifier can be set `$cactus-wrapper-width-wide`, by default this is set to false. +This will create the following classes: ``` scss -.o-cactus__w--wide +.o-cactus__w +.o-cactus__w--large +.o-cactus__w--small ``` ### Cactus Group -The Group element wraps Units, it also allows us to adjust the gutter on direct descendant `cactus__u` elements. +The Group element wraps Units and adds essential margins and offsets to create the layouts. All immediately nested elements should be cactus unit classes. ``` scss -.o-cactus__g // Default gutter width set by $cactus-gutter, 32px default. -.o-cactus__g--gutter-small // Sets gutter to value of $cactus-gutter-small, 8px default. +.o-cactus__g // Default gutter width. +.o-cactus__g--gutter-small // Optional modifier for gutter width. .o-cactus__g--gutter-none // Removes gutter. .o-cactus__g--reverse // Reverse child unit elements. ``` @@ -88,6 +108,9 @@ The Unit defines the ratios of your columns as well as breakpoints where it will ## Cactus Grid Generator There have been some major changes to how the settings for Cactus work. It will take me a while to re-write the documentation to account for this and add better tools for extending however for now here's a quick summary +### Cactus Wrapper Config +The Cactus wrapper is an optional element which sets a maximum width constraint, by default this is centrally aligned in the page. You can define + ### Cactus Unit Config Here we can define each of the breakpoints we want to generate unit classes for and specify what those units should be: @@ -97,12 +120,12 @@ $cactus-unit-config: ( default: ( name: false, breakpoint: false, - units: $cactus-unit-ratio-default + units: (1 1, 1 2, 1 4, 3 4) ), medium: ( name: m, breakpoint: 75em, - units: $cactus-unit-ratio-default + units: (1 1, 1 2, 1 3, 2 3) ) ); ``` @@ -111,28 +134,8 @@ Here we have two breakpoints, `default` and `medium`. Each comprises of: - **`name`** - The name which will be used for the class, for example giving a name of 'm' will result in a generated class of `.o-cactus__u--m-X`. Setting to `false` means this is the global breakpoint with no media query attached. - **`breakpoint`** - This is the width at which the breakpoint should apply and should be set in em's. A breakpoint of `50em` would mean these classes only effect when the screen width is below `800px` etc. -- **`units`** - This should be set to a variable containing an array of fractions, for the correct format of these see below. +- **`units`** - Units expects an array of space separated fractions, so `1 2` is the same as `1/2` or `50%`. This lets us tailor the exact unit widths we want to include. -### Cactus Unit Ratios -These are the unit ratios we set for the various breakpoints. They currently need to be contained with in separate variables as sass maps don't support nested arrays. The benefit of this is that it potentially DRYs up our code: - -``` scss -$cactus-unit-ratio-default: 1 1, 1 2, 1 3, 2 3, 1 4, 3 4; -``` - -The unit ratios are essentially fractions so `1 2` is the same as `1/2` or `50%`. There is no limit to how many you can have although it is recommended that you only include the ones you need. - -### Cactus Breakpoint Config - -Here we set which of the breakpoints we want to include in our project. The values in here must be the same as the maps nested within `$cactus-unit-config`. - -``` scss -$cactus-breakpoint-config: ( - default, - medium, - small -); -``` ### Using the generated class names The classes and breakpoints we have defined will be exported in the following format: @@ -145,4 +148,11 @@ The classes and breakpoints we have defined will be exported in the following fo .o-cactus__u--m-2-3 // Three quarter width at medium breakpoint .o-cactus__u--s-1 // Full width at small breakpoint -``` \ No newline at end of file +``` + +## Customising +To customise the default grid settings include your own overrides file and include before Cactus. You can include your own `$cactus-unit-config` or `$cactus-gutter-config` etc as your project requires. To see what options are available check `settings/_grid.scss`. + +## License + +See the [LICENSE file](https://github.com/MrDinsdale/Cactus/blob/master/LICENSE.md) for license text and copywrite information. diff --git a/generic/_all.scss b/generic/_all.scss index 2068ead..d25506a 100644 --- a/generic/_all.scss +++ b/generic/_all.scss @@ -1 +1,2 @@ +@import 'normalize'; @import 'globals'; \ No newline at end of file diff --git a/generic/_normalize.scss b/generic/_normalize.scss new file mode 100644 index 0000000..3669e1f --- /dev/null +++ b/generic/_normalize.scss @@ -0,0 +1,461 @@ +/*! normalize.css v5.0.0 | MIT License | github.com/necolas/normalize.css */ + +/** + * 1. Change the default font family in all browsers (opinionated). + * 2. Correct the line height in all browsers. + * 3. Prevent adjustments of font size after orientation changes in + * IE on Windows Phone and in iOS. + */ + +/* Document + ========================================================================== */ + +html { + font-family: sans-serif; /* 1 */ + line-height: 1.15; /* 2 */ + -ms-text-size-adjust: 100%; /* 3 */ + -webkit-text-size-adjust: 100%; /* 3 */ +} + +/* Sections + ========================================================================== */ + +/** + * Remove the margin in all browsers (opinionated). + */ + +body { + margin: 0; +} + +/** + * Add the correct display in IE 9-. + */ + +article, +aside, +footer, +header, +nav, +section { + display: block; +} + +/** + * Correct the font size and margin on `h1` elements within `section` and + * `article` contexts in Chrome, Firefox, and Safari. + */ + +h1 { + font-size: 2em; + margin: 0.67em 0; +} + +/* Grouping content + ========================================================================== */ + +/** + * Add the correct display in IE 9-. + * 1. Add the correct display in IE. + */ + +figcaption, +figure, +main { /* 1 */ + display: block; +} + +/** + * Add the correct margin in IE 8. + */ + +figure { + margin: 1em 40px; +} + +/** + * 1. Add the correct box sizing in Firefox. + * 2. Show the overflow in Edge and IE. + */ + +hr { + box-sizing: content-box; /* 1 */ + height: 0; /* 1 */ + overflow: visible; /* 2 */ +} + +/** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ + +pre { + font-family: monospace, monospace; /* 1 */ + font-size: 1em; /* 2 */ +} + +/* Text-level semantics + ========================================================================== */ + +/** + * 1. Remove the gray background on active links in IE 10. + * 2. Remove gaps in links underline in iOS 8+ and Safari 8+. + */ + +a { + background-color: transparent; /* 1 */ + -webkit-text-decoration-skip: objects; /* 2 */ +} + +/** + * Remove the outline on focused links when they are also active or hovered + * in all browsers (opinionated). + */ + +a:active, +a:hover { + outline-width: 0; +} + +/** + * 1. Remove the bottom border in Firefox 39-. + * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. + */ + +abbr[title] { + border-bottom: none; /* 1 */ + text-decoration: underline; /* 2 */ + text-decoration: underline dotted; /* 2 */ +} + +/** + * Prevent the duplicate application of `bolder` by the next rule in Safari 6. + */ + +b, +strong { + font-weight: inherit; +} + +/** + * Add the correct font weight in Chrome, Edge, and Safari. + */ + +b, +strong { + font-weight: bolder; +} + +/** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ + +code, +kbd, +samp { + font-family: monospace, monospace; /* 1 */ + font-size: 1em; /* 2 */ +} + +/** + * Add the correct font style in Android 4.3-. + */ + +dfn { + font-style: italic; +} + +/** + * Add the correct background and color in IE 9-. + */ + +mark { + background-color: #ff0; + color: #000; +} + +/** + * Add the correct font size in all browsers. + */ + +small { + font-size: 80%; +} + +/** + * Prevent `sub` and `sup` elements from affecting the line height in + * all browsers. + */ + +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} + +sub { + bottom: -0.25em; +} + +sup { + top: -0.5em; +} + +/* Embedded content + ========================================================================== */ + +/** + * Add the correct display in IE 9-. + */ + +audio, +video { + display: inline-block; +} + +/** + * Add the correct display in iOS 4-7. + */ + +audio:not([controls]) { + display: none; + height: 0; +} + +/** + * Remove the border on images inside links in IE 10-. + */ + +img { + border-style: none; +} + +/** + * Hide the overflow in IE. + */ + +svg:not(:root) { + overflow: hidden; +} + +/* Forms + ========================================================================== */ + +/** + * 1. Change the font styles in all browsers (opinionated). + * 2. Remove the margin in Firefox and Safari. + */ + +button, +input, +optgroup, +select, +textarea { + font-family: sans-serif; /* 1 */ + font-size: 100%; /* 1 */ + line-height: 1.15; /* 1 */ + margin: 0; /* 2 */ +} + +/** + * Show the overflow in IE. + * 1. Show the overflow in Edge. + */ + +button, +input { /* 1 */ + overflow: visible; +} + +/** + * Remove the inheritance of text transform in Edge, Firefox, and IE. + * 1. Remove the inheritance of text transform in Firefox. + */ + +button, +select { /* 1 */ + text-transform: none; +} + +/** + * 1. Prevent a WebKit bug where (2) destroys native `audio` and `video` + * controls in Android 4. + * 2. Correct the inability to style clickable types in iOS and Safari. + */ + +button, +html [type='button'], /* 1 */ +[type='reset'], +[type='submit'] { + -webkit-appearance: button; /* 2 */ +} + +/** + * Remove the inner border and padding in Firefox. + */ + +button::-moz-focus-inner, +[type='button']::-moz-focus-inner, +[type='reset']::-moz-focus-inner, +[type='submit']::-moz-focus-inner { + border-style: none; + padding: 0; +} + +/** + * Restore the focus styles unset by the previous rule. + */ + +button:-moz-focusring, +[type='button']:-moz-focusring, +[type='reset']:-moz-focusring, +[type='submit']:-moz-focusring { + outline: 1px dotted ButtonText; +} + +/** + * Change the border, margin, and padding in all browsers (opinionated). + */ + +fieldset { + border: 1px solid #c0c0c0; + margin: 0 2px; + padding: 0.35em 0.625em 0.75em; +} + +/** + * 1. Correct the text wrapping in Edge and IE. + * 2. Correct the color inheritance from `fieldset` elements in IE. + * 3. Remove the padding so developers are not caught out when they zero out + * `fieldset` elements in all browsers. + */ + +legend { + box-sizing: border-box; /* 1 */ + color: inherit; /* 2 */ + display: table; /* 1 */ + max-width: 100%; /* 1 */ + padding: 0; /* 3 */ + white-space: normal; /* 1 */ +} + +/** + * 1. Add the correct display in IE 9-. + * 2. Add the correct vertical alignment in Chrome, Firefox, and Opera. + */ + +progress { + display: inline-block; /* 1 */ + vertical-align: baseline; /* 2 */ +} + +/** + * Remove the default vertical scrollbar in IE. + */ + +textarea { + overflow: auto; +} + +/** + * 1. Add the correct box sizing in IE 10-. + * 2. Remove the padding in IE 10-. + */ + +[type='checkbox'], +[type='radio'] { + box-sizing: border-box; /* 1 */ + padding: 0; /* 2 */ +} + +/** + * Correct the cursor style of increment and decrement buttons in Chrome. + */ + +[type='number']::-webkit-inner-spin-button, +[type='number']::-webkit-outer-spin-button { + height: auto; +} + +/** + * 1. Correct the odd appearance in Chrome and Safari. + * 2. Correct the outline style in Safari. + */ + +[type='search'] { + -webkit-appearance: textfield; /* 1 */ + outline-offset: -2px; /* 2 */ +} + +/** + * Remove the inner padding and cancel buttons in Chrome and Safari on macOS. + */ + +[type='search']::-webkit-search-cancel-button, +[type='search']::-webkit-search-decoration { + -webkit-appearance: none; +} + +/** + * 1. Correct the inability to style clickable types in iOS and Safari. + * 2. Change font properties to `inherit` in Safari. + */ + +::-webkit-file-upload-button { + -webkit-appearance: button; /* 1 */ + font: inherit; /* 2 */ +} + +/* Interactive + ========================================================================== */ + +/* + * Add the correct display in IE 9-. + * 1. Add the correct display in Edge, IE, and Firefox. + */ + +details, /* 1 */ +menu { + display: block; +} + +/* + * Add the correct display in all browsers. + */ + +summary { + display: list-item; +} + +/* Scripting + ========================================================================== */ + +/** + * Add the correct display in IE 9-. + */ + +canvas { + display: inline-block; +} + +/** + * Add the correct display in IE. + */ + +template { + display: none; +} + +/* Hidden + ========================================================================== */ + +/** + * Add the correct display in IE 10-. + */ + +[hidden] { + display: none; +} \ No newline at end of file diff --git a/objects/_all.scss b/objects/_all.scss index ea31fbf..963c59f 100644 --- a/objects/_all.scss +++ b/objects/_all.scss @@ -1 +1,3 @@ -@import 'grid/all'; +@import 'wrapper'; +@import 'group'; +@import 'unit'; diff --git a/objects/grid/_group.scss b/objects/_group.scss similarity index 94% rename from objects/grid/_group.scss rename to objects/_group.scss index 585b071..21a10cb 100644 --- a/objects/grid/_group.scss +++ b/objects/_group.scss @@ -5,7 +5,7 @@ // `.o-cactus__g` is required to offset the unit gutters etc. All unit classes // should be wrapped by the group element -[class*="o-#{$cactus-prefix}__g"] { +[class*='o-#{$cactus-prefix}__g'] { display: -webkit-flex; -webkit-flex-flow: row wrap; display: -ms-flexbox; @@ -50,7 +50,7 @@ margin-left: 0; margin-right: 0; - > [class *= "o-#{$cactus-prefix}__u"] { + > [class *= 'o-#{$cactus-prefix}__u'] { padding-left: 0; padding-right: 0; } diff --git a/objects/grid/_unit.scss b/objects/_unit.scss similarity index 71% rename from objects/grid/_unit.scss rename to objects/_unit.scss index 6f760bd..f259cf7 100644 --- a/objects/grid/_unit.scss +++ b/objects/_unit.scss @@ -2,6 +2,8 @@ // Cactus - Objects - Grid - Unit //==================================================== +$default-gutter-width: map-get(map-get($cactus-gutter-config, sizes), default); + // The unit acts like a column with percentage width of its parent. It should // always be the direct decendant a `.cactus__g` element. @@ -10,11 +12,11 @@ * .cactus__u--1-5 // 1/5th width unit (20%) */ -[class *= "o-#{$cactus-prefix}__u"] { +[class *= 'o-#{$cactus-prefix}__u'] { display: inline-block; - font-size: $cactus-base-font-size; - padding-left: usable-gutter(map-get(map-get($cactus-gutter-config, sizes), default)); - padding-right: usable-gutter(map-get(map-get($cactus-gutter-config, sizes), default)); + font-size: $cactus-base-font-size; // Re asign font-size + padding-left: usable-gutter($default-gutter-width); + padding-right: usable-gutter($default-gutter-width); vertical-align: top; } @@ -25,9 +27,9 @@ $cactus-unit-keys: map-keys($cactus-unit-config); // Loop through keys and generate classes @each $bp in $cactus-unit-keys { - $bp-name: map-deep-get($cactus-unit-config, $bp, "name"); - $bp-breakpoint: map-deep-get($cactus-unit-config, $bp, "breakpoint"); - $bp-units: map-deep-get($cactus-unit-config, $bp, "units"); + $bp-name: map-deep-get($cactus-unit-config, $bp, 'name'); + $bp-breakpoint: map-deep-get($cactus-unit-config, $bp, 'breakpoint'); + $bp-units: map-deep-get($cactus-unit-config, $bp, 'units'); // If no breakpoint is defined, don't wrap in media query i.e. // .o-cactus--1-2 diff --git a/objects/grid/_wrapper.scss b/objects/_wrapper.scss similarity index 100% rename from objects/grid/_wrapper.scss rename to objects/_wrapper.scss diff --git a/objects/grid/_all.scss b/objects/grid/_all.scss deleted file mode 100644 index 963c59f..0000000 --- a/objects/grid/_all.scss +++ /dev/null @@ -1,3 +0,0 @@ -@import 'wrapper'; -@import 'group'; -@import 'unit'; diff --git a/package.json b/package.json index e4c474c..f1591c2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cactus-framework", - "version": "1.0.0", + "version": "1.1.0", "description": "Light weight CSS framework based on ITCSS, BEM and Scss.", "main": "application.scss", "scripts": { diff --git a/settings/_grid.scss b/settings/_grid.scss index ef40e29..8c70f3e 100644 --- a/settings/_grid.scss +++ b/settings/_grid.scss @@ -51,7 +51,7 @@ $cactus-unit-config: ( units: (1 1, 1 2, 1 3, 2 3, 1 4, 3 4) ), large: ( - name: m, + name: l, breakpoint: 75em, units: (1 1, 1 2, 1 3, 2 3, 1 4, 3 4) ), From f35fd392ba36eb85f41f5cda61988ca6f9841d3b Mon Sep 17 00:00:00 2001 From: Joe Dinsdale Date: Fri, 2 Dec 2016 20:36:57 +0000 Subject: [PATCH 3/3] Added missing change to log --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f74734b..a6d541d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## Improvements +* Removed dependency on `$cactus-breakpoint-config` to list required breakpoint keys. * Streamlined unit gutter generation to avoid repetition. * Restructured objects to avoid nesting. * Included Normalize 5.0.