Skip to content

feat(app): merge H5BP updates to index.html #1083

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 20, 2015
Merged

feat(app): merge H5BP updates to index.html #1083

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/templates/client/app/app(css).css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
* App-wide Styles
*/

.browsehappy {
.browserupgrade {
margin: 0.2em 0;
background: #ccc;
color: #000;
Expand Down
2 changes: 1 addition & 1 deletion app/templates/client/app/app(less).less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* App-wide Styles
*/

.browsehappy {
.browserupgrade {
margin: 0.2em 0;
background: #ccc;
color: #000;
Expand Down
2 changes: 1 addition & 1 deletion app/templates/client/app/app(sass).scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion app/templates/client/app/app(stylus).styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
// App-wide Styles
//

.browsehappy
.browserupgrade
background #ccc
color #000
margin 0.2em 0
Expand Down
26 changes: 11 additions & 15 deletions app/templates/client/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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="">
Expand All @@ -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 -->
Expand All @@ -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');
Expand All @@ -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>