From 21e00f67372b81bb8bf95cb29a4db18680a1c827 Mon Sep 17 00:00:00 2001
From: Daniel Box <danielbox@gmail.com>
Date: Tue, 23 Feb 2016 20:05:46 -0600
Subject: [PATCH 1/3] newer clearfix per #255

---
 axis/layout.styl                      |  2 +-
 test/fixtures/additive/framework.css  |  2 +-
 test/fixtures/layout/group.css        |  4 ++--
 test/fixtures/typography/blockquo.css |  2 +-
 test/fixtures/typography/lists.css    |  2 +-
 test/fixtures/ui/breadcrumb.css       |  2 +-
 test/fixtures/ui/bubble.css           | 26 +++++++++++++-------------
 test/fixtures/ui/flash.css            |  8 ++++----
 test/fixtures/ui/navigation.css       |  2 +-
 test/fixtures/ui/notice.css           |  2 +-
 10 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/axis/layout.styl b/axis/layout.styl
index 79b11b2..f306f12 100644
--- a/axis/layout.styl
+++ b/axis/layout.styl
@@ -6,7 +6,7 @@
 group()
   &:after
     content: ""
-    display: table
+    display: block
     clear: both
 
 // Alias: clearfix
diff --git a/test/fixtures/additive/framework.css b/test/fixtures/additive/framework.css
index 528326b..caf559b 100644
--- a/test/fixtures/additive/framework.css
+++ b/test/fixtures/additive/framework.css
@@ -132,7 +132,7 @@ blockquote {
 }
 blockquote:after {
   content: "";
-  display: table;
+  display: block;
   clear: both;
 }
 blockquote > p {
diff --git a/test/fixtures/layout/group.css b/test/fixtures/layout/group.css
index a69f495..f4228b9 100644
--- a/test/fixtures/layout/group.css
+++ b/test/fixtures/layout/group.css
@@ -1,10 +1,10 @@
 .group:after {
   content: "";
-  display: table;
+  display: block;
   clear: both;
 }
 .clearfix:after {
   content: "";
-  display: table;
+  display: block;
   clear: both;
 }
diff --git a/test/fixtures/typography/blockquo.css b/test/fixtures/typography/blockquo.css
index d4a756e..50d4051 100644
--- a/test/fixtures/typography/blockquo.css
+++ b/test/fixtures/typography/blockquo.css
@@ -5,7 +5,7 @@
 }
 .blockquote:after {
   content: "";
-  display: table;
+  display: block;
   clear: both;
 }
 .blockquote > p {
diff --git a/test/fixtures/typography/lists.css b/test/fixtures/typography/lists.css
index b45bb52..2133238 100644
--- a/test/fixtures/typography/lists.css
+++ b/test/fixtures/typography/lists.css
@@ -24,7 +24,7 @@
 }
 .inline-list:after {
   content: "";
-  display: table;
+  display: block;
   clear: both;
 }
 .inline-list li {
diff --git a/test/fixtures/ui/breadcrumb.css b/test/fixtures/ui/breadcrumb.css
index d57f8de..4cddccd 100644
--- a/test/fixtures/ui/breadcrumb.css
+++ b/test/fixtures/ui/breadcrumb.css
@@ -4,7 +4,7 @@
 }
 .breadcrumb:after {
   content: "";
-  display: table;
+  display: block;
   clear: both;
 }
 .breadcrumb li {
diff --git a/test/fixtures/ui/bubble.css b/test/fixtures/ui/bubble.css
index 3f94a8a..504040a 100644
--- a/test/fixtures/ui/bubble.css
+++ b/test/fixtures/ui/bubble.css
@@ -10,7 +10,7 @@
 }
 .bubble:after {
   content: "";
-  display: table;
+  display: block;
   clear: both;
 }
 .bubble:before {
@@ -51,7 +51,7 @@
 }
 .bubble-tl:after {
   content: "";
-  display: table;
+  display: block;
   clear: both;
 }
 .bubble-tl:before {
@@ -92,7 +92,7 @@
 }
 .bubble-tr:after {
   content: "";
-  display: table;
+  display: block;
   clear: both;
 }
 .bubble-tr:before {
@@ -133,7 +133,7 @@
 }
 .bubble-tc:after {
   content: "";
-  display: table;
+  display: block;
   clear: both;
 }
 .bubble-tc:before {
@@ -174,7 +174,7 @@
 }
 .bubble-bl:after {
   content: "";
-  display: table;
+  display: block;
   clear: both;
 }
 .bubble-bl:before {
@@ -215,7 +215,7 @@
 }
 .bubble-br:after {
   content: "";
-  display: table;
+  display: block;
   clear: both;
 }
 .bubble-br:before {
@@ -256,7 +256,7 @@
 }
 .bubble-bc:after {
   content: "";
-  display: table;
+  display: block;
   clear: both;
 }
 .bubble-bc:before {
@@ -297,7 +297,7 @@
 }
 .bubble-lt:after {
   content: "";
-  display: table;
+  display: block;
   clear: both;
 }
 .bubble-lt:before {
@@ -338,7 +338,7 @@
 }
 .bubble-lb:after {
   content: "";
-  display: table;
+  display: block;
   clear: both;
 }
 .bubble-lb:before {
@@ -379,7 +379,7 @@
 }
 .bubble-lc:after {
   content: "";
-  display: table;
+  display: block;
   clear: both;
 }
 .bubble-lc:before {
@@ -420,7 +420,7 @@
 }
 .bubble-rt:after {
   content: "";
-  display: table;
+  display: block;
   clear: both;
 }
 .bubble-rt:before {
@@ -461,7 +461,7 @@
 }
 .bubble-rb:after {
   content: "";
-  display: table;
+  display: block;
   clear: both;
 }
 .bubble-rb:before {
@@ -502,7 +502,7 @@
 }
 .bubble-rc:after {
   content: "";
-  display: table;
+  display: block;
   clear: both;
 }
 .bubble-rc:before {
diff --git a/test/fixtures/ui/flash.css b/test/fixtures/ui/flash.css
index f5135d7..6ba603c 100644
--- a/test/fixtures/ui/flash.css
+++ b/test/fixtures/ui/flash.css
@@ -13,7 +13,7 @@
 }
 .flash-notice:after {
   content: "";
-  display: table;
+  display: block;
   clear: both;
 }
 .flash-warning {
@@ -30,7 +30,7 @@
 }
 .flash-warning:after {
   content: "";
-  display: table;
+  display: block;
   clear: both;
 }
 .flash-error {
@@ -48,7 +48,7 @@
 }
 .flash-error:after {
   content: "";
-  display: table;
+  display: block;
   clear: both;
 }
 .flash-success {
@@ -66,6 +66,6 @@
 }
 .flash-success:after {
   content: "";
-  display: table;
+  display: block;
   clear: both;
 }
