fortitude-sass 0.7.5 → 0.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a20e88eeec2fe482af8a5dd90d57afeba6676437
-  data.tar.gz: 5c4bb7cf7f501514cbf79ac9ab15ae2a82b151bf
+  metadata.gz: 76acafe3d0206ab6c7b85734a4444826182b9c9c
+  data.tar.gz: 92bbf83546e0bfba89ee6b447802bf7237eb7112
 SHA512:
-  metadata.gz: a67c1af4d92181fc1ab54d8c8e1ffc966ebc08e75f51dad638726a8b78738d9f1ce2ab0e4c6ac845f0849eae5ea200c951928731e1827041c5eb99e219f1ff56
-  data.tar.gz: 5418163dc3e18bd75118454763c6fb428f5bff9892dc42d0cc9ea46edcd58d2f63cfa8fd0537e75aca72b6c182f0b02782e6111f13ab80a47e0c013f1a55f644
+  metadata.gz: e7cd77cb418619e37568e64050346d8473f4820be02a09984ffdbed0da479861d332357912f3f3edc46b098eb435d0fc1baa9427fc7c624dd231263b9fa5ae99
+  data.tar.gz: ac3c339f606a52d4aa1236ed6075e0e3c507d4526ad65b3a383e810c6cc71f6d2fae48be67ad1627ca5639327c3c1bebbf0a62a194ad029fc2abfee0aef5b9cb

data/.travis.yml

@@ -7,4 +7,6 @@ install:
   - npm install
 
 script:
-  - grunt test
+  - grunt test
+
+sudo: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fortitude-sass (0.7.5)
+    fortitude-sass (0.7.7)
       autoprefixer-rails
       execjs
       sass (~> 3.3)

data/LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2014-2015 Hired, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/app/assets/stylesheets/fortitude/api/components/_badge.scss

@@ -25,15 +25,17 @@ $fortitude-enable-badge--pill: false !default;
   $is-large: fortitude-contains($extensions, large);
   $is-pill: fortitude-contains($extensions, pill);
 
-  border: $fortitude-badge-border-width $fortitude-badge-border-style transparent;
-  display: inline-block;
-  vertical-align: middle;
-  font: inherit;
   background-color: transparent;
-  text-align: center;
+  border-color: transparent;
+  border-style: $fortitude-badge-border-style;
+  border-width: $fortitude-badge-border-width;
+  display: inline-block;
   font-size: $fortitude-badge-font-size;
+  font: inherit;
   height: $fortitude-badge-height--default;
   overflow: visible;
