Skip to content

Commit

Permalink
Bump fortitude version to 0.8.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Aaron Reisman committed May 6, 2015
1 parent c4213b7 commit 12e4ff1
Show file tree
Hide file tree
Showing 13 changed files with 20 additions and 56 deletions.
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
fortitude-sass (0.8.1)
fortitude-sass (0.8.2)
autoprefixer-rails
execjs
sass (~> 3.3)
Expand Down
1 change: 0 additions & 1 deletion app/assets/stylesheets/fortitude.scss
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
@import "fortitude/generic/reset";
@import "fortitude/base/hr";
@import "fortitude/base/images";
@import "fortitude/base/lists";
@import "fortitude/base/page";
@import "fortitude/components/badge";
@import "fortitude/components/bare-list";
Expand Down
19 changes: 6 additions & 13 deletions app/assets/stylesheets/fortitude/api/components/_flag.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ $fortitude-enable-flag--reverse: false !default;
$fortitude-enable-flag--responsive: false !default;

@mixin fortitude-flag($extensions: ()) {
display: table;
display: block;
width: 100%;
}

Expand All @@ -13,11 +13,11 @@ $fortitude-enable-flag--responsive: false !default;
}

@mixin fortitude-flag--responsive {
display: block;
display: table;
}

@mixin fortitude-flag__object($extensions: ()) {
display: table-cell;
display: block;
vertical-align: middle;
}

Expand All @@ -34,18 +34,11 @@ $fortitude-enable-flag--responsive: false !default;
}

@mixin fortitude-flag--responsive__object {
display: block;
}

@mixin fortitude-flag__object__content($extensions: ()) {
display: block;
margin-left: auto;
margin-right: auto;
max-width: none;
display: table-cell;
}

@mixin fortitude-flag__body($extensions: ()) {
display: table-cell;
display: block;
width: 100%;
vertical-align: middle;
}
Expand All @@ -63,5 +56,5 @@ $fortitude-enable-flag--responsive: false !default;
}

@mixin fortitude-flag--responsive__body {
display: block;
display: table-cell;
}
20 changes: 6 additions & 14 deletions app/assets/stylesheets/fortitude/api/components/_media.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,29 +15,21 @@ $fortitude-enable-media--responsive: false !default;
$is-reverse: fortitude-contains($extensions, reverse);
$is-responsive: fortitude-contains($extensions, responsive);

float: left;

@if $is-reverse {
@include fortitude-media--reverse__object;
}

@if $is-responsive {
@include fortitude-media--responsive__object;
}
}

@mixin fortitude-media--reverse__object {
float: right;
@if $is-reverse {
@include fortitude-media--reverse__object;
}
}

@mixin fortitude-media--responsive__object {
float: none;
float: left;
}

@mixin fortitude-media__object__content($extensions: ()) {
display: block;
margin-left: auto;
margin-right: auto;
@mixin fortitude-media--reverse__object {
float: right;
}

@mixin fortitude-media__body($extensions: ()) {
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/fortitude/api/tools/_functions.scss
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
@function fortitude-component-margin($component-height, $component-border-width: 0rem, $component-spacing-unit: $fortitude-base-spacing-unit) {
$component-spacing-unit-height: fortitude-component-spacing-unit-height($component-height, $component-spacing-unit);
$value: fortitude-halve($component-spacing-unit-height - $component-height);
$value: $value + fortitude-component-negitive-padding($component-height, $component-border-width, $component-spacing-unit);
$value: $value;

@return fortitude-strip-unit-if-zero($value);
}
Expand Down
7 changes: 0 additions & 7 deletions app/assets/stylesheets/fortitude/base/_lists.scss

This file was deleted.

2 changes: 1 addition & 1 deletion app/assets/stylesheets/fortitude/base/_page.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*,
*::before,
*::after {
vertical-align: inherit;
vertical-align: top;
}

html {
Expand Down
4 changes: 0 additions & 4 deletions app/assets/stylesheets/fortitude/components/_flag.scss
Original file line number Diff line number Diff line change
Expand Up @@ -197,10 +197,6 @@ $fortitude-enable-flag: true;
@include fortitude-flag__object;
}

.#{$fortitude-namespace}flag__object > * {
@include fortitude-flag__object__content;
}

.#{$fortitude-namespace}flag__body {
@include fortitude-flag__body;
}
Expand Down
5 changes: 0 additions & 5 deletions app/assets/stylesheets/fortitude/components/_media.scss
Original file line number Diff line number Diff line change
Expand Up @@ -151,11 +151,6 @@ $fortitude-enable-media: true;
@include fortitude-media__object;
}

.#{$fortitude-namespace}media__object > * {
@include fortitude-media__object__content;
}


.#{$fortitude-namespace}media__body {
@include fortitude-media__body;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,10 @@ $fortitude-responsive-font-sizes: (
@include fortitude-breakpoints {
$alias: map-get($fortitude-tmp, "current-breakpoint-alias");

@each $alias, $size in $fortitude-responsive-font-sizes {
$value: map-get($fortitude-responsive-font-sizes, $alias) !important;
@each $name, $size in $fortitude-responsive-font-sizes {
$value: map-get($fortitude-responsive-font-sizes, $name) !important;

.#{$fortitude-namespace}#{$alias}-#{$alias} {
.#{$fortitude-namespace}#{$alias}-#{$name} {
font-size: $value;
}
}
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "fortitude-sass",
"homepage": "http://fortitude.io/",
"version": "0.8.1",
"version": "0.8.2",
"main": [
"app/assets/stylesheets/fortitude/theme.scss"
],
Expand Down
2 changes: 1 addition & 1 deletion lib/fortitude-sass/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module Fortitude
VERSION = '0.8.1'
VERSION = '0.8.2'
end
4 changes: 0 additions & 4 deletions sass_specs/api/tools/_functions_spec.scss
Original file line number Diff line number Diff line change
Expand Up @@ -172,10 +172,6 @@
@include it("returns the margin of a component") {
@include should(expect(fortitude-component-margin($component-height, $component-border-width, $base-spacing-unit)), to(equal(fortitude-halve($component-margin))));
}

@include it("returns the margin of a component") {
@include should(expect(fortitude-component-margin(1.8rem, 0.2rem, $base-spacing-unit)), to(equal(-0.2rem)));
}
}

@include describe("fortitude-component-padding") {
Expand Down

0 comments on commit 12e4ff1

Please sign in to comment.