cask 0.2.1 → 0.3.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: fec9565ff4018e49211dce840054989b358cb11c
4
- data.tar.gz: cf0f2d1c4eedb3058d8fd13e787d4757dee4c0e8
3
+ metadata.gz: f1b3278466a699c471d660ea15211a592047fa4c
4
+ data.tar.gz: dc6cc83c459cce8c92e4f91c7669aa617145d369
5
5
  SHA512:
6
- metadata.gz: dd9702d5fc6858ccf26ed0b407e75d46a855638bf2c6d7f7d22b23cd117541d6332b81ffd9165932ac27025cf33eb91263097485d3eadeb35593c9b341f8cc80
7
- data.tar.gz: 2067c86d68a82b7d1b8234853b898c2af458002b56b8183a8201555a66b3e8cbbad4f843c84d1fe90114bb7b1d4668fe8671d0f3aec2941b0622eae220137831
6
+ metadata.gz: 7c8c17d2f06f7ae3d2b8586bfe7b71810d6f20edddbaf1efff3589e0d74b882b4e231d2ba45200ccdb8fdd387823d9e26d1ff5aa5baab9e3e96ef22c33a7b348
7
+ data.tar.gz: 65128fdc62036c3314c778e280667d962af1aaac359cb27db57878c98d5e44e17b50ba9035821d0e79d2629f2cf5901f054064b5631b8e7ec5ece6d273111082
@@ -5,7 +5,7 @@ var gulp = require("gulp"),
5
5
  haml = require('gulp-ruby-haml');;
6
6
 
7
7
  var paths = {
8
- scss: ["./app/assets/stylesheets/**/*.scss",
8
+ scss: ["./core/**/*.scss",
9
9
  "./contrib/stylesheets/*.scss"],
10
10
  haml: './contrib/views/*.haml'
11
11
  };
@@ -0,0 +1,37 @@
1
+ {
2
+ "authors": [
3
+ {
4
+ "name": "Will H McMahan",
5
+ "url": "http://mcmahan.me"
6
+ }
7
+ ],
8
+ "description": "A simple relible float based grid system built with calc",
9
+ "homepage": "http://whmii.github.com/cask",
10
+ "ignore": [
11
+ "**/.*",
12
+ "bin",
13
+ "cask.gemspec",
14
+ "contrib",
15
+ "Gemfile.lock",
16
+ "index.js",
17
+ "lib",
18
+ "Rakefile",
19
+ "node_modules",
20
+ "CONTRIBUTING.md"
21
+ ],
22
+ "keywords": [
23
+ "css",
24
+ "mixins",
25
+ "sass",
26
+ "grid",
27
+ "scss"
28
+ ],
29
+ "license": "MIT",
30
+ "main": "core/_cask.scss",
31
+ "name": "cask",
32
+ "repository": {
33
+ "type": "git",
34
+ "url": "https://github.com/whmii/cask.git"
35
+ },
36
+ "version": "0.3.1"
37
+ }
@@ -4,7 +4,7 @@
4
4
  @import "base/base";
5
5
 
6
6
  // Cask
7
- @import "../../app/assets/stylesheets/cask";
7
+ @import "../../core/cask";
8
8
 
9
9
  // Example Styles
10
10
  @import "example";
@@ -5,8 +5,8 @@
5
5
  box-sizing: border-box;
6
6
  }
7
7
 
8
- @import "variables";
9
-
10
8
  @import "functions/all";
11
9
 
10
+ @import "variables";
11
+
12
12
  @import "mixins/all";
@@ -1,22 +1,29 @@
1
1
  // Grid Settings
2
2
  // ============================================================
3
3
 
4
- // ========= Grid Variables =========
4
+ $grid-defaults: (
5
+ gutter: 1.25rem,
6
+ row-width: 80rem,
7
+ text-direction: ltr,
8
+ total-columns: 12
9
+ );
5
10
 
6
- $text-direction: ltr;
11
+ $grid-settings: () !default;
7
12
 
