Skip to content

Commit

Permalink
Revert "переделали включительно\не включительно у миксин для адаптивки"
Browse files Browse the repository at this point in the history
This reverts commit db9454a.
  • Loading branch information
Gleb Mikheev committed Jan 26, 2017
1 parent c42b9ec commit 34d9eed
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 8 deletions.
21 changes: 13 additions & 8 deletions adaptive.styl
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
width-between($min, $max)
$max = $max + 1
$min = $min
$max = $max - 1
$min = $min - 1

@media only screen and (min-width : $min * 1px) and (max-width : $max * 1px)
{block}

height-between($min, $max)
$max = $max + 1
$min = $min
$max = $max - 1
$min = $min - 1

@media only screen and (min-height : $min * 1px) and (max-height : $max * 1px)
{block}

width-lessthan($v)
$v = $v
$v = $v - 1

@media only screen and (max-width : $v * 1px)
{block}

height-lessthan($v)
$v = $v
$v = $v - 1

@media only screen and (max-height : $v * 1px)
{block}

width-morethan($v)
$v = $v + 1
$v = $v

@media only screen and (min-width : $v * 1px)
{block}

height-morethan($v)
$v = $v + 1
$v = $v - 1

@media only screen and (min-height : $v * 1px)
{block}
Expand Down Expand Up @@ -71,6 +71,11 @@ height-between-property($property, $h1, $v1, $h2, $v2, $before = false, $after =
+height-morethan($h2)
{$property} $v2 * 1px


// shortcuts
calc-between($w1, $v1, $w2, $v2)
return calc-between-width($w1, $v1, $w2, $v2)

width-between-fontsize($w1, $v1, $w2, $v2, $before = false, $after = false)
width-between-property 'font-size', $w1, $v1, $w2, $v2, $before, $after

Expand Down
25 changes: 25 additions & 0 deletions npm-debug.log
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
0 info it worked if it ends with ok
1 verbose cli [ '/Users/glebmikheev/.nvm/versions/node/v4.2.4/bin/node',
1 verbose cli '/Users/glebmikheev/.nvm/versions/node/v4.2.4/bin/npm',
1 verbose cli 'start' ]
2 info using [email protected]
3 info using [email protected]
4 verbose stack Error: missing script: start
4 verbose stack at run (/Users/glebmikheev/.nvm/versions/node/v4.2.4/lib/node_modules/npm/lib/run-script.js:142:19)
4 verbose stack at /Users/glebmikheev/.nvm/versions/node/v4.2.4/lib/node_modules/npm/lib/run-script.js:58:5
4 verbose stack at /Users/glebmikheev/.nvm/versions/node/v4.2.4/lib/node_modules/npm/node_modules/read-package-json/read-json.js:345:5
4 verbose stack at checkBinReferences_ (/Users/glebmikheev/.nvm/versions/node/v4.2.4/lib/node_modules/npm/node_modules/read-package-json/read-json.js:309:45)
4 verbose stack at final (/Users/glebmikheev/.nvm/versions/node/v4.2.4/lib/node_modules/npm/node_modules/read-package-json/read-json.js:343:3)
4 verbose stack at then (/Users/glebmikheev/.nvm/versions/node/v4.2.4/lib/node_modules/npm/node_modules/read-package-json/read-json.js:113:5)
4 verbose stack at /Users/glebmikheev/.nvm/versions/node/v4.2.4/lib/node_modules/npm/node_modules/read-package-json/read-json.js:300:12
4 verbose stack at /Users/glebmikheev/.nvm/versions/node/v4.2.4/lib/node_modules/npm/node_modules/graceful-fs/graceful-fs.js:76:16
4 verbose stack at FSReqWrap.readFileAfterClose [as oncomplete] (fs.js:380:3)
5 verbose cwd /Users/glebmikheev/stylus-mixins
6 error Darwin 15.5.0
7 error argv "/Users/glebmikheev/.nvm/versions/node/v4.2.4/bin/node" "/Users/glebmikheev/.nvm/versions/node/v4.2.4/bin/npm" "start"
8 error node v4.2.4
9 error npm v2.14.12
10 error missing script: start
11 error If you need help, you may report this error at:
11 error <https://github.com/npm/npm/issues>
12 verbose exit [ 1, true ]

0 comments on commit 34d9eed

Please sign in to comment.