From 089c424b6d4d2f21d61916155d35632bbce76558 Mon Sep 17 00:00:00 2001 From: Matthew Date: Wed, 18 Nov 2015 18:30:56 +1100 Subject: [PATCH] Base V2.6.7 - Added float helpers for tablet, desktop and HD devices in _helpers.less/_helpers.scss - Removed _minimal-grid.less (general house cleaning) - Version bump on package.json and bower.json - Version bump on style.less/style.scss --- changelog.markdown | 8 ++ dist/style.css | 18 +++++ package.json | 2 +- src/less/base/_grid-minimal.less | 131 ------------------------------- src/less/base/_helpers.less | 12 +++ src/less/style.less | 2 +- src/scss/base/_helpers.scss | 12 +++ src/scss/style.scss | 2 +- src/style.css | 18 +++++ 9 files changed, 71 insertions(+), 134 deletions(-) delete mode 100644 src/less/base/_grid-minimal.less diff --git a/changelog.markdown b/changelog.markdown index 108e2b45..e78280f9 100644 --- a/changelog.markdown +++ b/changelog.markdown @@ -1,6 +1,14 @@ # Base 2 Change Log +## [2.6.7] - 2015-11-18 +### Base V2.6.7 +- Added float helpers for tablet, desktop and HD devices in _helpers.less/_helpers.scss +- Removed _minimal-grid.less (general house cleaning) +- Version bump on package.json and bower.json +- Version bump on style.less/style.scss + + ## [2.6.6] - 2015-11-13 ### Base V2.6.6 - Updated font-weight variables to memorable names in _variables.less/_variables.scss diff --git a/dist/style.css b/dist/style.css index 39348961..27848237 100644 --- a/dist/style.css +++ b/dist/style.css @@ -1318,6 +1318,12 @@ input::-moz-focus-inner { .inline-tablet { display: inline; } + .left-tablet { + float: left; + } + .right-tablet { + float: right; + } .text-left-tablet { text-align: left; } @@ -1361,6 +1367,12 @@ input::-moz-focus-inner { .inline-desktop { display: inline; } + .left-desktop { + float: left; + } + .right-desktop { + float: right; + } .text-left-desktop { text-align: left; } @@ -1404,6 +1416,12 @@ input::-moz-focus-inner { .inline-hd { display: inline; } + .left-hd { + float: left; + } + .right-hd { + float: right; + } .text-left-hd { text-align: left; } diff --git a/package.json b/package.json index b48257d1..4bb4819d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "base", - "version": "2.6.6", + "version": "2.6.7", "homepage": "http://getbase.org/", "repository": { "type": "git", diff --git a/src/less/base/_grid-minimal.less b/src/less/base/_grid-minimal.less deleted file mode 100644 index d654a26c..00000000 --- a/src/less/base/_grid-minimal.less +++ /dev/null @@ -1,131 +0,0 @@ -// ========================================================================== -// Base – Mobile-First Minimal Grid -// ========================================================================== - -// Micro Clearfix - http://nicolasgallagher.com/micro-clearfix-hack/ -.clear:before, .clear:after { content: " "; display: table; } .clear:after { clear: both; } -.row:before, .row:after { content: ""; display: table; } .row:after { clear: both; } - -.row { - position: relative; - margin-left: -15px; - margin-right: -15px; -} - -// Mobile Container -.container { - padding-left: 15px; - padding-right: 15px; - margin-left: auto; - margin-right: auto; -} -.container-full { - padding-left: 0; - padding-right: 0; - margin-left: auto; - margin-right: auto; -} -// Tablet Container -@media only screen and (min-width: @tablet-breakpoint) { - .container, .container-full { - width: @tablet-container; - } - .tablet-container { - width: @tablet-container; - padding-left: 15px; - padding-right: 15px; - margin-left: auto; - margin-right: auto; - } - .tablet-container-full { - width: @tablet-container; - margin-left: auto; - margin-right: auto; - padding-left: 0; - padding-right: 0; - } -} -// Desktop Container -@media only screen and (min-width: @desktop-breakpoint) { - .container, .container-full { - width: @desktop-container; - } - .desktop-container { - width: @desktop-container; - padding-left: 15px; - padding-right: 15px; - margin-left: auto; - margin-right: auto; - } - .desktop-container-full { - width: @desktop-container; - margin-left: auto; - margin-right: auto; - padding-left: 0; - padding-right: 0; - } -} -// HD Container -@media only screen and (min-width: @hd-breakpoint) { - .container, .container-full { - width: @hd-container; - } - .hd-container { - width: @hd-container; - padding-left: 15px; - padding-right: 15px; - margin-left: auto; - margin-right: auto; - } - .hd-container-full { - width: @hd-container; - margin-left: auto; - margin-right: auto; - padding-left: 0; - padding-right: 0; - } -} - -// Mobile-first Grid Columns - Global Rules -.col-1, .col-2, .col-3, .col-4, .col-5, .col-6, .col-7, .col-8, .col-9, .col-10, .col-11, .col-12, .col-1-4, .col-1-3, .col-1-2 { - padding-left: 15px; - padding-right: 15px; - position: relative; - float: left; -} - -// Grid -.generate-grid (12); -.generate-grid (@index) when (@index > 0) { - .generate-grid (@index - 1); - .col-@{index} { - width: @index / 12 * 100%; - } -} -.col-1-4 { width: 3 / 12 * 100%; } -.col-1-3 { width: 4 / 12 * 100%; } -.col-1-2 { width: 6 / 12 * 100%; } - -// Tablet Grid -@media only screen and (min-width: @tablet-breakpoint) { - - .col-tablet-1-4 { width: 3 / 12 * 100%; } - .col-tablet-1-3 { width: 4 / 12 * 100%; } - .col-tablet-1-2 { width: 6 / 12 * 100%; } -} - -// Desktop Grid -@media only screen and (min-width: @desktop-breakpoint) { - - .col-desktop-1-4 { width: 3 / 12 * 100%; } - .col-desktop-1-3 { width: 4 / 12 * 100%; } - .col-desktop-1-2 { width: 6 / 12 * 100%; } -} - -// HD Grid -@media only screen and (min-width: @hd-breakpoint) { - - .col-hd-1-4 { width: 3 / 12 * 100%; } - .col-hd-1-3 { width: 4 / 12 * 100%; } - .col-hd-1-2 { width: 6 / 12 * 100%; } -} \ No newline at end of file diff --git a/src/less/base/_helpers.less b/src/less/base/_helpers.less index f95203f7..b3e4732c 100644 --- a/src/less/base/_helpers.less +++ b/src/less/base/_helpers.less @@ -181,6 +181,10 @@ .block-tablet { display: block; } .inline-block-tablet { display: inline-block; } .inline-tablet { display: inline; } + + // Floats + .left-tablet { float: left; } + .right-tablet { float: right; } // Text Alignments .text-left-tablet { text-align: left; } @@ -210,6 +214,10 @@ .inline-block-desktop { display: inline-block; } .inline-desktop { display: inline; } + // Floats + .left-desktop { float: left; } + .right-desktop { float: right; } + // Text Alignments .text-left-desktop { text-align: left; } .text-right-desktop { text-align: right; } @@ -238,6 +246,10 @@ .inline-block-hd { display: inline-block; } .inline-hd { display: inline; } + // Floats + .left-hd { float: left; } + .right-hd { float: right; } + // Text Alignments .text-left-hd { text-align: left; } .text-right-hd { text-align: right; } diff --git a/src/less/style.less b/src/less/style.less index 4aa9cc2d..1d618bd2 100644 --- a/src/less/style.less +++ b/src/less/style.less @@ -2,7 +2,7 @@ // Base Stylesheet - http://getbase.org // Author: Matthew Hartman - http://www.matthewhartman.com.au/ -// Version: 2.6.6 - Last Updated: November 13, 2015 +// Version: 2.6.7 - Last Updated: November 18, 2015 // ========================================================================== diff --git a/src/scss/base/_helpers.scss b/src/scss/base/_helpers.scss index 2643385c..87072452 100644 --- a/src/scss/base/_helpers.scss +++ b/src/scss/base/_helpers.scss @@ -181,6 +181,10 @@ .block-tablet { display: block; } .inline-block-tablet { display: inline-block; } .inline-tablet { display: inline; } + + // Floats + .left-tablet { float: left; } + .right-tablet { float: right; } // Text Alignments .text-left-tablet { text-align: left; } @@ -210,6 +214,10 @@ .inline-block-desktop { display: inline-block; } .inline-desktop { display: inline; } + // Floats + .left-desktop { float: left; } + .right-desktop { float: right; } + // Text Alignments .text-left-desktop { text-align: left; } .text-right-desktop { text-align: right; } @@ -238,6 +246,10 @@ .inline-block-hd { display: inline-block; } .inline-hd { display: inline; } + // Floats + .left-hd { float: left; } + .right-hd { float: right; } + // Text Alignments .text-left-hd { text-align: left; } .text-right-hd { text-align: right; } diff --git a/src/scss/style.scss b/src/scss/style.scss index a7f1f69c..662e9f09 100644 --- a/src/scss/style.scss +++ b/src/scss/style.scss @@ -2,7 +2,7 @@ // Base Stylesheet - http://getbase.org // Author: Matthew Hartman - http://www.matthewhartman.com.au/ -// Version: 2.6.6 - Last Updated: November 13, 2015 +// Version: 2.6.7 - Last Updated: November 18, 2015 // ========================================================================== diff --git a/src/style.css b/src/style.css index 39348961..27848237 100644 --- a/src/style.css +++ b/src/style.css @@ -1318,6 +1318,12 @@ input::-moz-focus-inner { .inline-tablet { display: inline; } + .left-tablet { + float: left; + } + .right-tablet { + float: right; + } .text-left-tablet { text-align: left; } @@ -1361,6 +1367,12 @@ input::-moz-focus-inner { .inline-desktop { display: inline; } + .left-desktop { + float: left; + } + .right-desktop { + float: right; + } .text-left-desktop { text-align: left; } @@ -1404,6 +1416,12 @@ input::-moz-focus-inner { .inline-hd { display: inline; } + .left-hd { + float: left; + } + .right-hd { + float: right; + } .text-left-hd { text-align: left; }