+  text-align: center;
+  vertical-align: middle;
   white-space: nowrap;
 
   @if $is-small {

data/app/assets/stylesheets/fortitude/api/components/_button.scss

@@ -29,7 +29,9 @@ $fortitude-global-border-box: false !default;
   $is-pill: fortitude-contains($extensions, pill);
 
   background-color: transparent;
-  border: $fortitude-button-border-width $fortitude-button-border-style transparent;
+  border-style: $fortitude-button-border-style;
+  border-width: $fortitude-button-border-width;
+  border-color: transparent;
   display: inline-block;
   vertical-align: middle;
   font: inherit;
@@ -89,8 +91,6 @@ $fortitude-global-border-box: false !default;
 
 @mixin fortitude-button--full {
   width: 100%;
-  padding-right: 0;
-  padding-left: 0;
 }
 
 @mixin fortitude-button--pill {

data/app/assets/stylesheets/fortitude/api/components/_input.scss

@@ -2,69 +2,53 @@
     #INPUT
 \*------------------------------------*/
 
-$fortitude-field-input-background-color: white !default;
-$fortitude-field-input-border-color: #a9a9a9 !default;
 $fortitude-field-input-border-radius: 0.2rem !default;
 $fortitude-field-input-border-style: solid !default;
 $fortitude-field-input-border-width: 0.1rem !default;
-$fortitude-field-input-height: fortitude-double($fortitude-base-spacing-unit) !default;
-$fortitude-field-input-placeholder-color: #a9a9a9 !default;
+$fortitude-field-input-height: 4rem !default;
+$fortitude-field-input-horizontal-padding: 1rem !default;
 
-$fortitude-text-input-background-color: $fortitude-field-input-background-color !default;
-$fortitude-text-input-border-color: $fortitude-field-input-border-color !default;
 $fortitude-text-input-border-radius: $fortitude-field-input-border-radius !default;
 $fortitude-text-input-border-style: $fortitude-field-input-border-style !default;
 $fortitude-text-input-border-width: $fortitude-field-input-border-width !default;
 $fortitude-text-input-height: $fortitude-field-input-height !default;
-$fortitude-text-input-placeholder-color: $fortitude-field-input-placeholder-color !default;
+$fortitude-text-input-horizontal-padding: $fortitude-field-input-horizontal-padding !default;
 
-$fortitude-textarea-input-background-color: $fortitude-field-input-background-color !default;
-$fortitude-textarea-input-border-color: $fortitude-field-input-border-color !default;
 $fortitude-textarea-input-border-radius: $fortitude-field-input-border-radius !default;
 $fortitude-textarea-input-border-style: $fortitude-field-input-border-style !default;
 $fortitude-textarea-input-border-width: $fortitude-field-input-border-width !default;
 $fortitude-textarea-input-height: $fortitude-field-input-height !default;
-$fortitude-textarea-input-placeholder-color: $fortitude-field-input-placeholder-color !default;
+$fortitude-textarea-input-min-height: $fortitude-field-input-height * 2 !default;
+$fortitude-textarea-input-horizontal-padding: $fortitude-field-input-horizontal-padding !default;
 
-$fortitude-select-input-background-color: $fortitude-field-input-background-color !default;
-$fortitude-select-input-border-color: $fortitude-field-input-border-color !default;
 $fortitude-select-input-border-radius: $fortitude-field-input-border-radius !default;
 $fortitude-select-input-border-style: $fortitude-field-input-border-style !default;
 $fortitude-select-input-border-width: $fortitude-field-input-border-width !default;
 $fortitude-select-input-height: $fortitude-field-input-height !default;
-$fortitude-select-input-placeholder-color: $fortitude-field-input-placeholder-color !default;
+$fortitude-select-input-horizontal-padding: $fortitude-field-input-horizontal-padding !default;
 
-$fortitude-color-input-background-color: $fortitude-field-input-background-color !default;
-$fortitude-color-input-border-color: $fortitude-field-input-border-color !default;
 $fortitude-color-input-border-radius: $fortitude-field-input-border-radius !default;
 $fortitude-color-input-border-style: $fortitude-field-input-border-style !default;
 $fortitude-color-input-border-width: $fortitude-field-input-border-width !default;
 $fortitude-color-input-height: $fortitude-field-input-height !default;
-$fortitude-color-input-placeholder-color: $fortitude-field-input-placeholder-color !default;
+$fortitude-color-input-horizontal-padding: $fortitude-field-input-horizontal-padding !default;
 
-$fortitude-range-input-background-color: false !default;
-$fortitude-range-input-border-color: $fortitude-field-input-border-color !default;
 $fortitude-range-input-border-radius: $fortitude-field-input-border-radius !default;
 $fortitude-range-input-border-style: $fortitude-field-input-border-style !default;
 $fortitude-range-input-border-width: 0 !default;
 $fortitude-range-input-height: $fortitude-field-input-height !default;
+$fortitude-range-input-horizontal-padding: $fortitude-field-input-horizontal-padding !default;
 
-$fortitude-switch-input-background-color: false !default;
-$fortitude-switch-input-border-color: #a9a9a9 !default;
 $fortitude-switch-input-border-radius: 0.2rem !default;
 $fortitude-switch-input-border-style: solid !default;
 $fortitude-switch-input-border-width: 0.1rem !default;
-$fortitude-switch-input-size: $fortitude-base-spacing-unit - 0.4rem !default;
+$fortitude-switch-input-size: 1.6rem !default;
 
-$fortitude-checkbox-input-background-color: $fortitude-switch-input-background-color !default;
-$fortitude-checkbox-input-border-color: $fortitude-switch-input-border-color !default;
 $fortitude-checkbox-input-border-radius: $fortitude-switch-input-border-radius !default;
 $fortitude-checkbox-input-border-style: $fortitude-switch-input-border-style !default;
 $fortitude-checkbox-input-border-width: $fortitude-switch-input-border-width !default;
 $fortitude-checkbox-input-size: $fortitude-switch-input-size !default;
 
-$fortitude-radio-input-background-color: $fortitude-switch-input-background-color !default;
-$fortitude-radio-input-border-color: $fortitude-switch-input-border-color !default;
 $fortitude-radio-input-border-radius: 10rem !default;
 $fortitude-radio-input-border-style: $fortitude-switch-input-border-style !default;
 $fortitude-radio-input-border-width: $fortitude-switch-input-border-width !default;
@@ -96,35 +80,22 @@ $fortitude-global-border-box: false !default;
 
   @include fortitude-input($extensions);
 
+  border-color: transparent;
+  border-style: $fortitude-text-input-border-style;
+  border-width: if($fortitude-text-input-border-width != 0, $fortitude-text-input-border-width, 0);
   height: $fortitude-text-input-height;
   margin: fortitude-block-margin($fortitude-text-input-height, $fortitude-text-input-border-width, $fortitude-base-line-height) 0;
-  padding: fortitude-block-padding($fortitude-text-input-height, $fortitude-text-input-border-width, $fortitude-base-line-height);
-
-  @if $fortitude-text-input-border-width != 0 {
-    border: $fortitude-text-input-border-width $fortitude-text-input-border-style $fortitude-text-input-border-color;
-  } @else {
-    border: 0;
-  }
+  padding: fortitude-block-padding($fortitude-text-input-height, $fortitude-text-input-border-width, $fortitude-base-line-height) ($fortitude-text-input-horizontal-padding - $fortitude-text-input-border-width);
 
   @if $is-pill {
     @include fortitude-input--pill;
-  } @else if $fortitude-text-input-border-radius != 0 {
-    border-radius: $fortitude-text-input-border-radius;
   } @else {
-    border-radius: 0;
-  }
-
-  @if $fortitude-text-input-background-color {
-    background-color: $fortitude-text-input-background-color;
+    border-radius: if($fortitude-text-input-border-radius != 0, $fortitude-text-input-border-radius, 0);
   }
 
   @if $is-full {
     @include fortitude-input--full;
   }
-
-  &::placeholder {
-    color: $fortitude-text-input-placeholder-color;
-  }
 }
 
 @mixin fortitude-textarea-input($extensions: ()) {
@@ -133,35 +104,22 @@ $fortitude-global-border-box: false !default;
 
   @include fortitude-input($extensions);
 
-  min-height: $fortitude-textarea-input-height;
+  border-color: transparent;
+  border-style: $fortitude-textarea-input-border-style;
+  border-width: if($fortitude-textarea-input-border-width != 0, $fortitude-textarea-input-border-width, 0);
   margin: fortitude-block-margin($fortitude-textarea-input-height, $fortitude-textarea-input-border-width, $fortitude-base-line-height) 0;
-  padding: fortitude-block-padding($fortitude-textarea-input-height, $fortitude-textarea-input-border-width, $fortitude-base-line-height);
-
-  @if $fortitude-textarea-input-border-width != 0 {
-    border: $fortitude-textarea-input-border-width $fortitude-textarea-input-border-style $fortitude-textarea-input-border-color;
-  } @else {
-    border: 0;
-  }
+  min-height: $fortitude-textarea-input-min-height;
+  padding: fortitude-block-padding($fortitude-textarea-input-height, $fortitude-textarea-input-border-width, $fortitude-base-line-height)  ($fortitude-textarea-input-horizontal-padding - $fortitude-textarea-input-border-width);
 
   @if $is-pill {
     @include fortitude-input--pill;
-  } @else if $fortitude-textarea-input-border-radius != 0 {
-    border-radius: $fortitude-textarea-input-border-radius;
   } @else {
-    border-radius: 0;
-  }
-
-  @if $fortitude-textarea-input-background-color {
-    background-color: $fortitude-textarea-input-background-color;
+    border-radius: if($fortitude-textarea-input-border-radius != 0, $fortitude-textarea-input-border-radius, 0);
   }
 
   @if $is-full {
     @include fortitude-input--full;
   }
-
-  &::placeholder {
-    color: $fortitude-textarea-input-placeholder-color;
-  }
 }
 
 @mixin fortitude-select-input($extensions: ()) {
@@ -170,36 +128,23 @@ $fortitude-global-border-box: false !default;
 
   @include fortitude-input($extensions);
 
+  border-color: transparent;
+  border-style: $fortitude-select-input-border-style;
+  border-width: if($fortitude-select-input-border-width != 0, $fortitude-select-input-border-width, 0);
   height: $fortitude-select-input-height;
   margin: fortitude-block-margin($fortitude-select-input-height, $fortitude-select-input-border-width, $fortitude-base-line-height) 0;
-  padding: fortitude-block-padding($fortitude-select-input-height, $fortitude-select-input-border-width, $fortitude-base-line-height);
-
-  @if $fortitude-select-input-border-width != 0 {
-    border: $fortitude-select-input-border-width $fortitude-select-input-border-style $fortitude-select-input-border-color;
-  } @else {
-    border: 0;
-  }
+  padding: fortitude-block-padding($fortitude-select-input-height, $fortitude-select-input-border-width, $fortitude-base-line-height)  ($fortitude-select-input-horizontal-padding - $fortitude-select-input-border-width);
 
   @if $is-pill {
     @include fortitude-input--pill;
-  } @else if $fortitude-select-input-border-radius != 0 {
-    border-radius: $fortitude-select-input-border-radius;
   } @else {
-    border-radius: 0;
-  }
-
-  @if $fortitude-select-input-background-color {
-    background-color: $fortitude-select-input-background-color;
+    border-radius: if($fortitude-select-input-border-radius != 0, $fortitude-select-input-border-radius, 0);
   }
 
   @if $is-full {
     @include fortitude-input--full;
   }
 
-  &.placeholder {
-    color: $fortitude-select-input-placeholder-color;
-  }
-
   &[multiple] {
     height: auto;
   }
@@ -210,27 +155,18 @@ $fortitude-global-border-box: false !default;
 
   @include fortitude-input($extensions);
 
-  width: $fortitude-checkbox-input-size;
+  border-color: transparent;
+  border-style: $fortitude-checkbox-input-border-style;
+  border-width: if($fortitude-checkbox-input-border-width != 0, $fortitude-checkbox-input-border-width, 0);
   height: $fortitude-checkbox-input-size;
   margin: fortitude-block-margin($fortitude-checkbox-input-size + 0.2rem, $fortitude-checkbox-input-border-width, $fortitude-base-line-height) 0;
   padding: fortitude-block-padding($fortitude-checkbox-input-size, $fortitude-checkbox-input-border-width, $fortitude-base-line-height);
-
-  @if $fortitude-checkbox-input-border-width != 0 {
-    border: $fortitude-checkbox-input-border-width $fortitude-checkbox-input-border-style $fortitude-checkbox-input-border-color;
-  } @else {
-    border: 0;
-  }
+  width: $fortitude-checkbox-input-size;
 
   @if $is-pill {
     @include fortitude-input--pill;
-  } @else if $fortitude-checkbox-input-border-radius != 0 {
-    border-radius: $fortitude-checkbox-input-border-radius;
   } @else {
-    border-radius: 0;
-  }
-
-  @if $fortitude-checkbox-input-background-color {
-    background-color: $fortitude-checkbox-input-background-color;
+    border-radius: if($fortitude-checkbox-input-border-radius != 0, $fortitude-checkbox-input-border-radius, 0);
   }
 }
 
@@ -239,27 +175,18 @@ $fortitude-global-border-box: false !default;
 
   @include fortitude-input($extensions);
 
-  width: $fortitude-radio-input-size;
+  border-color: transparent;
+  border-style: $fortitude-radio-input-border-style;
+  border-width: if($fortitude-radio-input-border-width != 0, $fortitude-radio-input-border-width, 0);
   height: $fortitude-radio-input-size;
   margin: fortitude-block-margin($fortitude-radio-input-size + 0.4rem, $fortitude-radio-input-border-width, $fortitude-base-line-height) 0;
   padding: fortitude-block-padding($fortitude-radio-input-size, $fortitude-radio-input-border-width, $fortitude-base-line-height);
-
-  @if $fortitude-radio-input-border-width != 0 {
-    border: $fortitude-radio-input-border-width $fortitude-radio-input-border-style $fortitude-radio-input-border-color;
-  } @else {
-    border: 0;
-  }
+  width: $fortitude-radio-input-size;
 
   @if $is-pill {
     @include fortitude-input--pill;
-  } @else if $fortitude-radio-input-border-radius != 0 {
-    border-radius: $fortitude-radio-input-border-radius;
   } @else {
-    border-radius: 0;
-  }
-
-  @if $fortitude-radio-input-background-color {
-    background-color: $fortitude-radio-input-background-color;
+    border-radius: if($fortitude-radio-input-border-radius != 0, $fortitude-radio-input-border-radius, 0);
   }
 }
 
