add config to workaround svg viewBox stripping bug parcel-bundler/par…

…cel#1523
chapmanu · Jul 11, 2019 · 8cf1bec · 8cf1bec
1 parent 44c0abd
commit 8cf1bec
Show file tree

Hide file tree

Showing 9 changed files with 82 additions and 75 deletions.
diff --git a/.cascade-code/Chapman.edu/_cascade/formats/modular/widgets/one_column/campus_map.vtl b/.cascade-code/Chapman.edu/_cascade/formats/modular/widgets/one_column/campus_map.vtl
@@ -20,14 +20,14 @@
           </span>
         </span>
         <div class="box">
-        <span class="fas fa-minus-square minimize" label=" Minimize contact area"
+        <span class="far fa-minus-square minimize" label=" Minimize contact area"
             title="Minimize contact info"></span>
             <div class="box-inner">
                 <div class="faux-h1 box-header">$title</div>
-                <div class="address-wrapper"> <i class="fas fa-map-marker-alt marker-icon"></i>
+                <div class="address-wrapper"> <span class="fas fa-map-marker-alt marker-icon"></span>
                     <a href="http://maps.google.com/?q=$street $city $state $zip" class="address-inner"><span class="link-underline">$street, $city,<br/> $state $zip</span></a>
-                    <a href="tel:$phone" class="theme-bg-color theme-button">Contact Us <i class="fas fa-phone"></i></a>
-                    <a href="mailto:$email" class="theme-button">Email Us <i class="fas fa-envelope"></i></a>
+                    <a href="tel:$phone" class="theme-bg-color theme-button">$phone <span class="fas fa-phone"></span></a>
+                    <a href="mailto:$email" class="theme-button">$email <span class="fas fa-envelope"></span></a>
                 </div>
             </div>
         </div>

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,3 +1,8 @@
 {
-    "autoprefixer.formatOnSave": false
+    "autoprefixer.formatOnSave": false,
+    "workbench.colorCustomizations": {
+      "activityBar.background": "#1C3316",
+      "titleBar.activeBackground": "#27481F",
+      "titleBar.activeForeground": "#F8FBF7"
+    }
 }
diff --git a/app/assets/javascripts/master.js b/app/assets/javascripts/master.js
@@ -67,4 +67,4 @@
 //= require cascade/level/rotator
 //= require cascade/level/scroll-bar
 //= require cascade/level/social
