Minified js and added some loading text

dldx · Mar 5, 2018 · c9d50bb · c9d50bb
1 parent bfc9828
commit c9d50bb
Show file tree

Hide file tree

Showing 10 changed files with 155 additions and 92 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,3 +1,3 @@
 {
-  "presets": ["env"]
+  "presets": ["env"],
 }
diff --git a/.tags b/.tags
diff --git a/mps_over_time.es5.js b/mps_over_time.es5.js
@@ -420,6 +420,10 @@ function initial_render() {
     zoom = d3.zoom().scaleExtent([0.95, 40]).on("zoom", zoomed);
     // svg.call(zoom)
     // canvas.call(zoom)
+
+
+    // Now show the scroll text
+    d3.select(".scroll__text").style("opacity", 1);
 }
 
 // ----------------------------------------------------------------------------
@@ -1740,7 +1744,7 @@ function fifth_slide() {
     }
 
     // Scales for this data
-    slide5_xScale = d3.scaleLinear().domain([-300, 150]).range([0, width]);
+    slide5_xScale = d3.scaleLinear().domain([-350, 150]).range([0, width]);
 
     slide5_yScale = d3.scaleLinear().domain([-0.005, 0.3]).range([height, 0]);
 
@@ -2504,6 +2508,8 @@ function download_data() {
             d.lib_snp_women_pct = d.lib_snp_women_mps / d.lib_snp_mps * 100;
         });
         window.info_bubbles_data = info_bubbles;
+        // Hide loading text
+        d3.select("#loading").remove();
         // INITIAL DRAW
         draw_graph();
     });

diff --git a/mps_over_time.html b/mps_over_time.html
diff --git a/mps_over_time.js b/mps_over_time.js
@@ -619,6 +619,10 @@ function initial_render() {
     // svg.call(zoom)
     // canvas.call(zoom)
 
+
+    // Now show the scroll text
+    d3.select(".scroll__text").style("opacity", 1)
+
 }
 
 // ----------------------------------------------------------------------------
@@ -2437,7 +2441,7 @@ function fifth_slide(no_transition = false) {
 
     // Scales for this data
     slide5_xScale = d3.scaleLinear()
-        .domain([-300, 150])
+        .domain([-350, 150])
         .range([0, width])
 
     slide5_yScale = d3.scaleLinear()
@@ -3458,6 +3462,8 @@ function download_data() {
                 d.lib_snp_women_pct = d.lib_snp_women_mps / d.lib_snp_mps * 100
             })
             window.info_bubbles_data = info_bubbles
+            // Hide loading text
+            d3.select("#loading").remove()
             // INITIAL DRAW
             draw_graph()
         })

diff --git a/mps_over_time.min.js b/mps_over_time.min.js
diff --git a/package.json b/package.json
@@ -37,6 +37,7 @@
   },
   "devDependencies": {
     "babel-cli": "^6.26.0",
+    "babel-plugin-uglify": "^1.0.2",
     "babel-preset-env": "^1.6.1",
     "rollup-plugin-commonjs": "^8.2.6",
     "rollup-plugin-node-resolve": "^3.0.2"

diff --git a/style.min.css b/style.min.css
diff --git a/style.min.css.map b/style.min.css.map
diff --git a/style.scss b/style.scss
@@ -172,6 +172,7 @@ body {
   position: relative;
   padding-left: 120px;
   max-width: 30rem;
+  transition: 1s opacity ease-in-out;
   @include phone {
     padding-left: 30px;
   }
@@ -458,7 +459,7 @@ $nav-button-fg: lighten(map-get($colors, Hover), 50);
 }
 
 #timeline {
-  border-radius: 1px;
+  // border-radius: 1px;
   // bottom: 0;
   left: 0;
   // margin: 10px;