@@ -269,26 +196,17 @@ $fortitude-global-border-box: false !default;
 
   @include fortitude-input($extensions);
 
+  border-color: transparent;
+  border-style: $fortitude-range-input-border-style;
+  border-width: if($fortitude-range-input-border-width != 0, $fortitude-range-input-border-width, 0);
   height: $fortitude-range-input-height;
   margin: fortitude-block-margin($fortitude-range-input-height, $fortitude-range-input-border-width, $fortitude-base-line-height) 0;
-  padding: fortitude-block-padding($fortitude-range-input-height, $fortitude-range-input-border-width, $fortitude-base-line-height) 0;
-
-  @if $fortitude-range-input-border-width != 0 {
-    border: $fortitude-range-input-border-width $fortitude-range-input-border-style $fortitude-range-input-border-color;
-  } @else {
-    border: 0;
-  }
+  padding: fortitude-block-padding($fortitude-range-input-height, $fortitude-range-input-border-width, $fortitude-base-line-height)  ($fortitude-range-input-horizontal-padding - $fortitude-range-input-border-width);
 
   @if $is-pill {
     @include fortitude-input--pill;
-  } @else if $fortitude-range-input-border-radius != 0 {
-    border-radius: $fortitude-range-input-border-radius;
   } @else {
-    border-radius: 0;
-  }
-
-  @if $fortitude-range-input-background-color {
-    background-color: $fortitude-range-input-background-color;
+    border-radius: if($fortitude-range-input-border-radius != 0, $fortitude-range-input-border-radius, 0);
   }
 
   @if $is-full {
@@ -302,35 +220,22 @@ $fortitude-global-border-box: false !default;
 
   @include fortitude-input($extensions);
 
+  border-color: transparent;
+  border-style: $fortitude-color-input-border-style;
+  border-width: if($fortitude-color-input-border-width != 0, $fortitude-color-input-border-width, 0);
   height: $fortitude-color-input-height;
   margin: fortitude-block-margin($fortitude-color-input-height, $fortitude-color-input-border-width, $fortitude-base-line-height) 0;
-  padding: fortitude-block-padding($fortitude-color-input-height, $fortitude-color-input-border-width, $fortitude-base-line-height);
-
-  @if $fortitude-color-input-border-width != 0 {
-    border: $fortitude-color-input-border-width $fortitude-color-input-border-style $fortitude-color-input-border-color;
-  } @else {
-    border: 0;
-  }
+  padding: fortitude-block-padding($fortitude-color-input-height, $fortitude-color-input-border-width, $fortitude-base-line-height) ($fortitude-color-input-horizontal-padding - $fortitude-color-input-border-width);
 
   @if $is-pill {
     @include fortitude-input--pill;
-  } @else if $fortitude-color-input-border-radius != 0 {
-    border-radius: $fortitude-color-input-border-radius;
   } @else {
-    border-radius: 0;
-  }
-
-  @if $fortitude-color-input-background-color {
-    background-color: $fortitude-color-input-background-color;
+    border-radius: if($fortitude-color-input-border-radius != 0, $fortitude-color-input-border-radius, 0);
   }
 
   @if $is-full {
     @include fortitude-input--full;
   }
-
-  &::placeholder {
-    color: $fortitude-color-input-placeholder-color;
-  }
 }
 
 @mixin fortitude-input--full {
@@ -362,4 +267,4 @@ $fortitude-global-border-box: false !default;
   &:focus {
     outline: 0;
   }
-}
+}