8
- @if $text-direction == ltr {
9
- $default-float: left !global;
10
- $opposite-direction: right !global;
11
- } @else if $text-direction == rtl {
12
- $default-float: right !global;
13
- $opposite-direction: left !global;
13
+ @if grid-settings(text-direction) == ltr {
14
+ $grid-settings:
15
+ grid-settings-assign((
16
+ default-float: left,
17
+ opposite-direction: right
18
+ ));
19
+ } @else if grid-settings(text-direction) == rtl {
20
+ $grid-settings:
21
+ grid-settings-assign((
22
+ default-float: right,
23
+ opposite-direction: left
24
+ ));
14
25
  }
15
26
 
16
- $grid-row-width: 80rem !default;
17
- $grid-gutter: 1.25rem !default;
18
- $grid-total-columns: 12 !default;
19
-
20
27
  // ========= Media Queries =========
21
28
 
22
29
  $small-screen: 768px !default;
@@ -3,3 +3,5 @@
3
3
  @import "grid-calc";
4
4
  @import "grid-column-ratio";
5
5
  @import "grid-parse-column-count";
6
+ @import "grid-settings";
7
+ @import "grid-settings-assign";
@@ -0,0 +1,17 @@
1
+ // Calculates the width of a column for grid-column() and other mixins
2
+
3
+ @function grid-calc(
4
+ $columns,
5
+ $collapse: false
6
+ ) {
7
+ $_column-ratio: grid-column-ratio($columns);
8
+ $_gutter: grid-settings(gutter);
9
+
10
+ @if $collapse {
11
+ $_gutter-affordance: (-$_gutter) + ($_gutter * $_column-ratio);
12
+ @return unquote("#{percentage($_column-ratio)} - #{$_gutter-affordance}");
13
+ } @else {
14
+ $_gutter-affordance: $_gutter + ($_gutter * $_column-ratio);
15
+ @return unquote("#{percentage($_column-ratio)} - #{$_gutter-affordance}");
16
+ }
17
+ }
@@ -4,7 +4,7 @@
4
4
  @if length($columns) > 1 {
5
5
  @return nth($columns, 1) / grid-parse-column-count($columns);
6
6
  } @if $columns {
7
- @return $columns / $grid-total-columns;
7
+ @return $columns / grid-settings(total-columns);
8
8
  } @else {
9
9
  @return 1;
10
10
  }
@@ -0,0 +1,11 @@
1
+ // Conveniently assign/update values in the `$grid-settings` map
2
+ //
3
+ // `$grid-settings: grid-settings((key:value));`
4
+
5
+ @function grid-settings-assign($map) {
6
+ @if type-of($map) == map {
7
+ @return map-merge($grid-settings, $map);
8
+ } @else {
9
+ @error "`grid-settings-assign` recived `#{map}` but requires a map";
10
+ }
11
+ }
@@ -0,0 +1,7 @@
1
+ // Conveniently retrieves grid-settings from the `$grid-settings` map
2
+ //
3
+ // `$grid-settings: grid-settings(setting);`
4
+
5
+ @function grid-settings($setting) {
6
+ @return map-get(map-merge($grid-defaults, $grid-settings), $setting);
7
+ }
@@ -6,7 +6,7 @@
6
6
  &::before {
7
7
  clear: both;
8
8
  content: "";
9
- display: table;
9
+ display: block;
10
10
  }
11
11
  }
12
12
 
@@ -14,7 +14,7 @@
14
14
  &::after {
15
15
  clear: both;
16
16
  content: "";
17
- display: table;
17
+ display: block;
18
18
  }
19
19
  }
20
20
 
@@ -9,7 +9,7 @@
9
9
  @if $center {
10
10
  float: none;
11
11
  } @else {
12
- float: $default-float;
12
+ float: grid-settings(default-float);
13
13
  }
14
14
 
