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..2732c5a --- /dev/null +++ b/composer.json @@ -0,0 +1,5 @@ +{ + "name": "gcd/scss-patterns", + "description": "GCD SCSS Patterns Library", + "license": "Apache-2.0" +} 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/_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; diff --git a/forms/_text-inputs.scss b/forms/_text-inputs.scss index 2934f5b..33aaa33 100644 --- a/forms/_text-inputs.scss +++ b/forms/_text-inputs.scss @@ -4,16 +4,7 @@ $inputs-list: 'input[type="email"]', '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="date"]'; $unquoted-inputs-list: (); @each $input-type in $inputs-list { 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; + } +} 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"; 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;