diff --git a/test/fixtures/ui/navigation.css b/test/fixtures/ui/navigation.css
index 73fc459..fd73bef 100644
--- a/test/fixtures/ui/navigation.css
+++ b/test/fixtures/ui/navigation.css
@@ -13,7 +13,7 @@
 }
 .navigation:after {
   content: "";
-  display: table;
+  display: block;
   clear: both;
 }
 .navigation h1 {
diff --git a/test/fixtures/ui/notice.css b/test/fixtures/ui/notice.css
index 611e4a4..6dd2f32 100644
--- a/test/fixtures/ui/notice.css
+++ b/test/fixtures/ui/notice.css
@@ -10,6 +10,6 @@
 }
 .notice:after {
   content: "";
-  display: table;
+  display: block;
   clear: both;
 }

From e972dc9dcbd6f3a5f617dee6edb9fcdf3b9eeab9 Mon Sep 17 00:00:00 2001
From: Daniel Box <danielbox@gmail.com>
Date: Tue, 23 Feb 2016 20:09:25 -0600
Subject: [PATCH 2/3] move range and radio to forms per #243

---
 axis/forms.styl                        | 142 +++++++++++++++++++++++++
 axis/ui.styl                           | 141 ------------------------
 test/fixtures/{ui => forms}/radio.css  |   0
 test/fixtures/{ui => forms}/radio.styl |   0
 test/fixtures/{ui => forms}/range.css  |   0
 test/fixtures/{ui => forms}/range.styl |   0
 test/test.coffee                       |  12 +--
 7 files changed, 148 insertions(+), 147 deletions(-)
 rename test/fixtures/{ui => forms}/radio.css (100%)
 rename test/fixtures/{ui => forms}/radio.styl (100%)
 rename test/fixtures/{ui => forms}/range.css (100%)
 rename test/fixtures/{ui => forms}/range.styl (100%)