15
15
  width: calc(#{grid-calc($columns, $collapse)});
@@ -0,0 +1,17 @@
1
+ // Specifies what a column's margins should be.
2
+
3
+ @mixin grid-gutter(
4
+ $collapse: false,
5
+ $center: false
6
+ ) {
7
+ @if $center {
8
+ margin-#{grid-settings(default-float)}: auto;
9
+ margin-#{grid-settings(opposite-direction)}: auto;
10
+ } @else if $collapse {
11
+ margin-#{grid-settings(default-float)}: 0;
12
+ margin-#{grid-settings(opposite-direction)}: -(grid-settings(gutter));
13
+ } @else {
14
+ margin-#{grid-settings(default-float)}: grid-settings(gutter);
15
+ margin-#{grid-settings(opposite-direction)}: 0;
16
+ }
17
+ }
@@ -1,6 +1,9 @@
1
1
  // Calculates the width of a column for grid-column() and other mixins.
2
2
 
3
- @mixin grid-is-zero-error($property, $value) {
3
+ @mixin grid-is-zero-error(
4
+ $property,
5
+ $value
6
+ ) {
4
7
  @if $value == 0 {
5
8
  @error "if `#{$property}` is 0, use false or leave the input value blank";
6
9
  }
@@ -0,0 +1,13 @@
1
+ // Push columns away from their container.
2
+
3
+ @mixin grid-push($push: false) {
4
+ @include grid-is-zero-error(grid-push, $push);
5
+ @if $push {
6
+ $_gutter-affordance: grid-settings(gutter) * $push;
7
+ $_margin-value: calc(#{unquote(grid-calc($push))} + #{$_gutter-affordance});
8
+ margin-#{grid-settings(default-float)}: $_margin-value;
9
+ } @else {
10
+ $_margin-value: grid-settings(gutter);
11
+ margin-#{grid-settings(default-float)}: $_margin-value;
12
+ }
13
+ }
@@ -2,7 +2,7 @@
2
2
 
3
3
  @mixin grid-row(
4
4
  $center: true,
5
- $max-width: $grid-row-width
5
+ $max-width: grid-settings(row-width)
6
6
  ) {
7
7
  @include grid-clearfix;
8
8
  @include grid-column($collapse: true, $center: $center);
@@ -0,0 +1,13 @@
1
+ // Shift columns and reorder them within their container.
2
+
3
+ @mixin grid-shift($shift: false) {
4
+ @include grid-is-zero-error(grid-shift, $shift);
5
+ @if $shift {
6
+ $_shift-value: calc(#{unquote(grid-calc($shift))} + #{grid-settings(gutter)});
7
+ #{grid-settings(default-float)}: $_shift-value;
8
+ } @else {
9
+ #{grid-settings(default-float)}: auto;
10
+ }
11
+
12
+ position: relative;
13
+ }
@@ -0,0 +1,7 @@
1
+ var path = require("path");
2
+
3
+ module.exports = {
4
+ includePaths: [
5
+ path.join(__dirname, "core")
6
+ ]
7
+ };
@@ -14,6 +14,6 @@ module Cask
14
14
  end
15
15
  end
16
16
  else
17
- Sass.load_paths << File.expand_path("../../app/assets/stylesheets", __FILE__)
17
+ Sass.load_paths << File.expand_path("../../core", __FILE__)
18
18
  end
19
19
  end
@@ -1,3 +1,3 @@
1
1
  module Cask
2
- VERSION = "0.2.1"
2
+ VERSION = "0.3.1"
3
3
  end
@@ -1,8 +1,8 @@
1
1
  {
2
- "name": "Cask",
3
- "version": "0.2.0",
4
- "description": "A simple relible float based grid system",
5
- "main": "Gulpfile.js",
2
+ "name": "cask-grid",
3
+ "version": "0.3.1",
4
+ "description": "A simple relible float based grid system built with calc",
5
+ "main": "index.js",
6
6
  "repository": {
7
7
  "type": "git",
8
8
  "url": "https://github.com/whmii/cask.git"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cask
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.1
4
+ version: 0.3.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Will H McMahan
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2016-01-15 00:00:00.000000000 Z
11
+ date: 2016-03-02 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -54,22 +54,9 @@ files:
54
54
  - LICENSE
55
55
  - README.md
56
56
  - Rakefile
57
- - app/assets/stylesheets/_cask.scss
58
- - app/assets/stylesheets/_variables.scss
59
- - app/assets/stylesheets/functions/_all.scss
60
- - app/assets/stylesheets/functions/_grid-calc.scss
61
- - app/assets/stylesheets/functions/_grid-column-ratio.scss
62
- - app/assets/stylesheets/functions/_grid-parse-column-count.scss
63
- - app/assets/stylesheets/mixins/_all.scss
64
- - app/assets/stylesheets/mixins/_grid-clearfix.scss
65
- - app/assets/stylesheets/mixins/_grid-column.scss
66
- - app/assets/stylesheets/mixins/_grid-gutter.scss
67
- - app/assets/stylesheets/mixins/_grid-is-zero-error.scss
68
- - app/assets/stylesheets/mixins/_grid-push.scss
69
- - app/assets/stylesheets/mixins/_grid-row.scss
70
- - app/assets/stylesheets/mixins/_grid-shift.scss
71
57
  - bin/console
72
58
  - bin/setup
59
+ - bower.json
73
60
  - cask.gemspec
74
61
  - contrib/stylesheets/_example.scss
75
62
  - contrib/stylesheets/base/_base.scss
@@ -81,6 +68,23 @@ files:
81
68
  - contrib/stylesheets/base/_variables.scss
82
69
  - contrib/stylesheets/styles.scss
83
70
  - contrib/views/index.haml
71
+ - core/_cask.scss
72
+ - core/_variables.scss
73
+ - core/functions/_all.scss
74
+ - core/functions/_grid-calc.scss
75
+ - core/functions/_grid-column-ratio.scss
76
+ - core/functions/_grid-parse-column-count.scss
77
+ - core/functions/_grid-settings-assign.scss
78
+ - core/functions/_grid-settings.scss
79
+ - core/mixins/_all.scss
80
+ - core/mixins/_grid-clearfix.scss
81
+ - core/mixins/_grid-column.scss
82
+ - core/mixins/_grid-gutter.scss
83
+ - core/mixins/_grid-is-zero-error.scss
84
+ - core/mixins/_grid-push.scss
85
+ - core/mixins/_grid-row.scss
86
+ - core/mixins/_grid-shift.scss
87
+ - index.js
84
88
  - lib/cask.rb
85
89
  - lib/cask/engine.rb
86
90
  - lib/cask/version.rb
@@ -1,13 +0,0 @@
1
- // Calculates the width of a column for grid-column() and other mixins
2
-
3
- @function grid-calc($columns, $collapse:false) {
4
- $_column-ratio: grid-column-ratio($columns);
5
-
6
- @if $collapse {
7
- $_grid-gutter-affordance: (-$grid-gutter) + ($grid-gutter * $_column-ratio);
8
- @return unquote("#{percentage($_column-ratio)} - #{$_grid-gutter-affordance}");
9
- } @else {
10
- $_grid-gutter-affordance: $grid-gutter + ($grid-gutter * $_column-ratio);
11
- @return unquote("#{percentage($_column-ratio)} - #{$_grid-gutter-affordance}");
12
- }
13
- }
@@ -1,17 +0,0 @@
1
- // Specifies what a column's margins should be.
2
-
3
- @mixin grid-gutter(
4
- $collapse: false,
5
- $center: false
6
- ) {
7
- @if $center {
8
- margin-#{$default-float}: auto;
9
- margin-#{$opposite-direction}: auto;
10
- } @else if $collapse {
11
- margin-#{$default-float}: 0;
12
- margin-#{$opposite-direction}: -($grid-gutter);
13
- } @else {
14
- margin-#{$default-float}: $grid-gutter;
15
- margin-#{$opposite-direction}: 0;
16
- }
17
- }
@@ -1,15 +0,0 @@
1
- // Push columns away from their container.
2
-
3
- @mixin grid-push(
4
- $push: false
5
- ) {
6
- @if $push {
7
- $_grid-gutter-affordance: $grid-gutter * $push;
8
- $_margin-value: calc(#{unquote(grid-calc($push))} + #{$_grid-gutter-affordance});
9
- } @else {
10
- $_margin-value: $grid-gutter;
11
- }
12
-
13
- @include grid-is-zero-error(grid-push, $push);
14
- margin-#{$default-float}: $_margin-value;
15
- }
@@ -1,16 +0,0 @@
1
- // Shift columns and reorder them within their container.
2
-
3
- @mixin grid-shift(
4
- $shift: false
5
- ) {
6
- @if $shift == 0 {
7
- @error grid-is-zero-error(grid-shift);
8
- }
9
-
10
- @if $shift {
11
- $_shift-value: calc(#{unquote(grid-calc($shift))} + #{$grid-gutter});
12
- #{$default-float}: $_shift-value;
13
- }
14
-
15
- position: relative;
16
- }