From 5c18b1c4e1e42aa5f5a0255b76e76f69b8772528 Mon Sep 17 00:00:00 2001 From: Arthur Clemens Date: Sat, 27 Feb 2016 19:39:28 +0100 Subject: [PATCH] Small updates to examples --- examples/src/app/app/common-style.es6.js | 3 +++ examples/src/app/app/common-style.js | 2 +- examples/src/app/paging/paging-style.es6.js | 7 +++---- examples/src/app/paging/paging-style.js | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/examples/src/app/app/common-style.es6.js b/examples/src/app/app/common-style.es6.js index ece157f..0ad7365 100644 --- a/examples/src/app/app/common-style.es6.js +++ b/examples/src/app/app/common-style.es6.js @@ -1,6 +1,9 @@ import vars from './variables'; const styles = [{ + ' *': { + 'box-sizing': 'border-box' + }, ' html, body': { 'min-height': '100%', height: '100%' diff --git a/examples/src/app/app/common-style.js b/examples/src/app/app/common-style.js index c0ed54f..ad88736 100644 --- a/examples/src/app/app/common-style.js +++ b/examples/src/app/app/common-style.js @@ -1 +1 @@ -"use strict";function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(exports,"__esModule",{value:!0});var _variables=require("./variables"),_variables2=_interopRequireDefault(_variables),styles=[{" html, body":{"min-height":"100%",height:"100%"}," body":{margin:0,padding:0,"font-family":"arial, sans-serif","min-width":_variables2.default.size_px}," h1":{display:"block",margin:"40px auto 0 auto",width:"320px","text-align":"center","font-size":"28px","font-weight":"normal",color:_variables2.default.text_color}," a":{"&:link, &:visited":{color:"#1E88E5","text-decoration":"none"}}}];exports.default=styles; \ No newline at end of file +"use strict";function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(exports,"__esModule",{value:!0});var _variables=require("./variables"),_variables2=_interopRequireDefault(_variables),styles=[{" *":{"box-sizing":"border-box"}," html, body":{"min-height":"100%",height:"100%"}," body":{margin:0,padding:0,"font-family":"arial, sans-serif","min-width":_variables2.default.size_px}," h1":{display:"block",margin:"40px auto 0 auto",width:"320px","text-align":"center","font-size":"28px","font-weight":"normal",color:_variables2.default.text_color}," a":{"&:link, &:visited":{color:"#1E88E5","text-decoration":"none"}}}];exports.default=styles; \ No newline at end of file diff --git a/examples/src/app/paging/paging-style.es6.js b/examples/src/app/paging/paging-style.es6.js index 8877d78..f5d1428 100644 --- a/examples/src/app/paging/paging-style.es6.js +++ b/examples/src/app/paging/paging-style.es6.js @@ -1,7 +1,6 @@ const gridSpacing = 8; const pageWidth = 320; const itemSize = (320 - 2 * gridSpacing) / 3; -const pageHeight = 4 * itemSize + 3 * gridSpacing + 2 * gridSpacing; const imageHolderPadding = 10; const imageHolderPaddingPx = imageHolderPadding + 'px'; @@ -10,15 +9,15 @@ const styles = [ '.paging': { width: pageWidth + 'px', margin: '0 auto', - height: '100%', ' .mithril-infinite__scroll-view.mithril-infinite__scroll-view--y': { - height: pageHeight + 'px', + height: 'auto' }, ' .mithril-infinite__scroll-content': { margin: '0 auto', width: pageWidth + 'px', - padding: gridSpacing + 'px 0', + padding: gridSpacing + 'px 0 0', + ' .mithril-infinite__content': { margin: '0 auto', diff --git a/examples/src/app/paging/paging-style.js b/examples/src/app/paging/paging-style.js index 88b4f01..14e25d2 100644 --- a/examples/src/app/paging/paging-style.js +++ b/examples/src/app/paging/paging-style.js @@ -1 +1 @@ -"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var gridSpacing=8,pageWidth=320,itemSize=(320-2*gridSpacing)/3,pageHeight=4*itemSize+3*gridSpacing+2*gridSpacing,imageHolderPadding=10,imageHolderPaddingPx=imageHolderPadding+"px",styles=[{".paging":{width:pageWidth+"px",margin:"0 auto",height:"100%"," .mithril-infinite__scroll-view.mithril-infinite__scroll-view--y":{height:pageHeight+"px"}," .mithril-infinite__scroll-content":{margin:"0 auto",width:pageWidth+"px",padding:gridSpacing+"px 0"," .mithril-infinite__content":{margin:"0 auto","font-size":0,"line-height":0," .mithril-infinite__page":{margin:"0 "+-gridSpacing/2+"px"}," .grid-item":{display:"inline-block",height:itemSize+"px",width:itemSize+"px","background-color":"#f0f0f0",margin:[0,gridSpacing/2,gridSpacing,gridSpacing/2].map(function(i){return i+"px"}).join(" ")," .image-holder":{height:itemSize-2*imageHolderPadding+"px",width:itemSize-2*imageHolderPadding+"px",overflow:"hidden",position:"relative",margin:imageHolderPaddingPx," .image":{position:"absolute",left:"auto",top:0,right:"auto",bottom:0,width:"100%","background-size":"contain","background-repeat":"no-repeat","background-position-x":"50%"}}}}}," .count":{"font-size":"14px","line-height":1,padding:"20px 0 10px 0","border-bottom":"1px solid #ddd"}," .pager":{"border-top":"1px solid #ddd",padding:"8px 0",width:pageWidth+"px"," a":{display:"inline-block",background:"#e0e0e0",color:"#333",padding:"10px 15px","text-align":"center","font-size":"15px","line-height":1,margin:"0 5px 0 0","&.disabled":{color:"#aaa",background:"#f4f4f4","pointer-events":"none"}}}}}];exports.default=styles; \ No newline at end of file +"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var gridSpacing=8,pageWidth=320,itemSize=(320-2*gridSpacing)/3,imageHolderPadding=10,imageHolderPaddingPx=imageHolderPadding+"px",styles=[{".paging":{width:pageWidth+"px",margin:"0 auto"," .mithril-infinite__scroll-view.mithril-infinite__scroll-view--y":{height:"auto"}," .mithril-infinite__scroll-content":{margin:"0 auto",width:pageWidth+"px",padding:gridSpacing+"px 0 0"," .mithril-infinite__content":{margin:"0 auto","font-size":0,"line-height":0," .mithril-infinite__page":{margin:"0 "+-gridSpacing/2+"px"}," .grid-item":{display:"inline-block",height:itemSize+"px",width:itemSize+"px","background-color":"#f0f0f0",margin:[0,gridSpacing/2,gridSpacing,gridSpacing/2].map(function(i){return i+"px"}).join(" ")," .image-holder":{height:itemSize-2*imageHolderPadding+"px",width:itemSize-2*imageHolderPadding+"px",overflow:"hidden",position:"relative",margin:imageHolderPaddingPx," .image":{position:"absolute",left:"auto",top:0,right:"auto",bottom:0,width:"100%","background-size":"contain","background-repeat":"no-repeat","background-position-x":"50%"}}}}}," .count":{"font-size":"14px","line-height":1,padding:"20px 0 10px 0","border-bottom":"1px solid #ddd"}," .pager":{"border-top":"1px solid #ddd",padding:"8px 0",width:pageWidth+"px"," a":{display:"inline-block",background:"#e0e0e0",color:"#333",padding:"10px 15px","text-align":"center","font-size":"15px","line-height":1,margin:"0 5px 0 0","&.disabled":{color:"#aaa",background:"#f4f4f4","pointer-events":"none"}}}}}];exports.default=styles; \ No newline at end of file