Skip to content

Commit

Permalink
Base V3.1.3
Browse files Browse the repository at this point in the history
- Updated animate mixin to animation
- Updated .animate and .animate-delay helpers to animation and animation-delay
- Added arrow mixin
- Version bump for style.scss, package.json and bower.json
  • Loading branch information
matthewhartman committed Jun 18, 2016
1 parent 7723536 commit 363b47a
Show file tree
Hide file tree
Showing 10 changed files with 58 additions and 16 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "base",
"version": "3.1.2",
"version": "3.1.3",
"homepage": "http://matthewhartman.github.io/base/",
"authors": [
"Matthew Hartman <[email protected]>"
Expand Down
8 changes: 8 additions & 0 deletions changelog.markdown
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
# Base 2 Change Log


## [3.1.3] - 2016-06-18
### Base V3.1.3
- Updated animate mixin to animation
- Updated .animate and .animate-delay helpers to animation and animation-delay
- Added arrow mixin
- Version bump for style.scss, package.json and bower.json


## [3.1.2] - 2016-06-17
### Base V3.1.2
- Updated styles.scss
Expand Down
6 changes: 3 additions & 3 deletions dist/css/styles.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/css/styles.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "getbase",
"version": "3.1.2",
"version": "3.1.3",
"description": "A Rock Solid, Responsive HTML/CSS Framework built to work on all devices big and small.",
"homepage": "http://getbase.org/",
"scripts": {
Expand Down
6 changes: 3 additions & 3 deletions src/css/styles.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/css/styles.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/scss/base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Base Stylesheet - http://getbase.org
// Author: Matthew Hartman - http://www.matthewhartman.com.au/
// Version: 3.1.2 - Last Updated: June 17, 2016
// Version: 3.1.3 - Last Updated: June 18, 2016
========================================================================== */

Expand Down
4 changes: 2 additions & 2 deletions src/scss/base/_helpers.scss
Original file line number Diff line number Diff line change
Expand Up @@ -225,8 +225,8 @@
}

// Animations
.animate { @include animate(1s); }
.animate-infinite {
.animation { @include animation(1s); }
.animation-infinite {
-webkit-animation-iteration-count: infinite;
animation-iteration-count: infinite;
}
Expand Down
40 changes: 37 additions & 3 deletions src/scss/base/_mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,44 @@
}

// Animations
// Example Usage @mixin animate(1s);
@mixin animate($duration: 1s) {
// Example Usage @mixin animation(1s);
@mixin animation($duration: 1s) {
animation-duration: $duration;
animation-fill-mode: both;
}

// Not enough mixins? – Please make some suggestions or contribute more! :)
// Arrows
// Example Usage @mixin arrow(4px, #000, up);
@mixin arrow ($size: 5px, $color: #333, $direction: right) {
position: relative;
&:before {
content: "";
position: absolute;
border: $size solid transparent;
z-index: -1;
@if $direction == right {
top: 50%;
left: 100%;
border-left-color: $color;
transform: translate3d(0, -50%, 0);
}
@else if $direction == left {
top: 50%;
left: 0;
border-right-color: $color;
transform: translate3d(-100%, -50%, 0);
}
@else if $direction == down {
top: 100%;
left: 50%;
border-top-color: $color;
transform: translate3d(-50%, 0, 0);
}
@else if $direction == up {
top: 0;
left: 50%;
border-bottom-color: $color;
transform: translate3d(-50%, -100%, 0);
}
}
}

0 comments on commit 363b47a

Please sign in to comment.