Merge pull request #1083 from kingcody/feature/merge-h5bp-updates

Awk34 · Awk34 · commit 037b4986ecfd · 2015-07-20T16:44:51.000-04:00
feat(app): merge H5BP updates to index.html
diff --git a/app/templates/client/app/app(css).css b/app/templates/client/app/app(css).css
@@ -31,7 +31,7 @@
  * App-wide Styles
  */
 
-.browsehappy {
+.browserupgrade {
   margin: 0.2em 0;
   background: #ccc;
   color: #000;
diff --git a/app/templates/client/app/app(less).less b/app/templates/client/app/app(less).less
@@ -8,7 +8,7 @@
  * App-wide Styles
  */
 
-.browsehappy {
+.browserupgrade {
   margin: 0.2em 0;
   background: #ccc;
   color: #000;
diff --git a/app/templates/client/app/app(sass).scss b/app/templates/client/app/app(sass).scss
@@ -8,7 +8,7 @@ $fa-font-path: "/bower_components/font-awesome/fonts";
  * App-wide Styles
  */
 
-.browsehappy {
+.browserupgrade {
   margin: 0.2em 0;
   background: #ccc;
   color: #000;
diff --git a/app/templates/client/app/app(stylus).styl b/app/templates/client/app/app(stylus).styl
@@ -31,7 +31,7 @@
 // App-wide Styles
 //
 
-.browsehappy
+.browserupgrade
   background #ccc
   color #000
   margin 0.2em 0
diff --git a/app/templates/client/index.html b/app/templates/client/index.html
@@ -5,7 +5,7 @@
 <!--[if gt IE 8]><!--> <html class="no-js"> <!--<![endif]-->
   <head>
     <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta http-equiv="x-ua-compatible" content="ie=edge">
     <base href="/">
     <title></title>
     <meta name="description" content="">
@@ -16,14 +16,14 @@
       <!-- endbower -->
     <!-- endbuild -->
     <!-- build:css({.tmp,client}) app/app.css -->
-    <link rel="stylesheet" href="app/app.css">
+      <link rel="stylesheet" href="app/app.css">
       <!-- injector:css -->
       <!-- endinjector -->
     <!-- endbuild -->
   </head>
   <body ng-app="<%= scriptAppName %>">
     <!--[if lt IE 7]>
-      <p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
+      <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
     <![endif]-->
 
     <!-- Add your site or application content here -->
@@ -34,7 +34,7 @@
       (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');
+      })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
 
       ga('create', 'UA-XXXXX-X');
       ga('send', 'pageview');
@@ -49,15 +49,11 @@
       <!-- endbower --><% if (filters.socketio) { %>
       <script src="socket.io-client/socket.io.js"></script><% } %>
     <!-- endbuild -->
-
-        <% if(filters.babel) { %>
-        <!-- build:js(.tmp) app/app.js -->
-        <% } else { %>
-        <!-- build:js({.tmp,client}) app/app.js -->
-        <% } %>
-        <script src="app/app.js"></script>
-          <!-- injector:js -->
-          <!-- endinjector -->
-        <!-- endbuild -->
-</body>
+    <!-- build:js(<% if(filters.babel) { %>.tmp<% }
+    else { %>{.tmp,client}<% } %>) app/app.js -->
+      <script src="app/app.js"></script>
+      <!-- injector:js -->
+      <!-- endinjector -->
+    <!-- endbuild -->
+  </body>
 </html>
