Skip to content

Commit

Permalink
update off-canvas overlay transition, add default gutter to container…
Browse files Browse the repository at this point in the history
…, add rem to fluid-type
  • Loading branch information
ganlanyuan committed Nov 18, 2016
1 parent 3ff53a1 commit a02b2e6
Show file tree
Hide file tree
Showing 22 changed files with 94 additions and 67 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Rocket v3

![Version](https://img.shields.io/badge/Version-3.4.10-blue.svg)
![Version](https://img.shields.io/badge/Version-3.4.11-blue.svg)
![SASS](https://img.shields.io/badge/sass-3.3.4-ff69b4.svg)
![Libsass](https://img.shields.io/badge/Libsass-3.2.0-b6f07e.svg)
Rocket is a powerful SASS library to help web developers handle layout, color and build components.
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rocket",
"version": "3.4.10",
"version": "3.4.11",
"main": [
"./src/scss/rocket.scss",
"./src/js/kit.js"
Expand Down
5 changes: 5 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Changelog

##### 3.4.11
- Improved: `off-canvas` overlay transition.
- Improved: add rem unit for `font-size` in `fluid-type`.
- Fixed: `container` default gutter.

##### 3.4.10
- Added: `fluid-type`. Thanks [Indrek Paas](http://www.sassmeister.com/gist/7f22e44ace49b5124eec).
- Fixed: a `container` issue in IE bowsers due to a IE `calc` bug.
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"title": "Rocket",
"name": "Rocket",
"version": "3.4.10",
"version": "3.4.11",
"description": "a powerful tool to help web developers handle layout and other components",
"directories": {
"src": "src"
Expand Down
2 changes: 1 addition & 1 deletion src/scss/_rocket.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Rocket v3.4.10
// Rocket v3.4.11
// Created by William Lin ([email protected])
// Licensed under MIT Open Source
// =============================================
Expand Down
12 changes: 11 additions & 1 deletion src/scss/addons/_fluid-type.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,27 @@

@each $property in $properties {
#{$property}: $min-value;
@if $property == 'font-size' and unit($min-value) == 'px' {
#{$property}: rem($min-value);
}
}

@include bp('min' $min-vw) {
@each $property in $properties {
#{$property}: calc(#{$min-value} + #{strip-unit($max-value - $min-value)} * (100vw - #{$min-vw}) / #{strip-unit($max-vw - $min-vw)});
@if $property == 'font-size' and unit($min-value) == 'px' {
#{$property}: calc(#{rem($min-value)} + #{strip-unit($max-value - $min-value)} * (100vw - #{rem($min-vw)}) / #{strip-unit($max-vw - $min-vw)});
} else {
#{$property}: calc(#{$min-value} + #{strip-unit($max-value - $min-value)} * (100vw - #{$min-vw}) / #{strip-unit($max-vw - $min-vw)});
}
}
}

@include bp('min' $max-vw) {
@each $property in $properties {
#{$property}: $max-value;
@if $property == 'font-size' and unit($max-value) == 'px' {
#{$property}: rem($max-value);
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/scss/components/_off-canvas.scss
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@
#{opposite($direction)}: auto;
background: transparent;
z-index: map-get($ro-off-canvas-z-index, 'page-overlay');
@include ro-transition(unquote("#{$direction} #{$duration}"));
@include ro-transition(all #{$duration});
input:checked ~ & {
// background
background: $overlay-color;
Expand Down
2 changes: 1 addition & 1 deletion src/scss/layout/_container.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@mixin container($key: false){
$container: false;
$breakpoint: false;
$gutter: args-get-next($key, 'gutter');
$gutter: args-get-next($key, 'gutter', map-get($ro-layout, 'gutter'));
$align: args-get($key, (left right center), center);

// get container & gutter
Expand Down
4 changes: 4 additions & 0 deletions tests/html/css/container.css

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

20 changes: 14 additions & 6 deletions tests/html/css/fluid-type.css

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

6 changes: 3 additions & 3 deletions tests/html/css/off-canvas-drawer.css

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

10 changes: 5 additions & 5 deletions tests/html/css/off-canvas-open-door.css

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

6 changes: 3 additions & 3 deletions tests/html/css/off-canvas-push.css

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

10 changes: 5 additions & 5 deletions tests/html/css/off-canvas-reveal.css

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

10 changes: 5 additions & 5 deletions tests/html/css/off-canvas-rotate-in-reverse.css

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

10 changes: 5 additions & 5 deletions tests/html/css/off-canvas-rotate-in.css

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

10 changes: 5 additions & 5 deletions tests/html/css/off-canvas-rotate-out.css

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

10 changes: 5 additions & 5 deletions tests/html/css/off-canvas-scale-down.css

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

10 changes: 5 additions & 5 deletions tests/html/css/off-canvas-scale-up.css

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

10 changes: 5 additions & 5 deletions tests/html/css/off-canvas-slide-along.css

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

6 changes: 3 additions & 3 deletions tests/html/css/off-canvas-slide-in.css

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

Loading

0 comments on commit a02b2e6

Please sign in to comment.