From 44b84d1d94091ae9fc95584a2f16757a971722d9 Mon Sep 17 00:00:00 2001 From: Greg Dalrymple Date: Tue, 23 Jun 2015 08:54:00 +0100 Subject: [PATCH 01/11] removing includes --- containers/_clear.scss | 22 +++++++--------------- containers/_media-item.scss | 2 +- grid/_collapse-fix.scss | 15 +++------------ grid/_grid-fraction.scss | 9 ++++----- grid/_grid-item-padding.scss | 18 ++++-------------- grid/_grid-item.scss | 17 ++++------------- grid/_grid-row-divs.scss | 11 +++++------ grid/_grid-row.scss | 23 +++++++---------------- screen/_screen-size.scss | 4 ++-- 9 files changed, 37 insertions(+), 84 deletions(-) diff --git a/containers/_clear.scss b/containers/_clear.scss index 8a98bae..708628a 100644 --- a/containers/_clear.scss +++ b/containers/_clear.scss @@ -3,20 +3,12 @@ From http://nicolasgallagher.com/micro-clearfix-hack/ */ -@mixin clear($include: extend) { - @if $include != "extend" { - zoom: 1; +@mixin clear { + zoom: 1; - &:after { - content: ''; - display: table; - clear: both; - } - } @else { - @extend %clear; + &:after { + content: ''; + display: table; + clear: both; } -} - -%clear { - @include clear(include); -} +} \ No newline at end of file diff --git a/containers/_media-item.scss b/containers/_media-item.scss index 40e1cf6..298f3ba 100644 --- a/containers/_media-item.scss +++ b/containers/_media-item.scss @@ -9,7 +9,7 @@ @mixin media-item($include:extend) { @if $include != "extend" { - @include clear($include); + @include clear; @include vertical-spacing(); display:block; } diff --git a/grid/_collapse-fix.scss b/grid/_collapse-fix.scss index 5599ed8..cf5e96e 100644 --- a/grid/_collapse-fix.scss +++ b/grid/_collapse-fix.scss @@ -1,15 +1,6 @@ /** * See: http://css-tricks.com/make-sure-columns-dont-collapse-horizontally/ */ -@mixin collapse-fix($include: extend) { - @if $include != "extend" { - min-height:1px; - } - @else { - @extend %collapse-fix; - } -} - -%collapse-fix { - @include collapse-fix(include); -} +@mixin collapse-fix { + min-height:1px; +} \ No newline at end of file diff --git a/grid/_grid-fraction.scss b/grid/_grid-fraction.scss index d0c77fb..cdbb6be 100644 --- a/grid/_grid-fraction.scss +++ b/grid/_grid-fraction.scss @@ -7,17 +7,16 @@ */ @mixin grid-fraction( $n, -$d, -$include:extend +$d ) { @include is-old-ie { .ie-inner { - @include grid-item-padding($include); + @include grid-item-padding; } } @include is-not-old-ie { - @include grid-item-padding($include); + @include grid-item-padding; } - @include grid-item($include); + @include grid-item; @include fraction($n, $d); } \ No newline at end of file diff --git a/grid/_grid-item-padding.scss b/grid/_grid-item-padding.scss index 3531c27..cb58d6b 100644 --- a/grid/_grid-item-padding.scss +++ b/grid/_grid-item-padding.scss @@ -1,15 +1,5 @@ -@mixin grid-item-padding($include: extend) { - @if $include != "extend" { - @include border-box(include); - @include rem(padding-left, $gutter/2); - @include rem(padding-right, $gutter/2); - } - @else { - @include border-box; - @extend %grid-item-padding; - } -} - -%grid-item-padding { - @include grid-item-padding(include); +@mixin grid-item-padding { + @include border-box(include); + @include rem(padding-left, $gutter/2); + @include rem(padding-right, $gutter/2); } diff --git a/grid/_grid-item.scss b/grid/_grid-item.scss index df11ec9..638adde 100644 --- a/grid/_grid-item.scss +++ b/grid/_grid-item.scss @@ -1,13 +1,4 @@ -@mixin grid-item($include: extend) { - @if $include != "extend" { - @include collapse-fix($include); - float:$main-start; - } - @else { - @extend %grid-item; - } -} - -%grid-item { - @include grid-item(include); -} +@mixin grid-item { + @include collapse-fix; + float:$main-start; +} \ No newline at end of file diff --git a/grid/_grid-row-divs.scss b/grid/_grid-row-divs.scss index 8f9fcc4..0b3e13a 100644 --- a/grid/_grid-row-divs.scss +++ b/grid/_grid-row-divs.scss @@ -6,23 +6,22 @@ * can split it's content into equal sections in the grid. */ @mixin grid-row-divs( -$n:1, -$include:extend +$n:1 ) { - @include grid-row(include); + @include grid-row; @if $n > 1 { @include divisions($n); &> * { @include is-old-ie { .ie-inner { - @include grid-item-padding($include); + @include grid-item-padding; } } @include is-not-old-ie { - @include grid-item-padding($include); + @include grid-item-padding; } - @include grid-item($include); + @include grid-item; } } } diff --git a/grid/_grid-row.scss b/grid/_grid-row.scss index 412691f..b9698f4 100644 --- a/grid/_grid-row.scss +++ b/grid/_grid-row.scss @@ -1,20 +1,11 @@ /** * Used to contain a number of grid items, adds negative margins to the left and right */ -@mixin grid-row($include: extend) { - @if $include != "extend" { - @include clear(include); - @include margin(n (-$gutter/2)); - @include is-old-ie { - @include margin(n (-$gutter)); - position:relative; - } +@mixin grid-row { + @include clear; + @include margin(n (-$gutter/2)); + @include is-old-ie { + @include margin(n (-$gutter)); + position:relative; } - @else { - @extend %grid-row; - } -} - -%grid-row { - @include grid-row(include); -} +} \ No newline at end of file diff --git a/screen/_screen-size.scss b/screen/_screen-size.scss index 2b7cf12..d0fe572 100644 --- a/screen/_screen-size.scss +++ b/screen/_screen-size.scss @@ -18,7 +18,7 @@ $ss @content; } } - @if $ss == "md" { + @if $ss == "sm-md" { @media only screen and (min-width:screen-size(small)) and (max-width: screen-size(medium)) { @content; } @@ -33,7 +33,7 @@ $ss @content; } } - @if $ss == "lg" { + @if $ss == "md-lg" { @media only screen and (min-width:screen-size(medium)) and (max-width: screen-size(large)) { @content; } From 53584426970722f9ae094f86b7a37db6d426c7bf Mon Sep 17 00:00:00 2001 From: Sean Mulvenna Date: Wed, 12 Aug 2015 09:34:52 +0100 Subject: [PATCH 02/11] Add new screen size option --- screen/_screen-size.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/screen/_screen-size.scss b/screen/_screen-size.scss index d0fe572..1aaef50 100644 --- a/screen/_screen-size.scss +++ b/screen/_screen-size.scss @@ -48,6 +48,11 @@ $ss @content; } } + @if $ss == "lg-xl" { + @media only screen and (min-width:screen-size(large)) and (max-width: screen-size(x-large)) { + @content; + } + } @if $ss == "xl-min" { @media only screen and (min-width: screen-size(x-large) ) { @content; From 155b07fd3b556f9778da2e6ff4aa8dd91f2141d4 Mon Sep 17 00:00:00 2001 From: Greg Dalrymple Date: Mon, 24 Aug 2015 14:50:13 +0100 Subject: [PATCH 03/11] cutting down on the text inputs --- forms/_button.scss | 9 +++++++++ forms/_text-inputs.scss | 12 +----------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/forms/_button.scss b/forms/_button.scss index 957a00e..46b9786 100644 --- a/forms/_button.scss +++ b/forms/_button.scss @@ -39,9 +39,18 @@ @if $has-button-border == yes { border: $button-border-width solid; border-color: darken($button-color, 5%); + + &:hover { + border-color: darken($button-color, 10%); + } + } @else { border: 1px solid; border-color: $button-color; + + &:hover { + border-color: darken($button-color, 5%); + } } // Border Radius Settings diff --git a/forms/_text-inputs.scss b/forms/_text-inputs.scss index 2934f5b..11f1389 100644 --- a/forms/_text-inputs.scss +++ b/forms/_text-inputs.scss @@ -3,17 +3,7 @@ $inputs-list: 'input[type="email"]', 'input[type="password"]', 'input[type="search"]', 'input[type="tel"]', -'input[type="text"]', -'input[type="url"]', - -// Webkit & Gecko may change the display of these in the future -'input[type="color"]', -'input[type="date"]', -'input[type="datetime"]', -'input[type="datetime-local"]', -'input[type="month"]', -'input[type="time"]', -'input[type="week"]'; +'input[type="text"]'; $unquoted-inputs-list: (); @each $input-type in $inputs-list { From c4cc3df670bfbc445441a2e1ba8ad06e7c3f5504 Mon Sep 17 00:00:00 2001 From: Greg Dalrymple Date: Mon, 24 Aug 2015 15:40:09 +0100 Subject: [PATCH 04/11] common text inputs --- forms/_text-inputs.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/forms/_text-inputs.scss b/forms/_text-inputs.scss index 11f1389..33aaa33 100644 --- a/forms/_text-inputs.scss +++ b/forms/_text-inputs.scss @@ -3,7 +3,8 @@ $inputs-list: 'input[type="email"]', 'input[type="password"]', 'input[type="search"]', 'input[type="tel"]', -'input[type="text"]'; +'input[type="text"]', +'input[type="date"]'; $unquoted-inputs-list: (); @each $input-type in $inputs-list { From 58ea76bbe98c811d934cd83ed8cd125a98398b2c Mon Sep 17 00:00:00 2001 From: Greg Dalrymple Date: Wed, 11 Nov 2015 16:26:10 +0000 Subject: [PATCH 05/11] full width form inputs on mobile by default --- forms/_field.scss | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/forms/_field.scss b/forms/_field.scss index f7afa13..52593ce 100644 --- a/forms/_field.scss +++ b/forms/_field.scss @@ -9,7 +9,12 @@ $width:auto line-height: $touch-target/2; max-width:100%; min-height: $touch-target*1.1; - width:$width; + width: 100%; + + @include screen-size( sm-min ) + { + width:$width; + } @if $field-font-family { font-family: $field-font-family; From a9cd1772473265535b54059c1a1dac21475e64b9 Mon Sep 17 00:00:00 2001 From: Sam Thompson Date: Thu, 19 Nov 2015 11:39:21 +0000 Subject: [PATCH 06/11] composer support --- README.md | 18 ++++++++++++++++-- composer.json | 6 ++++++ 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 composer.json diff --git a/README.md b/README.md index b711640..58d6319 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,20 @@ -Patterns -============ +# Patterns Patterns is the GCD SCSS library. It is a framework which provides a functionality for features commonly used in CSS. +## Composer +The patterns library can be included with composer, by adding the following to your composer.json: + + "require": { + "gcd/scss-patterns": "dev-master" + }, + "repositories": [ + { + "type": "vcs", + "url": "git@github.com:GCDTech/patterns.git" + } + ] + +## Submodule (legacy) + Patterns is designed to be used as a submodule and should be located in the public/scss folder. diff --git a/composer.json b/composer.json new file mode 100644 index 0000000..3f78ea5 --- /dev/null +++ b/composer.json @@ -0,0 +1,6 @@ +{ + "name": "gcd/scss-patterns", + "description": "GCD SCSS Patterns Library", + "license": "Apache-2.0", + "minimum-stability": "dev" +} From 74e297a4297336b92b114a3bc582a9b9d9d64e6f Mon Sep 17 00:00:00 2001 From: Greg Dalrymple Date: Mon, 7 Dec 2015 14:18:12 +0000 Subject: [PATCH 07/11] added the zindex function --- functions/_all.scss | 3 ++- functions/_zindex.scss | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 functions/_zindex.scss diff --git a/functions/_all.scss b/functions/_all.scss index c74519f..61e8f50 100644 --- a/functions/_all.scss +++ b/functions/_all.scss @@ -15,4 +15,5 @@ $em-base: 16; @import "shape-size-stripper"; @import "strip-units"; @import "tint-shade"; -@import "unpack"; \ No newline at end of file +@import "unpack"; +@import "zindex"; \ No newline at end of file diff --git a/functions/_zindex.scss b/functions/_zindex.scss new file mode 100644 index 0000000..3096f9f --- /dev/null +++ b/functions/_zindex.scss @@ -0,0 +1,8 @@ +@function z-index($key) { + @if map-has-key($zindex, $key) { + @return map-get($zindex, $key); + } @else { + @warn "Unknown `#{$key}` in $zindex."; + @return null; + } +} From c7cd9ed722069c66e4ed5d1854f1f11ffda4f79e Mon Sep 17 00:00:00 2001 From: seanmulvenna Date: Wed, 29 Jun 2016 10:15:01 +0100 Subject: [PATCH 08/11] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 3f78ea5..f9c5e72 100644 --- a/composer.json +++ b/composer.json @@ -2,5 +2,5 @@ "name": "gcd/scss-patterns", "description": "GCD SCSS Patterns Library", "license": "Apache-2.0", - "minimum-stability": "dev" + "minimum-stability": "stable" } From adecb1e48a41079884e07955b64251ab550dc972 Mon Sep 17 00:00:00 2001 From: seanmulvenna Date: Wed, 29 Jun 2016 10:18:58 +0100 Subject: [PATCH 09/11] Update composer.json --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index f9c5e72..fb53328 100644 --- a/composer.json +++ b/composer.json @@ -2,5 +2,4 @@ "name": "gcd/scss-patterns", "description": "GCD SCSS Patterns Library", "license": "Apache-2.0", - "minimum-stability": "stable" } From fb355ea094bbd7872667243b7c621304a6261d56 Mon Sep 17 00:00:00 2001 From: seanmulvenna Date: Wed, 29 Jun 2016 10:20:44 +0100 Subject: [PATCH 10/11] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index fb53328..2732c5a 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { "name": "gcd/scss-patterns", "description": "GCD SCSS Patterns Library", - "license": "Apache-2.0", + "license": "Apache-2.0" } From 9752c400d22e18e6c29ad6be1398a692ffb75e64 Mon Sep 17 00:00:00 2001 From: Simon Gough Date: Thu, 4 Jul 2019 10:32:29 +0100 Subject: [PATCH 11/11] added closing ; --- screen/_all.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/screen/_all.scss b/screen/_all.scss index 0ab0683..ff33de7 100644 --- a/screen/_all.scss +++ b/screen/_all.scss @@ -8,4 +8,4 @@ */ -@import "screen-size" \ No newline at end of file +@import "screen-size";