From 607a27cfd0c5d033b97d3c007b5f1342a31f9d3f Mon Sep 17 00:00:00 2001 From: Bachir Soussi Chiadmi Date: Sun, 29 Jan 2017 19:00:14 +0100 Subject: [PATCH] activated overlays, commented page.js --- css/dist/main.css | 3 +- css/main.scss | 4 +- images/overlays/04_chance-RB.svg | 54 +++++++++ images/overlays/09_composition.svg | 85 ++++++++++++++ images/overlays/09_indetermenacy.svg | 54 +++++++++ images/vectos/04_chance-RB.svg | 53 --------- index.html | 2 +- js/dist/main.min.js | 15 +-- js/main.js | 167 +++++++++++++++++---------- js/{pages.json => pages.js} | 63 ++++++---- 10 files changed, 359 insertions(+), 141 deletions(-) create mode 100644 images/overlays/04_chance-RB.svg create mode 100644 images/overlays/09_composition.svg create mode 100644 images/overlays/09_indetermenacy.svg delete mode 100644 images/vectos/04_chance-RB.svg rename js/{pages.json => pages.js} (59%) diff --git a/css/dist/main.css b/css/dist/main.css index 2224edf..2c8ecd6 100644 --- a/css/dist/main.css +++ b/css/dist/main.css @@ -60,8 +60,9 @@ html, body { z-index: 2; } #main .page .maps .map { position: absolute; - background-color: rgba(50, 50, 50, 0.8); cursor: pointer; } + #main .page .maps .map[debug="true"] { + background-color: rgba(0, 0, 250, 0.4); } #navigation { width: 455.04741mm; diff --git a/css/main.scss b/css/main.scss index ab86739..5fe34bb 100644 --- a/css/main.scss +++ b/css/main.scss @@ -80,8 +80,10 @@ $navh:30mm; z-index: 2; .map{ position: absolute; - background-color: rgba(50, 50, 50, 0.8); cursor: pointer; + &[debug="true"]{ + background-color: rgba(0, 0, 250, 0.4); + } } } diff --git a/images/overlays/04_chance-RB.svg b/images/overlays/04_chance-RB.svg new file mode 100644 index 0000000..ada082e --- /dev/null +++ b/images/overlays/04_chance-RB.svg @@ -0,0 +1,54 @@ + + + + + + image/svg+xml + + + + + + + + diff --git a/images/overlays/09_composition.svg b/images/overlays/09_composition.svg new file mode 100644 index 0000000..37b3bad --- /dev/null +++ b/images/overlays/09_composition.svg @@ -0,0 +1,85 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/images/overlays/09_indetermenacy.svg b/images/overlays/09_indetermenacy.svg new file mode 100644 index 0000000..4f7c92c --- /dev/null +++ b/images/overlays/09_indetermenacy.svg @@ -0,0 +1,54 @@ + + + + + + image/svg+xml + + + + + + + + diff --git a/images/vectos/04_chance-RB.svg b/images/vectos/04_chance-RB.svg deleted file mode 100644 index 956f53c..0000000 --- a/images/vectos/04_chance-RB.svg +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/index.html b/index.html index 1c91deb..3c03cad 100644 --- a/index.html +++ b/index.html @@ -45,7 +45,7 @@ - + diff --git a/js/dist/main.min.js b/js/dist/main.min.js index 4b4bd29..193fcc4 100644 --- a/js/dist/main.min.js +++ b/js/dist/main.min.js @@ -1,12 +1,13 @@ -$(document).ready(function(){console.log("ready");var _win={w:$(document).width(),h:$(document).height()},_$root=$('#root'),_total_dp_len=58,_active_pages_keys=[],_current_dp_key="0",_current_dp_ob,_first_dp=true,_last_dp=false,_$page_left=$('#page-left'),_$page_right=$('#page-right'),_$overlay_left=$('#page-left .overlay'),_$overlay_right=$('#page-right .overlay'),_$maps_left=$('#page-left .maps'),_$maps_right=$('#page-right .maps'),_bgs_prefix="images/pages/",_$railway=$('#railway'),_$pagination=$('#pagination'),_$pagi_l_arrow=$('.wrapper-l .l',_$pagination),_$pagi_r_arrow=$('.wrapper-r .l',_$pagination),_$pagi_l_txt=$('.wrapper-l .p',_$pagination),_$pagi_r_txt=$('.wrapper-r .p',_$pagination);function init(){initLayout();initData();initRailway();initkeyboard();initPagination();changePages();};function initLayout(){_$root.css({'margin-top':(_win.h-_$root.height())/2});};function initData(){_active_pages_keys=Object.keys(_ACTIVE_PAGES);console.log("_active_pages_keys",_active_pages_keys);};function initRailway(){var $ul=$('