-//= require cascade/level/sponsor
+//= require cascade/level/sponsor
diff --git a/app/assets/stylesheets/layouts/two_column.css b/app/assets/stylesheets/layouts/two_column.css
@@ -0,0 +1 @@
+#a-z-anchors :target:before{content:"";display:block;height:80px;margin:-80px 0 0;position:relative;z-index:-1}
diff --git a/app/assets/stylesheets/widgets/single_column/campus-map.scss b/app/assets/stylesheets/widgets/single_column/campus-map.scss
@@ -1,3 +1,7 @@
+#campusMapWidget {
+  position: relative;
+}
+
 .campus-map {
   .reveal {
     float: right;
@@ -53,7 +57,11 @@
   }
 
   .map-container {
-    iframe#map_frame {}
+
+    // hides Campus Bird's branding
+    iframe#map_frame {
+      height: 105%;
+    }
 
     .map-inner {
       height: 500px;
@@ -68,7 +76,7 @@
       transform: translate(-50%, -50%);
     }
 
-    i.fas.marker-icon {
+    span.fas.marker-icon {
       display: inline-block;
       border-radius: 60px;
       box-shadow: 0px 0px 2px #888;
@@ -78,7 +86,7 @@
       font-size: 1.5em;
     }
 
-    .theme-button i.fas {
+    .theme-button span.fas {
       font-size: 1.2em;
       margin-left: 6px;
     }

diff --git a/app/views/_cascade/blocks/html/_facebook_javascript_sdk.html b/app/views/_cascade/blocks/html/_facebook_javascript_sdk.html
@@ -1,17 +0,0 @@
-      <script>
-        window.fbAsyncInit = function() {
-          FB.init({
-            appId      : '455886484427551',
-            status     : true,
-            cookie     : true,
-            xfbml      : true,
-            oauth      : true,
-          });
-        };
-        (function(d){
-           var js, id = 'facebook-jssdk'; if (d.getElementById(id)) {return;}
-           js = d.createElement('script'); js.id = id; js.async = true;
-           js.src = "//connect.facebook.net/en_US/all.js";
-           d.getElementsByTagName('head')[0].appendChild(js);
-         }(document));
-      </script>

diff --git a/app/views/widgets/shared/_head.html b/app/views/widgets/shared/_head.html
@@ -1,28 +1,29 @@
 <head>
-    <meta charset="utf-8" />
-    <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible" />
-    <title><%= params[:page].to_s.titleize %></title>
+  <meta charset="utf-8" />
+  <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible" />
+  <title><%= params[:page].to_s.titleize %></title>
 
-    <meta property="og:title" content="Sample Page" />
-    <meta property="og:description" content="Description of sample page" />
-    <meta property="og:url" content="https://www.chapman.edu/sample-page.aspx" />
-    <meta property="og:image" content="https://www.chapman.edu/_files/img/open-graph-cu-logo.png" />
+  <meta property="og:title" content="Sample Page" />
+  <meta property="og:description" content="Description of sample page" />
+  <meta property="og:url" content="https://www.chapman.edu/sample-page.aspx" />
+  <meta property="og:image" content="https://www.chapman.edu/_files/img/open-graph-cu-logo.png" />
 
-    <meta content="width=device-width, initial-scale=1, minimum-scale=1" name="viewport" />
+  <meta content="width=device-width, initial-scale=1, minimum-scale=1" name="viewport" />
 
-    <!-- scripts -->
-    <link href="https://use.typekit.net/eyn5jyy.css" rel="stylesheet"/>
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.2.0/css/all.css" integrity="sha384-hWVjflwFxL6sNzntih27bfxkr27PmbbK/iSvJ+a4+0owXq79v+lsFkW54bOGbiDQ" crossorigin="anonymous"/>
-    <script src="//ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
-    <%= javascript_include_tag 'master' %>
+  <!-- scripts -->
+  <link href="https://use.typekit.net/eyn5jyy.css" rel="stylesheet" />
+  <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.2.0/css/all.css"
+    integrity="sha384-hWVjflwFxL6sNzntih27bfxkr27PmbbK/iSvJ+a4+0owXq79v+lsFkW54bOGbiDQ" crossorigin="anonymous" />
+  <script src="//ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
+  <%= javascript_include_tag 'master' %>
 
-    <!--[if lt IE 7 ]>
+  <!--[if lt IE 7 ]>
     <script src="//ajax.googleapis.com/ajax/libs/chrome-frame/1.0.3/CFInstall.min.js"></script>
     <script>window.attachEvent('onload',function(){CFInstall.check({mode:'overlay'})})</script>
     <![endif]-->
 
-    <%= stylesheet_link_tag 'master', media: 'all' %>
-
+  <%= stylesheet_link_tag 'master', media: 'all' %>
+  <!-- 
     <script>
     window.fbAsyncInit = function() {
         FB.init({
@@ -44,44 +45,48 @@
         js.src = "//connect.facebook.net/en_US/all.js";
         d.getElementsByTagName('head')[0].appendChild(js);
     }(document));
-    </script>
+    </script> -->
 
 
-    <script>
-    (function(i, s, o, g, r, a, m) {
-        i['GoogleAnalyticsObject'] = r;
-        i[r] = i[r] || function() {
-            (i[r].q = i[r].q || []).push(arguments)
-        }, i[r].l = 1 * new Date();
-        a = s.createElement(o),
-            m = s.getElementsByTagName(o)[0];
-        a.async = 1;
-        a.src = g;
-        m.parentNode.insertBefore(a, m)
+  <script>
+    (function (i, s, o, g, r, a, m) {
+      i['GoogleAnalyticsObject'] = r;
+      i[r] = i[r] || function () {
+        (i[r].q = i[r].q || []).push(arguments)
+      }, i[r].l = 1 * new Date();
+      a = s.createElement(o),
+        m = s.getElementsByTagName(o)[0];
+      a.async = 1;
+      a.src = g;
+      m.parentNode.insertBefore(a, m)
     })(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');
 
     ga('create', 'UA-27379306-3', 'auto');
     ga('send', 'pageview');
-    </script>
+  </script>
 
-    <script type="text/javascript">
-    var recordOutboundLink = function(url, category, action, label) {
-        ga('send', 'event', category, action, label, {
-            'hitCallback': function() {
-                document.location = url;
-            }
-        });
+  <script type="text/javascript">
+    var recordOutboundLink = function (url, category, action, label) {
+      ga('send', 'event', category, action, label, {
+        'hitCallback': function () {
+          document.location = url;
+        }
+      });
     }
-    </script>
+  </script>
 
-    <noscript>
-        <iframe src="//www.googletagmanager.com/ns.html?id=GTM-MSC27D" height="0" width="0" style="display:none;visibility:hidden"></iframe>
-    </noscript>
+  <noscript>
+    <iframe src="//www.googletagmanager.com/ns.html?id=GTM-MSC27D" height="0" width="0"
+      style="display:none;visibility:hidden"></iframe>
+  </noscript>
 
-    <script>
-        (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
-        new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src='//www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
-        })
-        (window,document,'script','dataLayer','GTM-MSC27D');
-    </script>
+  <script>
+      (function (w, d, s, l, i) {
+      w[l] = w[l] || []; w[l].push({
+        'gtm.start':
+          new Date().getTime(), event: 'gtm.js'
+      }); var f = d.getElementsByTagName(s)[0], j = d.createElement(s), dl = l != 'dataLayer' ? '&l=' + l : ''; j.async = true; j.src = '//www.googletagmanager.com/gtm.js?id=' + i + dl; f.parentNode.insertBefore(j, f);
+      })
+      (window, document, 'script', 'dataLayer', 'GTM-MSC27D');
+  </script>
 </head>
diff --git a/app/views/widgets/single_column/_campus_map.html b/app/views/widgets/single_column/_campus_map.html
@@ -44,12 +44,12 @@ <h2 class="title">Entertainment Law Program</h2>
             title="Minimize contact info"></span>
           <div class="box-inner ">
             <h1 class="box-header">Chapman University</h1>
-            <div class="address-wrapper"> <i class="fas fa-map-marker-alt marker-icon"></i>
+            <div class="address-wrapper"> <span class="fas fa-map-marker-alt marker-icon"></span>
               <div class="address-inner"> <span class="link-underline"> 1 University Drive, <br> Orange, Ca
                   92886</span>
               </div>
-              <div class="theme-button">1-800-panTher <i class="fas fa-phone"></i></div>
-              <div class="theme-button">Mixed case email us <i class="fas fa-envelope"></i></div>
+              <div class="theme-button">1-800-panTher <span class="fas fa-phone"></span></div>
+              <div class="theme-button">Mixed case email us <span class="fas fa-envelope"></span></div>
             </div>
           </div>
         </div>

diff --git a/config/environments/development.rb b/config/environments/development.rb
@@ -43,4 +43,9 @@
   # no cache money
 config.assets.cache_store = :null_store  # Disables the Asset cache
 config.sass.cache = false  # Disable the SASS compiler cache
+# Do not compress assets
+config.assets.compress = false
+
+# Expands the lines which load the assets
+config.assets.debug = true
 end