diff --git a/dist/odyssey.js b/dist/odyssey.js index a44b07d5..067a9c63 100644 --- a/dist/odyssey.js +++ b/dist/odyssey.js @@ -955,7 +955,7 @@ var Template = function(template) { function configureEditor() { // add helpers if (template.map && template.map instanceof L.Map) { - new L.CrossHair('img/crosshair.png').addTo(template.map); + new L.CrossHair('http://cartodb.github.io/odyssey.js/img/crosshair.png').addTo(template.map); } } diff --git a/editor/css/screen.css b/editor/css/screen.css index 04818a0b..c5bbd8be 100644 --- a/editor/css/screen.css +++ b/editor/css/screen.css @@ -1 +1 @@ -html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td,article,aside,canvas,details,embed,figure,figcaption,footer,header,hgroup,menu,nav,output,ruby,section,summary,time,mark,audio,video{margin:0;padding:0;border:0;font:inherit;font-size:100%;vertical-align:baseline}html{line-height:1}ol,ul{list-style:none}table{border-collapse:collapse;border-spacing:0}caption,th,td{text-align:left;font-weight:normal;vertical-align:middle}q,blockquote{quotes:none}q:before,q:after,blockquote:before,blockquote:after{content:"";content:none}a img{border:none}article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section,summary{display:block}@font-face{font-family:'staticregular';src:url('../fonts/static-webfont.eot');src:url('../fonts/static-webfont.eot?#iefix') format("embedded-opentype"),url('../fonts/static-webfont.woff') format("woff"),url('../fonts/static-webfont.ttf') format("truetype"),url('../fonts/static-webfont.svg#staticregular') format("svg");font-weight:normal;font-style:normal}body{text-align:center;margin:0;padding:0;overflow:hidden;font-family:Helvetica;background:#EEE}#template{position:absolute;top:0;left:0;width:100%;height:100%}.h-valign:before{content:"";display:inline-block;height:100%;width:1px;vertical-align:middle;margin-left:-5px}.splash{position:absolute;z-index:11;top:0;bottom:0;left:0;right:0;background:#000;background:rgba(0,0,0,0.9);text-align:center;min-width:800px}.splash .share_template{background:#fff;padding:40px;width:500px;border-radius:4px;margin-top:20px;text-align:center}.splash .share_template textarea{border:0;width:100%;font:14px Helvetica, Arial;color:#666;height:auto;margin-bottom:40px}.splash .splash_inner,.splash .inner-template{display:inline-block;vertical-align:middle}.splash .splash_inner{position:relative}.splash .inner-template{margin:0 30px}.splash .closeButton{position:absolute;top:11px;right:11px;font-weight:200;color:rgba(255,255,255,0.7);text-decoration:none}.splash .closeButton:hover{color:#fff}.splash h1{font:31px 'staticregular';color:#fff;text-transform:uppercase;margin-bottom:8px}.splash p{font:normal 19px 'staticregular';color:#AEAEAE;color:rgba(255,255,255,0.7);margin-bottom:10px}.splash p.last{margin-bottom:80px}.splash p a{color:#AEAEAE;color:rgba(255,255,255,0.7)}.splash .template_list .button-template{display:inline-block;margin-top:2px;border:2px solid #EC6258;padding:6px 16px;color:#EC6258;border-radius:4px;-webkit-transition:all 0.15s ease-in-out;-moz-transition:all 0.15s ease-in-out;-o-transition:all 0.15s ease-in-out;transition:all 0.15s ease-in-out;text-decoration:none;outline:none;cursor:pointer;font:normal 19px 'staticregular';text-transform:uppercase}.splash .template_list .button-template:hover,.splash .template_list .button-template.zeroclipboard-is-hover{background:#EC6258;color:#fff}.splash .template_list>li{position:relative;width:290px;height:140px;padding:125px 0 30px;color:#444;background:#fff;border-radius:4px;display:inline-block;margin-left:20px;margin-bottom:10px;text-align:center}.splash .template_list>li p{color:#444;font:normal 19px 'staticregular';margin:0 0 20px 0}.splash .template_list>li .anim{display:block;position:absolute;top:-35px;left:50%;margin-left:-90px;width:180px;height:134px}.splash .template_list>li:first-child{margin:0}#copy-button{width:65px}#editor_modal{background:#fff;position:absolute;right:40px;top:40px;bottom:80px;width:452px;text-align:left;box-shadow:0 0 6px rgba(0,0,0,0.2);min-height:330px;-webkit-border-radius:4px 4px;-moz-border-radius:4px / 4px;border-radius:4px / 4px}#editor_modal.expanded{width:720px}#editor_modal .error{text-align:center;background-color:#FFCCCC;color:#F00;position:absolute;padding:10px;z-index:2;font-size:12px;letter-spacing:0;right:0;left:0;bottom:0;border-top:1px solid rgba(0,0,0,0.05);padding:20px;border-bottom-left-radius:4px;border-bottom-right-radius:4px}#editor_modal div.header{position:relative;background:#ff7373;color:white;line-height:1em;margin:0;padding:22px 20px 20px 16px;-moz-border-radius-topleft:4px;-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-topright:4px;-webkit-border-top-right-radius:4px;border-top-right-radius:4px}#editor_modal div.header a.expandButton{background:transparent url('../img/expandButtonIcon.png?1402302094') no-repeat 0 0;padding:4px 13px;z-index:1;position:relative;cursor:pointer}#editor_modal div.header a.expandButton:hover{background-position:0 -28px}#editor_modal div.header a.expandButton.expanded{background-position:-27px 0}#editor_modal div.header a.expandButton.expanded:hover{background-position:-27px -28px}#editor_modal div.header h1{display:inline;width:auto;margin:0 0 0 35px;font:19px 'staticregular';text-transform:uppercase}#editor_modal div.header #show_slide{position:absolute;top:22px;right:20px;font:14px 'staticregular';cursor:pointer;display:inline-block;border-radius:4px;color:#FFF;text-decoration:none}#editor_modal div.header #show_slide:after{content:"";display:inline-block;width:25px;height:26px;vertical-align:middle;background:url('../img/EditButtonIcon.png?1402302094') no-repeat 0 0;margin-left:8px;opacity:.6}#editor_modal div.header #show_slide:hover:after{opacity:1}#editor_modal #actions_bar{position:absolute;left:0;width:55px;top:0;bottom:0;background:rgba(0,0,0,0.05);border-right:1px solid rgba(0,0,0,0.15)}#editor_modal #actions_bar:before{content:"";position:absolute;top:66px;right:0;left:0;height:20px;background:-webkit-gradient(linear, left bottom, left top, color-stop(0%, rgba(0,0,0,0)), color-stop(100%, rgba(0,0,0,0.05)));background:linear-gradient(to top, rgba(242,242,242,0) 0%,#f2f2f2 100%);filter:progid:DXImageTransform.Microsoft.gradient(endColorstr='#f2f2f2', startColorstr='#00f2f2f2', GradientType=0 );z-index:3;pointer-events:none}#editor_modal #actions_bar:after{content:"";position:absolute;bottom:53px;right:0;left:0;height:20px;background:-webkit-gradient(linear, left top, left bottom, color-stop(0%, rgba(0,0,0,0)), color-stop(100%, rgbargba(0, 0, 0, 0.05)));background:linear-gradient(to bottom, rgba(242,242,242,0) 0%,#f2f2f2 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00f2f2f2', endColorstr='#f2f2f2', GradientType=0 );z-index:3;pointer-events:none}#editor_modal #actions_bar.collapseActions:before,#editor_modal #actions_bar.collapseActions:after{display:none}#editor_modal textarea,#editor_modal .CodeMirror{position:absolute;top:66px;bottom:53px;left:0;right:0;height:auto;color:rgba(0,0,0,0.9);background:transparent;font-family:monospace;font-size:14px;padding:20px 20px 20px 72px;overflow-x:hidden}#editor_modal .CodeMirror:after{content:"";position:absolute;bottom:0;right:0;left:56px;height:20px;background:-webkit-gradient(linear, left top, left bottom, color-stop(0%, rgba(255,255,255,0)), color-stop(10%, rgba(255,255,255,0)), color-stop(30%, #fff), color-stop(100%, #fff));background:linear-gradient(to bottom, rgba(255,255,255,0) 0%,rgba(255,255,255,0) 10%,#ffffff 30%,#ffffff 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00ffffff', endColorstr='#ffffff',GradientType=0 );z-index:2;pointer-events:none}#editor_modal .CodeMirror:before{content:"";position:absolute;top:0;right:0;left:56px;height:30px;background:-webkit-gradient(linear, left bottom, left top, color-stop(0%, rgba(255,255,255,0)), color-stop(10%, rgba(255,255,255,0)), color-stop(30%, #fff), color-stop(100%, #fff));background:linear-gradient(to top, rgba(255,255,255,0) 0%,rgba(255,255,255,0) 10%,#ffffff 30%,#ffffff 100%);filter:progid:DXImageTransform.Microsoft.gradient(endColorstr='#ffffff', startColorstr='#00ffffff', GradientType=0 );z-index:3;pointer-events:none}#editor_modal .CodeMirror-scroll{padding-bottom:45px}#editor_modal .actionButton{position:absolute;background-color:#d1d1d1;padding:2px 3px 1px 3px;-webkit-border-radius:2px 2px;-moz-border-radius:2px / 2px;border-radius:2px / 2px;color:#FFF;font-size:8px;text-transform:uppercase}#editor_modal .actionButton:hover{background-color:#afafaf;cursor:pointer}#actionDropdown{position:relative;min-width:150px;z-index:20;text-align:left;border-radius:4px;box-shadow:0 0 6px rgba(0,0,0,0.15);background:#fff;border:1px solid #B7B7B7;padding:0 10px;color:#666}#actionDropdown:before{content:"";position:absolute;width:0px;height:0;left:15px;top:-16px;border:8px solid transparent;border-bottom:8px solid #fff;z-index:1}#actionDropdown:after{content:"";position:absolute;width:0px;height:0;left:15px;top:-17px;border:8px solid transparent;border-bottom:8px solid #B7B7B7}#actionDropdown li:last-child{border-bottom:0px;padding-bottom:10px}#actionDropdown li{list-style:none;border-bottom:1px solid #EDEDED;padding:10px 0;font-size:12px}#actionDropdown li:hover{cursor:pointer;color:#000}#actionDropdown li:first-child{padding-top:10px}#actionDropdown li:last-child{border-bottom:0px;margin:0}#actionDropdown.drop-top:before{border-bottom:8px solid transparent;border-top:8px solid #fff;top:auto;left:15px;bottom:-16px}#actionDropdown.drop-top:after{border-bottom:8px solid transparent;border-top:8px solid #B7B7B7;top:auto;left:15px;bottom:-17px}#actionDropdown img{height:28px;width:28px;margin-right:10px;-webkit-border-radius:2px;-moz-border-radius:2px;-ms-border-radius:2px;-o-border-radius:2px;border-radius:2px}#actionDropdown span{line-height:28px;vertical-align:top}.options{background:rgba(0,0,0,0.02);border-top:1px solid rgba(0,0,0,0.1);padding:8px 12px;position:absolute;bottom:0;left:0;right:0;z-index:1}.options .h-left{float:left}.options .h-left li{margin-left:20px}.options .h-right{float:right}.options li{display:inline-block;margin-left:8px}.options li:first-child{margin:0}.options a,.options div{display:inline-block;width:33px;height:33px;display:inline-block;opacity:.8;z-index:1;cursor:pointer;-webkit-transition:opacity .5s;transition:opacity .5s}.options a:hover,.options div:hover{opacity:1}.options a img,.options div img{width:100%}a.basemapSelector{width:auto;text-decoration:none;font-size:13px;line-height:31px;color:#ababab;text-decoration:none}a.basemapSelector img{height:31px;width:31px;border:2px solid rgba(0,0,0,0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-border-radius:2px;-moz-border-radius:2px;-ms-border-radius:2px;-o-border-radius:2px;border-radius:2px}a.basemapSelector span{vertical-align:top;line-height:33px;margin-left:8px}a.downloadButton{background:transparent url('../img/downloadButtonIcon.png?1402302094') no-repeat 0 0}a.helpButton{background:transparent url('../img/helpButtonIcon.png?1402302094') no-repeat 0 0}a.shareButton{background:transparent url('../img/shareButtonIcon.png?1402302094') no-repeat 0 0}a.collapseButton{background:transparent url('../img/collapseButtonIcon.png?1402302094') no-repeat 0 0}a.expandButton{background:transparent url('../img/expandToogleButtonIcon.png?1402302094') no-repeat 0 0}.shareInput{position:absolute;top:0;left:0;width:100%;border:1px solid #ddd;margin:0;padding:5px;outline:none;height:31px;font:14px/31px Helvetica, Arial;-webkit-border-radius:4px;-moz-border-radius:4px;-ms-border-radius:4px;-o-border-radius:4px;border-radius:4px;color:#333;-webkit-transition:all 0.15s ease-in-out;-moz-transition:all 0.15s ease-in-out;-o-transition:all 0.15s ease-in-out;transition:all 0.15s ease-in-out}.shareInput:focus{border:1px solid #ccc}.input_field{position:relative;display:inline-block;float:left;width:360px;height:48px;margin-right:10px}.mode_menu{position:absolute;top:2px;right:-10px;width:115px;background:#fff}.mode_menu li.first a{-moz-border-radius-topright:3px;-webkit-border-top-right-radius:3px;border-top-right-radius:3px;-moz-border-radius-bottomright:3px;-webkit-border-bottom-right-radius:3px;border-bottom-right-radius:3px}.mode_menu li.last a{-moz-border-radius-topleft:3px;-webkit-border-top-left-radius:3px;border-top-left-radius:3px;-moz-border-radius-bottomleft:3px;-webkit-border-bottom-left-radius:3px;border-bottom-left-radius:3px}.mode_menu li.selected a,.mode_menu li a:hover{background:#EC6258;color:#fff}.mode_menu li.selected a:hover{background:#e94c41}.mode_menu a{display:block;float:right;width:55px;margin-left:1px;font-weight:bold;font-size:11px;line-height:39px;text-transform:uppercase;text-decoration:none;background:#eee;color:#FF7373;-webkit-transition:all 0.15s ease-in-out;-moz-transition:all 0.15s ease-in-out;-o-transition:all 0.15s ease-in-out;transition:all 0.15s ease-in-out} +@import url("http://fast.fonts.net/t/1.css?apiType=css&projectid=3af16084-ba56-49ca-b37d-0b49b59e1927");html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td,article,aside,canvas,details,embed,figure,figcaption,footer,header,hgroup,menu,nav,output,ruby,section,summary,time,mark,audio,video{margin:0;padding:0;border:0;font:inherit;font-size:100%;vertical-align:baseline}html{line-height:1}ol,ul{list-style:none}table{border-collapse:collapse;border-spacing:0}caption,th,td{text-align:left;font-weight:normal;vertical-align:middle}q,blockquote{quotes:none}q:before,q:after,blockquote:before,blockquote:after{content:"";content:none}a img{border:none}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}@font-face{font-family:'staticregular';src:url(//cartodb-assets.global.ssl.fastly.net/odyssey.js/static-webfont.eot);src:url(//cartodb-assets.global.ssl.fastly.net/odyssey.js/static-webfont.eot?#iefix) format("embedded-opentype"),url(//cartodb-assets.global.ssl.fastly.net/odyssey.js/static-webfont.woff) format("woff"),url(//cartodb-assets.global.ssl.fastly.net/odyssey.js/static-webfont.ttf) format("truetype"),url(//cartodb-assets.global.ssl.fastly.net/odyssey.js/static-webfont.svg#staticregular) format("svg");font-weight:normal;font-style:normal}body{text-align:center;margin:0;padding:0;overflow:hidden;font-family:Helvetica;background:#EEE}#template{position:absolute;top:0;left:0;width:100%;height:100%}.h-valign:before{content:"";display:inline-block;height:100%;width:1px;vertical-align:middle;margin-left:-5px}.splash{position:absolute;z-index:11;top:0;bottom:0;left:0;right:0;background:#000;background:rgba(0,0,0,0.9);text-align:center;min-width:800px}.splash .share_template{background:#fff;padding:40px;width:500px;border-radius:4px;margin-top:20px;text-align:center}.splash .share_template textarea{border:0;width:100%;font:14px Helvetica, Arial;color:#666;height:auto;margin-bottom:40px}.splash .splash_inner,.splash .inner-template{display:inline-block;vertical-align:middle}.splash .splash_inner{position:relative}.splash .inner-template{margin:0 30px}.splash .closeButton{position:absolute;top:11px;right:11px;font-weight:200;color:rgba(255,255,255,0.7);text-decoration:none}.splash .closeButton:hover{color:#fff}.splash h1{font:31px 'staticregular';color:#fff;text-transform:uppercase;margin-bottom:8px}.splash p{font:normal 19px 'staticregular';color:#AEAEAE;color:rgba(255,255,255,0.7);margin-bottom:10px}.splash p.last{margin-bottom:80px}.splash p a{color:#AEAEAE;color:rgba(255,255,255,0.7)}.splash .template_list .button-template{display:inline-block;margin-top:2px;border:2px solid #EC6258;padding:6px 16px;color:#EC6258;border-radius:4px;-moz-transition:all 0.15s ease-in-out;-o-transition:all 0.15s ease-in-out;-webkit-transition:all 0.15s ease-in-out;transition:all 0.15s ease-in-out;text-decoration:none;outline:none;cursor:pointer;font:normal 19px 'staticregular';text-transform:uppercase}.splash .template_list .button-template:hover,.splash .template_list .button-template.zeroclipboard-is-hover{background:#EC6258;color:#fff}.splash .template_list>li{position:relative;width:290px;height:140px;padding:125px 0 30px;color:#444;background:#fff;border-radius:4px;display:inline-block;margin-left:20px;margin-bottom:10px;text-align:center}.splash .template_list>li p{color:#444;font:normal 19px 'staticregular';margin:0 0 20px 0}.splash .template_list>li .anim{display:block;position:absolute;top:-35px;left:50%;margin-left:-90px;width:180px;height:134px}.splash .template_list>li:first-child{margin:0}#copy-button{width:65px}#editor_modal{background:#fff;position:absolute;right:40px;top:40px;bottom:80px;width:452px;text-align:left;box-shadow:0 0 6px rgba(0,0,0,0.2);min-height:330px;-moz-border-radius:4px / 4px;-webkit-border-radius:4px 4px;border-radius:4px / 4px}#editor_modal.expanded{width:720px}#editor_modal .error{text-align:center;background-color:#FFCCCC;color:#F00;position:absolute;padding:10px;z-index:2;font-size:12px;letter-spacing:0;right:0;left:0;bottom:0;border-top:1px solid rgba(0,0,0,0.05);padding:20px;border-bottom-left-radius:4px;border-bottom-right-radius:4px}#editor_modal div.header{position:relative;background:#ff7373;color:white;line-height:1em;margin:0;padding:22px 20px 20px 16px;-moz-border-radius-topleft:4px;-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-topright:4px;-webkit-border-top-right-radius:4px;border-top-right-radius:4px}#editor_modal div.header a.expandButton{background:transparent url('../img/expandButtonIcon.png?1407168446') no-repeat 0 0;padding:4px 13px;z-index:1;position:relative;cursor:pointer}#editor_modal div.header a.expandButton:hover{background-position:0 -28px}#editor_modal div.header a.expandButton.expanded{background-position:-27px 0}#editor_modal div.header a.expandButton.expanded:hover{background-position:-27px -28px}#editor_modal div.header h1{display:inline;width:auto;margin:0 0 0 35px;font:19px 'staticregular';text-transform:uppercase}#editor_modal div.header #show_slide{position:absolute;top:22px;right:20px;font:14px 'staticregular';cursor:pointer;display:inline-block;border-radius:4px;color:#FFF;text-decoration:none}#editor_modal div.header #show_slide:after{content:"";display:inline-block;width:25px;height:26px;vertical-align:middle;background:url('../img/EditButtonIcon.png?1407168451') no-repeat 0 0;margin-left:8px;opacity:.6}#editor_modal div.header #show_slide:hover:after{opacity:1}#editor_modal #actions_bar{position:absolute;left:0;width:55px;top:0;bottom:0;background:rgba(0,0,0,0.05);border-right:1px solid rgba(0,0,0,0.15)}#editor_modal #actions_bar:before{content:"";position:absolute;top:66px;right:0;left:0;height:20px;background:-webkit-gradient(linear, left bottom, left top, color-stop(0%, transparent), color-stop(100%, rgba(0,0,0,0.05)));background:linear-gradient(to top, rgba(242,242,242,0) 0%, #f2f2f2 100%);filter:progid:DXImageTransform.Microsoft.gradient(endColorstr='#f2f2f2', startColorstr='#00f2f2f2', GradientType=0 );z-index:3;pointer-events:none}#editor_modal #actions_bar:after{content:"";position:absolute;bottom:53px;right:0;left:0;height:20px;background:-webkit-gradient(linear, left top, left bottom, color-stop(0%, transparent), color-stop(100%, rgbargba(0, 0, 0, 0.05)));background:linear-gradient(to bottom, rgba(242,242,242,0) 0%, #f2f2f2 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00f2f2f2', endColorstr='#f2f2f2', GradientType=0 );z-index:3;pointer-events:none}#editor_modal #actions_bar.collapseActions:before,#editor_modal #actions_bar.collapseActions:after{display:none}#editor_modal textarea,#editor_modal .CodeMirror{position:absolute;top:66px;bottom:53px;left:0;right:0;height:auto;color:rgba(0,0,0,0.9);background:transparent;font-family:monospace;font-size:14px;padding:20px 20px 20px 72px;overflow-x:hidden}#editor_modal .CodeMirror:after{content:"";position:absolute;bottom:0;right:0;left:56px;height:20px;background:-webkit-gradient(linear, left top, left bottom, color-stop(0%, rgba(255,255,255,0)), color-stop(10%, rgba(255,255,255,0)), color-stop(30%, #fff), color-stop(100%, #fff));background:linear-gradient(to bottom, rgba(255,255,255,0) 0%, rgba(255,255,255,0) 10%, #fff 30%, #fff 100%);filter:progid:DXImageTransform.Microsoft.gradient( startColorstr='#00ffffff', endColorstr='#ffffff',GradientType=0 );z-index:2;pointer-events:none}#editor_modal .CodeMirror:before{content:"";position:absolute;top:0;right:0;left:56px;height:30px;background:-webkit-gradient(linear, left bottom, left top, color-stop(0%, rgba(255,255,255,0)), color-stop(10%, rgba(255,255,255,0)), color-stop(30%, #fff), color-stop(100%, #fff));background:linear-gradient(to top, rgba(255,255,255,0) 0%, rgba(255,255,255,0) 10%, #fff 30%, #fff 100%);filter:progid:DXImageTransform.Microsoft.gradient(endColorstr='#ffffff', startColorstr='#00ffffff', GradientType=0 );z-index:3;pointer-events:none}#editor_modal .CodeMirror-scroll{padding-bottom:45px}#editor_modal .actionButton{position:absolute;background-color:#d1d1d1;padding:2px 3px 1px 3px;-moz-border-radius:2px / 2px;-webkit-border-radius:2px 2px;border-radius:2px / 2px;color:#FFF;font-size:8px;text-transform:uppercase}#editor_modal .actionButton:hover{background-color:#afafaf;cursor:pointer}#actionDropdown{position:relative;min-width:150px;z-index:20;text-align:left;border-radius:4px;box-shadow:0 0 6px rgba(0,0,0,0.15);background:#fff;border:1px solid #B7B7B7;padding:0 10px;color:#666}#actionDropdown:before{content:"";position:absolute;width:0px;height:0;left:15px;top:-16px;border:8px solid transparent;border-bottom:8px solid #fff;z-index:1}#actionDropdown:after{content:"";position:absolute;width:0px;height:0;left:15px;top:-17px;border:8px solid transparent;border-bottom:8px solid #B7B7B7}#actionDropdown li:last-child{border-bottom:0px;padding-bottom:10px}#actionDropdown li{list-style:none;border-bottom:1px solid #EDEDED;padding:10px 0;font-size:12px}#actionDropdown li:hover{cursor:pointer;color:#000}#actionDropdown li:first-child{padding-top:10px}#actionDropdown li:last-child{border-bottom:0px;margin:0}#actionDropdown.drop-top:before{border-bottom:8px solid transparent;border-top:8px solid #fff;top:auto;left:15px;bottom:-16px}#actionDropdown.drop-top:after{border-bottom:8px solid transparent;border-top:8px solid #B7B7B7;top:auto;left:15px;bottom:-17px}#actionDropdown img{height:28px;width:28px;margin-right:10px;-moz-border-radius:2px;-webkit-border-radius:2px;border-radius:2px}#actionDropdown span{line-height:28px;vertical-align:top}.options{background:rgba(0,0,0,0.02);border-top:1px solid rgba(0,0,0,0.1);padding:8px 12px;position:absolute;bottom:0;left:0;right:0;z-index:1}.options .h-left{float:left}.options .h-left li{margin-left:20px}.options .h-right{float:right}.options li{display:inline-block;margin-left:8px}.options li:first-child{margin:0}.options a,.options div{display:inline-block;width:33px;height:33px;display:inline-block;opacity:.8;z-index:1;cursor:pointer;-webkit-transition:opacity .5s;transition:opacity .5s}.options a:hover,.options div:hover{opacity:1}.options a img,.options div img{width:100%}a.basemapSelector{width:auto;text-decoration:none;font-size:13px;line-height:31px;color:#ababab;text-decoration:none}a.basemapSelector img{height:31px;width:31px;border:2px solid rgba(0,0,0,0.15);-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;-moz-border-radius:2px;-webkit-border-radius:2px;border-radius:2px}a.basemapSelector span{vertical-align:top;line-height:33px;margin-left:8px}a.downloadButton{background:transparent url('../img/downloadButtonIcon.png?1407168446') no-repeat 0 0}a.helpButton{background:transparent url('../img/helpButtonIcon.png?1407168449') no-repeat 0 0}a.shareButton{background:transparent url('../img/shareButtonIcon.png?1407168447') no-repeat 0 0}a.collapseButton{background:transparent url('../img/collapseButtonIcon.png?1407168445') no-repeat 0 0}a.expandButton{background:transparent url('../img/expandToogleButtonIcon.png?1407168451') no-repeat 0 0}.shareInput{position:absolute;top:0;left:0;width:100%;border:1px solid #ddd;margin:0;padding:5px;outline:none;height:31px;font:14px/31px Helvetica, Arial;-moz-border-radius:4px;-webkit-border-radius:4px;border-radius:4px;color:#333;-moz-transition:all 0.15s ease-in-out;-o-transition:all 0.15s ease-in-out;-webkit-transition:all 0.15s ease-in-out;transition:all 0.15s ease-in-out}.shareInput:focus{border:1px solid #ccc}.input_field{position:relative;display:inline-block;float:left;width:360px;height:48px;margin-right:10px}.mode_menu{position:absolute;top:2px;right:-10px;width:115px;background:#fff}.mode_menu li.first a{-moz-border-radius-topright:3px;-webkit-border-top-right-radius:3px;border-top-right-radius:3px;-moz-border-radius-bottomright:3px;-webkit-border-bottom-right-radius:3px;border-bottom-right-radius:3px}.mode_menu li.last a{-moz-border-radius-topleft:3px;-webkit-border-top-left-radius:3px;border-top-left-radius:3px;-moz-border-radius-bottomleft:3px;-webkit-border-bottom-left-radius:3px;border-bottom-left-radius:3px}.mode_menu li.selected a,.mode_menu li a:hover{background:#EC6258;color:#fff}.mode_menu li.selected a:hover{background:#e94c41}.mode_menu a{display:block;float:right;width:55px;margin-left:1px;font-weight:bold;font-size:11px;line-height:39px;text-transform:uppercase;text-decoration:none;background:#eee;color:#FF7373;-moz-transition:all 0.15s ease-in-out;-o-transition:all 0.15s ease-in-out;-webkit-transition:all 0.15s ease-in-out;transition:all 0.15s ease-in-out} diff --git a/editor/css/scroll.css b/editor/css/scroll.css index b849ed51..64a0d982 100644 --- a/editor/css/scroll.css +++ b/editor/css/scroll.css @@ -1 +1 @@ -html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td,article,aside,canvas,details,embed,figure,figcaption,footer,header,hgroup,menu,nav,output,ruby,section,summary,time,mark,audio,video{margin:0;padding:0;border:0;font:inherit;font-size:100%;vertical-align:baseline}html{line-height:1}ol,ul{list-style:none}table{border-collapse:collapse;border-spacing:0}caption,th,td{text-align:left;font-weight:normal;vertical-align:middle}q,blockquote{quotes:none}q:before,q:after,blockquote:before,blockquote:after{content:"";content:none}a img{border:none}article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section,summary{display:block}@font-face{font-family:"AleoRegular";src:url('../fonts/aleo-regular-webfont.eot');src:url('../fonts/aleo-regular-webfont.eot?#iefix') format('embedded-opentype'),url('../fonts/aleo-regular-webfont.woff') format('woff'), url('../fonts/aleo-regular-webfont.ttf') format('truetype'), url('../fonts/aleo-regular-webfont.svg') format('svg')}@font-face{font-family:"AleoBold";src:url('../fonts/aleo-bold-webfont.eot');src:url('../fonts/aleo-bold-webfont.eot?#iefix') format('embedded-opentype'),url('../fonts/aleo-bold-webfont.woff') format('woff'), url('../fonts/aleo-bold-webfont.ttf') format('truetype'), url('../fonts/aleo-bold-webfont.svg') format('svg')}@font-face{font-family:"ProximaNovaBold";src:url('../fonts/ProximaNova-bold.eot');src:url('../fonts/ProximaNova-bold.eot?#iefix') format('embedded-opentype'),url('../fonts/ProximaNova-bold.woff') format('woff'), url('../fonts/ProximaNova-bold.ttf') format('truetype'), url('../fonts/ProximaNova-bold.svg') format('svg')}body{text-align:center;min-height:100%;background:#fff}html{min-height:100%}.progress-bar{position:fixed;left:0;top:0;height:3px;display:inline-block;background:#ff7373;width:20%;z-index:2}.inner-header{background:#333;color:#fff;padding:20px 0}#layout{width:100%;margin:0px auto;background:#f5f5f5}#header{padding:20px 0;max-width:800px;margin:0 auto}#header h1{font:40px 'AleoBold';color:#fff}#header h2{font:28px/32px 'AleoRegular';color:rgba(255,255,255,0.6);margin-top:12px}#header h3{font:24px 'AleoRegular';color:rgba(255,255,255,0.6);margin-top:12px}#header h4{font:22px 'AleoRegular';color:rgba(255,255,255,0.6);margin-top:12px}#header h5{font:20px 'AleoRegular';color:rgba(255,255,255,0.6);margin-top:12px}#header h6{font:18px 'AleoRegular';color:rgba(255,255,255,0.6);margin-top:12px}#header p{font:16px/26px 'AleoRegular';color:rgba(255,255,255,0.6);margin-top:12px}#header a{text-decoration:none;color:#666}#header ul,#header ol{font:16px/26px 'AleoRegular';color:#666;margin-top:12px}#header ul{list-style-type:disc}#header ol{list-style-type:lower-hexadecimal}#header blockquote{background:#f5f5f5;padding:20px;margin-top:20px;border-radius:4px}#header blockquote ul,#header blockquote ol{margin-left:17px}#header blockquote *:first-child{margin-top:0}#map{width:100%;height:100%}#map_container{height:250px}#map_container.attachTop{position:fixed;width:100%;top:0;box-shadow:0 2px 2px rgba(0,0,0,0.2)}#content{padding:40px 40px 80px;max-width:800px;margin:0 auto;text-align:left;min-height:1800px}#content img{max-width:100%;margin:20px 0 0 0}#content.attachMap{margin-top:250px}#content>div{margin-top:40px;background:#fff;padding:40px;border-radius:2px;box-shadow:0 1px 0px rgba(0,0,0,0.1)}#content>div:first-child{margin:0}#content h1{font:26px 'AleoBold';color:#333}#content h1:before{content:"";height:3px;display:block;width:70px;background:#333;margin-bottom:15px}#content h2,#content h3,#content h4,#content h5,#content h6{font:18px 'AleoBold';color:#333;margin-top:20px}#content p{font:16px/26px 'AleoRegular';color:#666;margin-top:20px}#content a{text-decoration:none;color:#666}#content ul,#content ol{font:16px/26px 'AleoRegular';color:#666;margin-top:20px}#content ul{list-style-type:disc}#content ol{list-style-type:lower-hexadecimal}#content blockquote{background:#f5f5f5;padding:20px;margin-top:20px;border-radius:4px}#content blockquote ul,#content blockquote ol{margin-left:17px}#content blockquote *:first-child{margin-top:0}#content strong{font-family:"AleoBold"}#content em{font-style:italic}div#credits{position:fixed;bottom:0;left:0;right:0;height:44px;background-color:#FFF;border-top:1px solid #e5e5e5;z-index:1000001}div#credits a{color:#ff7373}div#credits span{padding:18px 0 0 0;position:absolute;font-size:12px;text-transform:uppercase}div#credits span.title{left:40px;font-family:ProximaNovaBold, Sans-serif;color:#333}div#credits span.author{right:40px;font-family:AleoRegular, Serif;color:#999;letter-spacing:2px;font-size:10px;text-align:right} +@import url("http://fast.fonts.net/t/1.css?apiType=css&projectid=3af16084-ba56-49ca-b37d-0b49b59e1927");html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td,article,aside,canvas,details,embed,figure,figcaption,footer,header,hgroup,menu,nav,output,ruby,section,summary,time,mark,audio,video{margin:0;padding:0;border:0;font:inherit;font-size:100%;vertical-align:baseline}html{line-height:1}ol,ul{list-style:none}table{border-collapse:collapse;border-spacing:0}caption,th,td{text-align:left;font-weight:normal;vertical-align:middle}q,blockquote{quotes:none}q:before,q:after,blockquote:before,blockquote:after{content:"";content:none}a img{border:none}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}@font-face{font-family:"AleoRegular";src:url(//cartodb-assets.global.ssl.fastly.net/odyssey.js/Aleo-Regular-webfont.eot);src:url(//cartodb-assets.global.ssl.fastly.net/odyssey.js/Aleo-Regular-webfont.eot?#iefix) format('embedded-opentype'),url(//cartodb-assets.global.ssl.fastly.net/odyssey.js/Aleo-Regular-webfont.woff) format('woff'),url(//cartodb-assets.global.ssl.fastly.net/odyssey.js/Aleo-Regular-webfont.ttf) format('truetype'),url(//cartodb-assets.global.ssl.fastly.net/odyssey.js/Aleo-Regular-webfont.svg) format('svg')}@font-face{font-family:"AleoBold";src:url(//cartodb-assets.global.ssl.fastly.net/odyssey.js/Aleo-Bold-webfont.eot);src:url(//cartodb-assets.global.ssl.fastly.net/odyssey.js/Aleo-Bold-webfont.eot?#iefix) format('embedded-opentype'),url(//cartodb-assets.global.ssl.fastly.net/odyssey.js/Aleo-Bold-webfont.woff) format('woff'),url(//cartodb-assets.global.ssl.fastly.net/odyssey.js/Aleo-Bold-webfont.ttf) format('truetype'),url(//cartodb-assets.global.ssl.fastly.net/odyssey.js/Aleo-Bold-webfont.svg) format('svg')}@font-face{font-family:"ProximaNovaBold";src:url(//cartodb-assets.global.ssl.fastly.net/odyssey.js/fbc6b03a-b3a1-427c-a884-053deca3a53c.eot);src:url(//cartodb-assets.global.ssl.fastly.net/odyssey.js/fbc6b03a-b3a1-427c-a884-053deca3a53c.eot?#iefix) format('embedded-opentype'),url(//cartodb-assets.global.ssl.fastly.net/odyssey.js/d999c07b-a049-4eb5-b8a6-4f36ae25e67e.woff) format('woff'),url(//cartodb-assets.global.ssl.fastly.net/odyssey.js/4d4a75f5-d32a-4a09-8665-133afd39cc37.ttf) format('truetype'),url(//cartodb-assets.global.ssl.fastly.net/odyssey.js/8152bc4e-d700-4c78-b6be-326893e6f53f.svg) format('svg')}body{text-align:center;min-height:100%;background:#fff}html{min-height:100%}.progress-bar{position:fixed;left:0;top:0;height:3px;display:inline-block;background:#ff7373;width:20%;z-index:2}.inner-header{background:#333;color:#fff;padding:20px 0}#layout{width:100%;margin:0px auto;background:#f5f5f5}#header{padding:20px 0;max-width:800px;margin:0 auto}#header h1{font:40px 'AleoBold';color:#fff}#header h2{font:28px/32px 'AleoRegular';color:rgba(255,255,255,0.6);margin-top:12px}#header h3{font:24px 'AleoRegular';color:rgba(255,255,255,0.6);margin-top:12px}#header h4{font:22px 'AleoRegular';color:rgba(255,255,255,0.6);margin-top:12px}#header h5{font:20px 'AleoRegular';color:rgba(255,255,255,0.6);margin-top:12px}#header h6{font:18px 'AleoRegular';color:rgba(255,255,255,0.6);margin-top:12px}#header p{font:16px/26px 'AleoRegular';color:rgba(255,255,255,0.6);margin-top:12px}#header a{text-decoration:none;color:#666}#header ul,#header ol{font:16px/26px 'AleoRegular';color:#666;margin-top:12px}#header ul{list-style-type:disc}#header ol{list-style-type:lower-hexadecimal}#header blockquote{background:#f5f5f5;padding:20px;margin-top:20px;border-radius:4px}#header blockquote ul,#header blockquote ol{margin-left:17px}#header blockquote *:first-child{margin-top:0}#map{width:100%;height:100%}#map_container{height:250px}#map_container.attachTop{position:fixed;width:100%;top:0;box-shadow:0 2px 2px rgba(0,0,0,0.2)}#content{padding:40px 40px 80px;max-width:800px;margin:0 auto;text-align:left;min-height:1800px}#content img{max-width:100%;margin:20px 0 0 0}#content.attachMap{margin-top:250px}#content>div{margin-top:40px;background:#fff;padding:40px;border-radius:2px;box-shadow:0 1px 0px rgba(0,0,0,0.1)}#content>div:first-child{margin:0}#content h1{font:26px 'AleoBold';color:#333}#content h1:before{content:"";height:3px;display:block;width:70px;background:#333;margin-bottom:15px}#content h2,#content h3,#content h4,#content h5,#content h6{font:18px 'AleoBold';color:#333;margin-top:20px}#content p{font:16px/26px 'AleoRegular';color:#666;margin-top:20px}#content a{text-decoration:none;color:#666}#content ul,#content ol{font:16px/26px 'AleoRegular';color:#666;margin-top:20px}#content ul{list-style-type:disc}#content ol{list-style-type:lower-hexadecimal}#content blockquote{background:#f5f5f5;padding:20px;margin-top:20px;border-radius:4px}#content blockquote ul,#content blockquote ol{margin-left:17px}#content blockquote *:first-child{margin-top:0}#content strong{font-family:"AleoBold"}#content em{font-style:italic}div#credits{position:fixed;bottom:0;left:0;right:0;height:44px;background-color:#FFF;border-top:1px solid #e5e5e5;z-index:1000001}div#credits a{color:#ff7373}div#credits span{padding:18px 0 0 0;position:absolute;font-size:12px;text-transform:uppercase}div#credits span.title{left:40px;font-family:'Proxima N W01 Bold', Sans-serif;color:#333}div#credits span.author{right:40px;font-family:AleoRegular, Serif;color:#999;letter-spacing:2px;font-size:10px;text-align:right} diff --git a/editor/css/slides.css b/editor/css/slides.css index c4626877..2951aa86 100644 --- a/editor/css/slides.css +++ b/editor/css/slides.css @@ -1 +1 @@ -html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td,article,aside,canvas,details,embed,figure,figcaption,footer,header,hgroup,menu,nav,output,ruby,section,summary,time,mark,audio,video{margin:0;padding:0;border:0;font:inherit;font-size:100%;vertical-align:baseline}html{line-height:1}ol,ul{list-style:none}table{border-collapse:collapse;border-spacing:0}caption,th,td{text-align:left;font-weight:normal;vertical-align:middle}q,blockquote{quotes:none}q:before,q:after,blockquote:before,blockquote:after{content:"";content:none}a img{border:none}article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section,summary{display:block}@font-face{font-family:"AleoRegular";src:url('../fonts/aleo-regular-webfont.eot');src:url('../fonts/aleo-regular-webfont.eot?#iefix') format('embedded-opentype'),url('../fonts/aleo-regular-webfont.woff') format('woff'), url('../fonts/aleo-regular-webfont.ttf') format('truetype'), url('../fonts/aleo-regular-webfont.svg') format('svg')}@font-face{font-family:"AleoBold";src:url('../fonts/aleo-bold-webfont.eot');src:url('../fonts/aleo-bold-webfont.eot?#iefix') format('embedded-opentype'),url('../fonts/aleo-bold-webfont.woff') format('woff'), url('../fonts/aleo-bold-webfont.ttf') format('truetype'), url('../fonts/aleo-bold-webfont.svg') format('svg')}@font-face{font-family:"ProximaNovaBold";src:url('../fonts/ProximaNova-bold.eot');src:url('../fonts/ProximaNova-bold.eot?#iefix') format('embedded-opentype'),url('../fonts/ProximaNova-bold.woff') format('woff'), url('../fonts/ProximaNova-bold.ttf') format('truetype'), url('../fonts/ProximaNova-bold.svg') format('svg')}body{overflow:hidden}#map{position:absolute;top:0;left:0;width:100%;height:100%}#slides_container{display:none;position:absolute;top:40px;left:40px;width:320px;padding:40px;padding-right:20px;background-color:#fff;background-color:rgba(255,255,255,0.7);z-index:10}#slides_container.visible{display:block !important}#slides_container .slide{display:none;overflow-y:auto;padding-right:20px}#slides_container .slide.selected{display:block !important}#slides_container .slide.scrolled img{margin:20px 0;width:100%}#slides_container .slide strong{font-family:"AleoBold"}#slides_container .slide em{font-style:italic}#slides_container h1,#slides_container h2,#slides_container h3,#slides_container h4,#slides_container h5,#slides_container h6{font-family:ProximaNovaBold, Sans-serif;color:#333;font-size:45px}#slides_container h1:after,#slides_container h2:after,#slides_container h3:after,#slides_container h4:after,#slides_container h5:after,#slides_container h6:after{display:block;margin:20px 0 20px 0;height:3px;content:" ";text-shadow:none;background-color:#333;width:140px}#slides_container h2,#slides_container h3,#slides_container h4,#slides_container h5,#slides_container h6{font-size:19px}#slides_container h2:after,#slides_container h3:after,#slides_container h4:after,#slides_container h5:after,#slides_container h6:after{height:1px;margin:18px 0 18px 0;width:180px}#slides_container p,#slides_container span{font-family:AleoRegular, Serif;color:#333;font-size:15px;line-height:21px;margin:0 0 19px 0}#slides_container a{color:#FF7373;text-decoration:none}#slides_container a:hover{text-decoration:underline}#front_slide.hidden{display:none}#dots{margin:0 0 20px 0}#dots li{display:inline}#dots li a{opacity:0.2;color:#333}#dots li a:before{content:' \25CF';font-size:16px}#dots li a.active{opacity:1}#dots li a:hover{opacity:1;cursor:pointer;text-decoration:none}#slides_container img{margin:20px 0;max-width:100%}ul#navButtons{margin:20px 0 0 0}ul#navButtons li{width:30px;display:inline}ul#navButtons li a{display:inline-block;width:23px;height:30px;background:transparent url('../img/navBtns.png?1402302094') no-repeat -10px 0}ul#navButtons li a:hover{background-position:-10px -30px;cursor:pointer}ul#navButtons li a.next{background:transparent url('../img/navBtns.png?1402302094') no-repeat -30px 0}ul#navButtons li a.next:hover{background-position:-30px -30px}div#credits{position:absolute;bottom:0;left:0;right:0;height:44px;background-color:#FFF;z-index:1000001}div#credits a{color:#ff7373}div#credits span{padding:18px 0 0 0;position:absolute;font-size:12px;text-transform:uppercase}div#credits span.title{left:40px;font-family:ProximaNovaBold, Sans-serif;color:#333}div#credits span.author{right:40px;font-family:AleoRegular, Serif;color:#999;letter-spacing:2px;font-size:10px;text-align:right}.slide-tip{position:absolute;top:-18px;width:3px;height:37px;border:3px solid transparent;border-top:0;border-bottom-color:#ddd;text-align:center}.slide-tip:hover .tooltip{display:inline-block !important}.slide-tip:hover:after{background:#ccc;width:3px}.slide-tip:after{content:"";display:inline-block;background:#ddd;width:1px;height:40px;-webkit-transition:all 0.15s ease-in-out;-moz-transition:all 0.15s ease-in-out;-o-transition:all 0.15s ease-in-out;transition:all 0.15s ease-in-out}.slide-tip .tooltip{position:absolute;display:none;background:rgba(0,0,0,0.85);bottom:50px;max-width:200px;padding:10px;margin-left:-17px;box-shadow:0 0 1px rgba(255,255,255,0.2);border-radius:2px;color:#FFF;line-height:1;text-align:left;font-size:12px;white-space:nowrap}.slide-tip .tooltip h1,.slide-tip .tooltip p{height:auto;padding:0;margin:0;text-align:left;color:#EEE;font-weight:normal;line-height:1.1;width:auto}.slide-tip .tooltip h1{font-weight:bold;margin-bottom:8px;font-size:11px}.slide-tip .tooltip p{white-space:nowrap}.slide-tip .tooltip:after{content:"";display:block;position:absolute;bottom:-5px;left:10px;border-top:5px solid rgba(0,0,0,0.85);border-left:7px solid transparent;border-right:7px solid transparent}div.cartodb-timeslider .ui-slider .ui-slider-range{background-color:#FF7373}.cartodb-timeslider{bottom:50px !important;left:40px !important} +@import url("http://fast.fonts.net/t/1.css?apiType=css&projectid=3af16084-ba56-49ca-b37d-0b49b59e1927");html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td,article,aside,canvas,details,embed,figure,figcaption,footer,header,hgroup,menu,nav,output,ruby,section,summary,time,mark,audio,video{margin:0;padding:0;border:0;font:inherit;font-size:100%;vertical-align:baseline}html{line-height:1}ol,ul{list-style:none}table{border-collapse:collapse;border-spacing:0}caption,th,td{text-align:left;font-weight:normal;vertical-align:middle}q,blockquote{quotes:none}q:before,q:after,blockquote:before,blockquote:after{content:"";content:none}a img{border:none}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}@font-face{font-family:"AleoRegular";src:url(//cartodb-assets.global.ssl.fastly.net/odyssey.js/Aleo-Regular-webfont.eot);src:url(//cartodb-assets.global.ssl.fastly.net/odyssey.js/Aleo-Regular-webfont.eot?#iefix) format('embedded-opentype'),url(//cartodb-assets.global.ssl.fastly.net/odyssey.js/Aleo-Regular-webfont.woff) format('woff'),url(//cartodb-assets.global.ssl.fastly.net/odyssey.js/Aleo-Regular-webfont.ttf) format('truetype'),url(//cartodb-assets.global.ssl.fastly.net/odyssey.js/Aleo-Regular-webfont.svg) format('svg')}@font-face{font-family:"AleoBold";src:url(//cartodb-assets.global.ssl.fastly.net/odyssey.js/Aleo-Bold-webfont.eot);src:url(//cartodb-assets.global.ssl.fastly.net/odyssey.js/Aleo-Bold-webfont.eot?#iefix) format('embedded-opentype'),url(//cartodb-assets.global.ssl.fastly.net/odyssey.js/Aleo-Bold-webfont.woff) format('woff'),url(//cartodb-assets.global.ssl.fastly.net/odyssey.js/Aleo-Bold-webfont.ttf) format('truetype'),url(//cartodb-assets.global.ssl.fastly.net/odyssey.js/Aleo-Bold-webfont.svg) format('svg')}@font-face{font-family:"ProximaNovaBold";src:url(//cartodb-assets.global.ssl.fastly.net/odyssey.js/fbc6b03a-b3a1-427c-a884-053deca3a53c.eot);src:url(//cartodb-assets.global.ssl.fastly.net/odyssey.js/fbc6b03a-b3a1-427c-a884-053deca3a53c.eot?#iefix) format('embedded-opentype'),url(//cartodb-assets.global.ssl.fastly.net/odyssey.js/d999c07b-a049-4eb5-b8a6-4f36ae25e67e.woff) format('woff'),url(//cartodb-assets.global.ssl.fastly.net/odyssey.js/4d4a75f5-d32a-4a09-8665-133afd39cc37.ttf) format('truetype'),url(//cartodb-assets.global.ssl.fastly.net/odyssey.js/8152bc4e-d700-4c78-b6be-326893e6f53f.svg) format('svg')}body{overflow:hidden}#map{position:absolute;top:0;left:0;width:100%;height:100%}#slides_container{display:none;position:absolute;top:40px;left:40px;width:320px;padding:40px;padding-right:20px;background-color:#fff;background-color:rgba(255,255,255,0.7);z-index:10}#slides_container.visible{display:block !important}#slides_container .slide{display:none;overflow-y:auto;padding-right:20px}#slides_container .slide.selected{display:block !important}#slides_container .slide.scrolled img{margin:20px 0;width:100%}#slides_container .slide strong{font-family:"AleoBold"}#slides_container .slide em{font-style:italic}#slides_container h1,#slides_container h2,#slides_container h3,#slides_container h4,#slides_container h5,#slides_container h6{font-family:'Proxima N W01 Bold', Sans-serif;color:#333;font-size:45px}#slides_container h1:after,#slides_container h2:after,#slides_container h3:after,#slides_container h4:after,#slides_container h5:after,#slides_container h6:after{display:block;margin:20px 0 20px 0;height:3px;content:" ";text-shadow:none;background-color:#333;width:140px}#slides_container h2,#slides_container h3,#slides_container h4,#slides_container h5,#slides_container h6{font-size:19px}#slides_container h2:after,#slides_container h3:after,#slides_container h4:after,#slides_container h5:after,#slides_container h6:after{height:1px;margin:18px 0 18px 0;width:180px}#slides_container p,#slides_container span{font-family:AleoRegular, Serif;color:#333;font-size:15px;line-height:21px;margin:0 0 19px 0}#slides_container a{color:#FF7373;text-decoration:none}#slides_container a:hover{text-decoration:underline}#front_slide.hidden{display:none}#dots{margin:0 0 20px 0}#dots li{display:inline}#dots li a{opacity:0.2;color:#333}#dots li a:before{content:' \25CF';font-size:16px}#dots li a.active{opacity:1}#dots li a:hover{opacity:1;cursor:pointer;text-decoration:none}#slides_container img{margin:20px 0;max-width:100%}ul#navButtons{margin:20px 0 0 0}ul#navButtons li{width:30px;display:inline}ul#navButtons li a{display:inline-block;width:23px;height:30px;background:transparent url('../img/navBtns.png?1407168450') no-repeat -10px 0}ul#navButtons li a:hover{background-position:-10px -30px;cursor:pointer}ul#navButtons li a.next{background:transparent url('../img/navBtns.png?1407168450') no-repeat -30px 0}ul#navButtons li a.next:hover{background-position:-30px -30px}div#credits{position:absolute;bottom:0;left:0;right:0;height:44px;background-color:#FFF;z-index:1000001}div#credits a{color:#ff7373}div#credits span{padding:18px 0 0 0;position:absolute;font-size:12px;text-transform:uppercase}div#credits span.title{left:40px;font-family:'Proxima N W01 Bold', Sans-serif;color:#333}div#credits span.author{right:40px;font-family:AleoRegular, Serif;color:#999;letter-spacing:2px;font-size:10px;text-align:right}.slide-tip{position:absolute;top:-18px;width:3px;height:37px;border:3px solid transparent;border-top:0;border-bottom-color:#ddd;text-align:center}.slide-tip:hover .tooltip{display:inline-block !important}.slide-tip:hover:after{background:#ccc;width:3px}.slide-tip:after{content:"";display:inline-block;background:#ddd;width:1px;height:40px;-moz-transition:all 0.15s ease-in-out;-o-transition:all 0.15s ease-in-out;-webkit-transition:all 0.15s ease-in-out;transition:all 0.15s ease-in-out}.slide-tip .tooltip{position:absolute;display:none;background:rgba(0,0,0,0.85);bottom:50px;max-width:200px;padding:10px;margin-left:-17px;box-shadow:0 0 1px rgba(255,255,255,0.2);border-radius:2px;color:#FFF;line-height:1;text-align:left;font-size:12px;white-space:nowrap}.slide-tip .tooltip h1,.slide-tip .tooltip p{height:auto;padding:0;margin:0;text-align:left;color:#EEE;font-weight:normal;line-height:1.1;width:auto}.slide-tip .tooltip h1{font-weight:bold;margin-bottom:8px;font-size:11px}.slide-tip .tooltip p{white-space:nowrap}.slide-tip .tooltip:after{content:"";display:block;position:absolute;bottom:-5px;left:10px;border-top:5px solid rgba(0,0,0,0.85);border-left:7px solid transparent;border-right:7px solid transparent}div.cartodb-timeslider .ui-slider .ui-slider-range{background-color:#FF7373}.cartodb-timeslider{bottom:50px !important;left:40px !important} diff --git a/editor/slides.html b/editor/slides.html index 65180464..f5f9784e 100644 --- a/editor/slides.html +++ b/editor/slides.html @@ -248,5 +248,6 @@ ga('create', 'UA-20934186-21', 'cartodb.github.io'); ga('send', 'pageview'); - + + diff --git a/editor/torque.html b/editor/torque.html index fe14e19a..f47cd5b0 100644 --- a/editor/torque.html +++ b/editor/torque.html @@ -17,9 +17,6 @@
-
-
-
@@ -208,21 +205,12 @@ document.getElementById('author').innerHTML = author_; document.title = title_ + " | " + author_ +' Odyssey.js'; - if (actions.global.title || actions.global.headline) { - var first_slide = '', - first_title_ = actions.global.title ? '

'+actions.global.title+'

' : '', - first_headline_ = actions.global.headline ? '

'+actions.global.headline+'

' : ''; - - first_slide = first_title_ + first_headline_; - - document.getElementById('slides_container').style.display = "block"; - document.getElementById('front_slide').innerHTML = actions[0].html(); - } + document.getElementById('slides_container').style.display = "block"; document.getElementById('slides').innerHTML = ''; // first slide is the header, skip it - for(var i = 1; i < actions.length; ++i) { + for(var i = 0; i < actions.length; ++i) { var slide = actions[i]; var tmpl = "