diff --git a/dist/descartes.js b/dist/descartes.js index e9be9c1..26cd59d 100644 --- a/dist/descartes.js +++ b/dist/descartes.js @@ -41,6 +41,7 @@ var Descartes = function () { this.prefixes = ['-webkit-', '-moz-', '-o-', '-ms-']; this.properties = ['align-content', 'align-items', 'align-self', 'all', 'animation', 'animation-delay', 'animation-direction', 'animation-duration', 'animation-fill-mode', 'animation-iteration-count', 'animation-name', 'animation-play-state', 'animation-timing-function', 'backface-visibility', 'background', 'background-attachment', 'background-blend-mode', 'background-clip', 'background-color', 'background-image', 'background-origin', 'background-position', 'background-repeat', 'background-size', 'border', 'border-bottom', 'border-bottom-color', 'border-bottom-left-radius', 'border-bottom-right-radius', 'border-bottom-style', 'border-bottom-width', 'border-collapse', 'border-color', 'border-image', 'border-image-outset', 'border-image-repeat', 'border-image-slice', 'border-image-source', 'border-image-width', 'border-left', 'border-left-color', 'border-left-style', 'border-left-width', 'border-radius', 'border-right', 'border-right-color', 'border-right-style', 'border-right-width', 'border-spacing', 'border-style', 'border-top', 'border-top-color', 'border-top-left-radius', 'border-top-right-radius', 'border-top-style', 'border-top-width', 'border-width', 'bottom', 'box-shadow', 'box-sizing', 'caption-side', 'clear', 'clip', 'color', 'column-count', 'column-fill', 'column-gap', 'column-rule', 'column-rule-color', 'column-rule-style', 'column-rule-width', 'column-span', 'column-width', 'columns', 'content', 'counter-increment', 'counter-reset', 'cursor', 'direction', 'display', 'empty-cells', 'filter', 'flex', 'flex-basis', 'flex-direction', 'flex-flow', 'flex-grow', 'flex-shrink', 'flex-wrap', 'float', 'font', '@font-face', 'font-family', 'font-size', 'font-size-adjust', 'font-stretch', 'font-style', 'font-variant', 'font-weight', 'hanging-punctuation', 'height', 'justify-content', '@keyframes', 'left', 'letter-spacing', 'line-height', 'list-style', 'list-style-image', 'list-style-position', 'list-style-type', 'margin', 'margin-bottom', 'margin-left', 'margin-right', 'margin-top', 'max-height', 'max-width', '@media', 'min-height', 'min-width', 'nav-down', 'nav-index', 'nav-left', 'nav-right', 'nav-up', 'opacity', 'order', 'outline', 'outline-color', 'outline-offset', 'outline-style', 'outline-width', 'overflow', 'overflow-x', 'overflow-y', 'padding', 'padding-bottom', 'padding-left', 'padding-right', 'padding-top', 'page-break-after', 'page-break-before', 'page-break-inside', 'perspective', 'perspective-origin', 'position', 'quotes', 'resize', 'right', 'tab-size', 'table-layout', 'text-align', 'text-align-last', 'text-decoration', 'text-decoration-color', 'text-decoration-line', 'text-decoration-style', 'text-indent', 'text-justify', 'text-overflow', 'text-shadow', 'text-transform', 'top', 'transform', 'transform-origin', 'transform-style', 'transition', 'transition-delay', 'transition-duration', 'transition-property', 'transition-timing-function', 'unicode-bidi', 'vertical-align', 'visibility', 'white-space', 'width', 'word-break', 'word-spacing', 'word-wrap', 'z-index']; this.pseudos = ['::after', '::before', '::first-letter', '::first-line', '::selection', '::backdrop', ':active', ':any', ':checked', ':default', ':dir', ':disabled', ':empty', ':enabled', ':first', ':first-child', ':first-of-type', ':fullscreen', ':focus', ':hover', ':indeterminate', ':in-range', ':invalid', ':lang', ':last-child', ':last-of-type', ':left', ':link', ':not', ':nth-child', ':nth-last-child', ':nth-last-of-type', ':nth-of-type', ':only-child', ':only-of-type', ':optional', ':out-of-range', ':read-only', ':read-write', ':required', ':right', ':root', ':scope', ':target', ':valid', ':visited']; + this.pxExceptions = ['animation-iteration-count', 'box-flex', 'box-flex-group', 'box-ordinal-group', 'column-count', 'fill-opacity', 'flex', 'flex-grow', 'flex-positive', 'flex-shrink', 'flex-negative', 'flex-order', 'font-weight', 'line-clamp', 'line-height', 'opacity', 'order', 'orphans', 'stop-opacity', 'stroke-dashoffset', 'stroke-opacity', 'stroke-width', 'tab-size', 'widows', 'z-index', 'zoom']; this.findType = undefined; this.find = this.findLibrary(); @@ -485,7 +486,7 @@ var Descartes = function () { } if (value === null) return null; if (value === undefined) return null; - var except = ['font-weight', 'opacity', 'z-index']; + var except = this.pxExceptions; if (Number(value) === value && except.indexOf(property) < 0) { return value.toString() + "px"; } diff --git a/dist/slides.js b/dist/slides.js index ba5bec8..e30319a 100644 --- a/dist/slides.js +++ b/dist/slides.js @@ -51,12 +51,10 @@ d.add({ "font-weight": 100, "text-shadow": "0 0 25px #666", "margin": 0, + "line-height": 1, "$(window).resize": { "font-size": function fontSize() { return p.scale(window.innerWidth, p.layout.wrappers.mobile, 3600, 72, 120) * 1.5; - }, - "line-height": function lineHeight() { - return p.scale(window.innerWidth, p.layout.wrappers.mobile, 3600, 60, 110) * 1.5; } } }, @@ -75,7 +73,7 @@ d.add({ }, "p": { "font-weight": 100, - "text-shadow": "0 0 50px #666", + "text-shadow": "0 0 10px #666", "margin": 0 }, "a": {