From 051a3d1b9bf3fd7ef9671056f2ed019bd547af31 Mon Sep 17 00:00:00 2001 From: Matthew Date: Sat, 1 Aug 2015 17:36:11 +1000 Subject: [PATCH] ** Base V2.3.5 ** - Fixed :active state on custom buttons in _assets.less/_assets.scss - Version bump on package.json - Version bump on style.less/style.scss - Added minor comment to gulpfile.js --- changelog.markdown | 9 +++++++++ gulpfile.js | 1 + less/base/_assets.less | 2 +- less/style.less | 2 +- package.json | 2 +- scss/base/_assets.scss | 2 +- scss/style.scss | 2 +- style.css | 7 ++++--- 8 files changed, 19 insertions(+), 8 deletions(-) diff --git a/changelog.markdown b/changelog.markdown index c71a71b3..c18d694c 100644 --- a/changelog.markdown +++ b/changelog.markdown @@ -1,5 +1,14 @@ # Base 2 Change Log + +## [2.3.5] - 2015-08-01 +### Base V2.3.5 +- Fixed :active state on custom buttons in _assets.less/_assets.scss +- Version bump on package.json +- Version bump on style.less/style.scss +- Added minor comment to gulpfile.js + + ## [2.3.4] - 2015-07-15 ### Base V2.3.4 - Added display helpers for _print.less/_print.scss diff --git a/gulpfile.js b/gulpfile.js index 319ef655..081e3104 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,3 +1,4 @@ +// Base Gulp File - Compiling LESS/SCSS var gulp = require('gulp'), watch = require('gulp-watch'), sass = require('gulp-sass'), diff --git a/less/base/_assets.less b/less/base/_assets.less index eb651024..672586a8 100644 --- a/less/base/_assets.less +++ b/less/base/_assets.less @@ -14,8 +14,8 @@ -webkit-transition: all 0.3s; -moz-transition: all 0.3s; transition: all 0.3s; + &:hover, &:active { text-decoration: none; } &:hover { background: #f9f9f9; } - &:active { background: #fff; } } .button-primary { // Add your styles here diff --git a/less/style.less b/less/style.less index 6ebdedec..0f958aa2 100644 --- a/less/style.less +++ b/less/style.less @@ -2,7 +2,7 @@ // Base Stylesheet - http://getbase.org // Author: Matthew Hartman - http://www.matthewhartman.com.au/ -// Version: 2.3.4 - Last Updated: July 15, 2015 +// Version: 2.3.5 - Last Updated: August 1, 2015 // ========================================================================== diff --git a/package.json b/package.json index f375eb40..bd2ad0bc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "base", - "version": "2.3.4", + "version": "2.3.5", "homepage": "http://getbase.org/", "repository": { "type": "git", diff --git a/scss/base/_assets.scss b/scss/base/_assets.scss index 504c3db9..0238e697 100644 --- a/scss/base/_assets.scss +++ b/scss/base/_assets.scss @@ -14,8 +14,8 @@ -webkit-transition: all 0.3s; -moz-transition: all 0.3s; transition: all 0.3s; + &:hover, &:active { text-decoration: none; } &:hover { background: #f9f9f9; } - &:active { background: #fff; } } .button-primary { // Add your styles here diff --git a/scss/style.scss b/scss/style.scss index a4990c1f..ed3736e7 100644 --- a/scss/style.scss +++ b/scss/style.scss @@ -2,7 +2,7 @@ // Base Stylesheet - http://getbase.org // Author: Matthew Hartman - http://www.matthewhartman.com.au/ -// Version: 2.3.4 - Last Updated: July 15, 2015 +// Version: 2.3.5 - Last Updated: August 1, 2015 // ========================================================================== diff --git a/style.css b/style.css index b80049d4..85d5b094 100644 --- a/style.css +++ b/style.css @@ -426,12 +426,13 @@ input::-moz-focus-inner { -moz-transition: all 0.3s; transition: all 0.3s; } +.button:hover, +.button:active { + text-decoration: none; +} .button:hover { background: #f9f9f9; } -.button:active { - background: #fff; -} .button-link { color: #cd5c5c; text-decoration: underline;