data/app/assets/stylesheets/fortitude/base/_page.scss

@@ -16,8 +16,6 @@
 html {
   font-size: $fortitude-base-rem-font-size;
   /* [1] */
-  background-color: $fortitude-base-background-color;
-  color: $fortitude-base-color;
   overflow-y: scroll;
   /* [2] */
   min-height: 100%;

data/app/assets/stylesheets/fortitude/settings/_defaults.scss

@@ -14,8 +14,6 @@
 
 $fortitude-base-font-size: 1.2rem !default;
 $fortitude-base-line-height: 2rem !default;
-$fortitude-base-color: #333 !default;
-$fortitude-base-background-color: #fff !default;
 $fortitude-class-breakpoints: (xs: null, sm: 768px, md: 992px, lg: 1200px) !default;
 $fortitude-enable-vendor-optimizations: false !default;
 

data/app/assets/stylesheets/fortitude/tools/_functions.scss

@@ -87,7 +87,7 @@
 
 @function fortitude-block-padding($block-height, $block-border-width: 0rem, $block-line-height: $fortitude-base-line-height) {
   $value: fortitude-halve($block-height - $block-line-height - fortitude-double($block-border-width));
-  @return fortitude-strip-unit-if-zero($value);
+  @return if($value > 0, fortitude-strip-unit-if-zero($value), 0);
 }
 
 @function fortitude-map-to-query($map) {
@@ -110,4 +110,4 @@
   } @else {
     @return null;
   }
-}
+}

data/bower.json

@@ -1,7 +1,7 @@
 {
   "name": "fortitude-sass",
   "homepage": "http://fortitude.io/",
-  "version": "0.7.5",
+  "version": "0.7.7",
   "main": [
     "app/assets/stylesheets/fortitude/tools/_functions.scss",
     "app/assets/stylesheets/fortitude/tools/_mixins.scss",

data/lib/fortitude-sass/version.rb

@@ -1,3 +1,3 @@
 module Fortitude
-  VERSION = '0.7.5'
+  VERSION = '0.7.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fortitude-sass
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.7
 platform: ruby
 authors:
 - Aaron Reisman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-16 00:00:00.000000000 Z
+date: 2015-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -100,6 +100,7 @@ files:
 - Gemfile
 - Gemfile.lock
 - Gruntfile.js
+- LICENSE
 - README.md
 - Rakefile
 - app/assets/images/icons/hamburger.png
@@ -267,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: fortitude-sass
-rubygems_version: 2.4.3
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Fortitude Sass Framework