diff --git a/axis/forms.styl b/axis/forms.styl
index 38dfedf..200f59b 100644
--- a/axis/forms.styl
+++ b/axis/forms.styl
@@ -179,6 +179,148 @@ field-success($color = $green)
   input
     input-success: $color
 
+// Mixin: Radio
+//
+// A simple reset for radio button styling across browsers. Takes a color.
+// Default color is blue. Use on the <label> which wraps your radio inputs.
+//
+// ex. radio()
+// ex. radio: gray
+// ex. radio(#FF1493)
+
+radio($color = #0074d9)
+  cursor: pointer
+  display: block
+  line-height: 2.5em
+
+  // Accessible hidden styles
+  [type="radio"]
+    border: 0
+    clip: rect(0 0 0 0)
+    height: 1px
+    margin: -1px
+    overflow: hidden
+    padding: 0
+    position: absolute
+    width: 1px
+
+    & + span
+      display: block
+
+    // Unchecked
+    & + span:before
+      background: rgba(#000,.15)
+      border: 0.125em solid #fff
+      border-radius: 1em
+      box-shadow: 0 0 0 .1em rgba(#000, .25)
+      content: ''
+      display: inline-block
+      height: 1em
+      margin-right: 0.75em
+      transition: 0.5s ease all
+      vertical-align: -0.33em
+      width: 1em
+
+    // Checked
+    &:checked + span:before, &:focus + span:before
+      background: $color
+      box-shadow: 0 0 0 0.25em rgba(#000, .15)
+
+// Mixin: Range
+//
+// A clean, cross-browser styling reset for range inputs.
+// Note: range inputs are not supported in IE9 and below.
+// http://caniuse.com/#feat=input-range
+//
+// ex. range()
+// ex. range: tomato 200px 15px 9px #333
+
+range($color = #0074d9, $track-width = 100%, $thumb-size = 2em, $track-height = .5em, $track-color = rgba(#000, .1))
+  -webkit-appearance: none
+  width: $track-width
+  margin: 0
+  outline: none
+  background: transparent
+
+  &::-webkit-slider-runnable-track
+    background: $track-color
+    border: none
+    border-radius: $track-height
+    height: $track-height
+    width: $track-width
+
+  &::-webkit-slider-thumb
+    -webkit-appearance: none
+    border: none
+    height: $thumb-size
+    width: $thumb-size
+    border-radius: 50%
+    background: $color
+    margin-top: "calc(-%s / 2 + %s / 2)" % ($thumb-size $track-height)
+    transition: all 0.2s ease
+
+    &:hover
+      transform: scale(1.2)
+      cursor: pointer
+
+    &:active
+      background: darken($color, 15%)
+
+  &:focus
+    outline: none
+
+  &:focus::-webkit-slider-runnable-track
+    background: $track-color
+
+  &::-moz-range-track
+    width: $track-width
+    height: $track-height
+    background: $track-color
+    border: none
+    border-radius: $track-height
+
+  &::-moz-range-thumb
+    border: none
+    height: $thumb-size
+    width: $thumb-size
+    border-radius: 50%
+    background: $color
+    transition: all 0.2s ease
+
+    &:hover
+      transform: scale(1.2)
+
+    &:active
+      background: darken($color, 15%)
+
+  &::-moz-focus-outer
+    border: 0
+
+  &::-ms-track
+    height: $track-height
+    width: $track-width
+    background: transparent
+    border-width: "calc(%s / 2 + %s / 2)" % ($thumb-size $track-height) 0
+    color: transparent;
+
+  &::-ms-fill-lower, &::-ms-fill-upper, &:focus::-ms-fill-lower, &:focus::-ms-fill-upper
+    background: $track-color
+    border-radius: 10px
+
+  &::-ms-thumb
+    border: none
+    height: 2em
+    width: 2em
+    border-radius: 50%
+    background: $color
+
+    &:active
+      background: darken($color, 15%)
+
+  &::-ms-tooltip
+    display: none
+
+
 // Additive Mixin: Fields
 //
 // WARNING: Creates classes in your css and styles them - not to be used inside
diff --git a/axis/ui.styl b/axis/ui.styl
index 4783408..6192589 100644
--- a/axis/ui.styl
+++ b/axis/ui.styl
@@ -355,144 +355,3 @@ flash-notices()
       flash(notice)
     &.success
       flash(success)
-
-// Mixin: Radio
-//
-// A simple reset for radio button styling across browsers. Takes a color.
-// Default color is blue. Use on the <label> which wraps your radio inputs.
-//
-// ex. radio()
-// ex. radio: gray
-// ex. radio(#FF1493)
-
-radio($color = #0074d9)
-  cursor: pointer
-  display: block
-  line-height: 2.5em
-
-  // Accessible hidden styles
-  [type="radio"]
-    border: 0
-    clip: rect(0 0 0 0)
-    height: 1px
-    margin: -1px
-    overflow: hidden
-    padding: 0
-    position: absolute
-    width: 1px
-
-    & + span
-      display: block
-
-    // Unchecked
-    & + span:before
-      background: rgba(#000,.15)
-      border: 0.125em solid #fff
-      border-radius: 1em
-      box-shadow: 0 0 0 .1em rgba(#000, .25)
-      content: ''
-      display: inline-block
-      height: 1em
-      margin-right: 0.75em
-      transition: 0.5s ease all
-      vertical-align: -0.33em
-      width: 1em
-
-    // Checked
-    &:checked + span:before, &:focus + span:before
-      background: $color
-      box-shadow: 0 0 0 0.25em rgba(#000, .15)
-
-// Mixin: Range
-//
-// A clean, cross-browser styling reset for range inputs.
-// Note: range inputs are not supported in IE9 and below.
-// http://caniuse.com/#feat=input-range
-//
-// ex. range()
-// ex. range: tomato 200px 15px 9px #333
-
-range($color = #0074d9, $track-width = 100%, $thumb-size = 2em, $track-height = .5em, $track-color = rgba(#000, .1))
-  -webkit-appearance: none
-  width: $track-width
-  margin: 0
-  outline: none
-  background: transparent
-
-  &::-webkit-slider-runnable-track
-    background: $track-color
-    border: none
-    border-radius: $track-height
-    height: $track-height
-    width: $track-width
-
-  &::-webkit-slider-thumb
-    -webkit-appearance: none
-    border: none
-    height: $thumb-size
-    width: $thumb-size
-    border-radius: 50%
-    background: $color
-    margin-top: "calc(-%s / 2 + %s / 2)" % ($thumb-size $track-height)
-    transition: all 0.2s ease
-
-    &:hover
-      transform: scale(1.2)
-      cursor: pointer
-
-    &:active
-      background: darken($color, 15%)
-
-  &:focus
-    outline: none
-
-  &:focus::-webkit-slider-runnable-track
-    background: $track-color
-
-  &::-moz-range-track
-    width: $track-width
-    height: $track-height
-    background: $track-color
-    border: none
-    border-radius: $track-height
-
-  &::-moz-range-thumb
-    border: none
-    height: $thumb-size
-    width: $thumb-size
-    border-radius: 50%
-    background: $color
-    transition: all 0.2s ease
-
-    &:hover
-      transform: scale(1.2)
-
-    &:active
-      background: darken($color, 15%)
-
-  &::-moz-focus-outer
-    border: 0
-
-  &::-ms-track
-    height: $track-height
-    width: $track-width
-    background: transparent
-    border-width: "calc(%s / 2 + %s / 2)" % ($thumb-size $track-height) 0
-    color: transparent;
-
-  &::-ms-fill-lower, &::-ms-fill-upper, &:focus::-ms-fill-lower, &:focus::-ms-fill-upper
-    background: $track-color
-    border-radius: 10px
-
-  &::-ms-thumb
-    border: none
-    height: 2em
-    width: 2em
-    border-radius: 50%
-    background: $color
-
-    &:active
-      background: darken($color, 15%)
-
-  &::-ms-tooltip
-    display: none
diff --git a/test/fixtures/ui/radio.css b/test/fixtures/forms/radio.css
similarity index 100%
rename from test/fixtures/ui/radio.css
rename to test/fixtures/forms/radio.css
diff --git a/test/fixtures/ui/radio.styl b/test/fixtures/forms/radio.styl
similarity index 100%
rename from test/fixtures/ui/radio.styl
rename to test/fixtures/forms/radio.styl
diff --git a/test/fixtures/ui/range.css b/test/fixtures/forms/range.css
similarity index 100%
rename from test/fixtures/ui/range.css
rename to test/fixtures/forms/range.css
diff --git a/test/fixtures/ui/range.styl b/test/fixtures/forms/range.styl
similarity index 100%
rename from test/fixtures/ui/range.styl
rename to test/fixtures/forms/range.styl
diff --git a/test/test.coffee b/test/test.coffee
index 822fa72..eb24e8e 100644
--- a/test/test.coffee
+++ b/test/test.coffee
@@ -71,6 +71,12 @@ describe 'forms', ->
   it 'autofill', (done) ->
       compile_and_match(path.join(@path, 'autofill.styl'), done)
 
+  it 'radio', (done) ->
+    compile_and_match(path.join(@path, 'radio.styl'), done)
+
+  it 'range', (done) ->
+    compile_and_match(path.join(@path, 'range.styl'), done)
+
 describe 'gradients', ->
 
   before -> @path = path.join(test_path, 'gradients')
@@ -266,12 +272,6 @@ describe 'ui', ->
   it 'notice', (done) ->
     compile_and_match(path.join(@path, 'notice.styl'), done)
 
-  it 'radio', (done) ->
-    compile_and_match(path.join(@path, 'radio.styl'), done)
-
-  it 'range', (done) ->
-    compile_and_match(path.join(@path, 'range.styl'), done)
-
 describe 'utilities', ->
 
   before -> @path = path.join(test_path, 'utilities')

From c6a8f70ffadc8f01952ab11f1d331faa5531e590 Mon Sep 17 00:00:00 2001
From: Daniel Box <danielbox@gmail.com>
Date: Tue, 23 Feb 2016 20:14:34 -0600
Subject: [PATCH 3/3] rename range to range-input to avoid stylus conflicts per
 #261

---
 axis/forms.styl                | 4 ++--
 test/fixtures/forms/range.styl | 2 +-
 test/test.coffee               | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/axis/forms.styl b/axis/forms.styl
index 200f59b..884e156 100644
--- a/axis/forms.styl
+++ b/axis/forms.styl
@@ -226,7 +226,7 @@ radio($color = #0074d9)
       background: $color
       box-shadow: 0 0 0 0.25em rgba(#000, .15)
 
-// Mixin: Range
+// Mixin: Range-input
 //
 // A clean, cross-browser styling reset for range inputs.
 // Note: range inputs are not supported in IE9 and below.
@@ -235,7 +235,7 @@ radio($color = #0074d9)
 // ex. range()
 // ex. range: tomato 200px 15px 9px #333
 
-range($color = #0074d9, $track-width = 100%, $thumb-size = 2em, $track-height = .5em, $track-color = rgba(#000, .1))
+range-input($color = #0074d9, $track-width = 100%, $thumb-size = 2em, $track-height = .5em, $track-color = rgba(#000, .1))
   -webkit-appearance: none
   width: $track-width
   margin: 0
diff --git a/test/fixtures/forms/range.styl b/test/fixtures/forms/range.styl
index 57dda8d..0209cb1 100644
--- a/test/fixtures/forms/range.styl
+++ b/test/fixtures/forms/range.styl
@@ -1,2 +1,2 @@
 .range
-  range()
+  range-input()
diff --git a/test/test.coffee b/test/test.coffee
index eb24e8e..92d89c7 100644
--- a/test/test.coffee
+++ b/test/test.coffee
@@ -74,7 +74,7 @@ describe 'forms', ->
   it 'radio', (done) ->
     compile_and_match(path.join(@path, 'radio.styl'), done)
 
-  it 'range', (done) ->
+  it 'range-input', (done) ->
     compile_and_match(path.join(@path, 'range.styl'), done)
 
 describe 'gradients', ->