Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[+]: added "Modernizr" + "Polyfills"
  • Loading branch information
voku committed Nov 6, 2014
1 parent 0a28f8e commit a418d23
Show file tree
Hide file tree
Showing 211 changed files with 48,097 additions and 4,959 deletions.
Binary file modified app/storage/db/test.s3db
Binary file not shown.
64 changes: 53 additions & 11 deletions app/views/tpl_base.twig
Expand Up @@ -28,14 +28,55 @@

{# JavaScript #}
{% block head_js %}
<script src="//ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>

<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
<script>window.jQuery || document.write('<script src="vendor/bower/jquery/dist/jquery.min.js"><\/script>')</script>

<script src="/js-min/plugins.js"></script>
<script src="/js-min/app.js"></script>
<script>
// Avoid `console` errors in browsers that lack a console.
(function() {
var method;
var noop = function () {};
var methods = [
'assert', 'clear', 'count', 'debug', 'dir', 'dirxml', 'error',
'exception', 'group', 'groupCollapsed', 'groupEnd', 'info', 'log',
'markTimeline', 'profile', 'profileEnd', 'table', 'time', 'timeEnd',
'timeStamp', 'trace', 'warn'
];
var length = methods.length;
var console = (window.console = window.console || {});
while (length--) {
method = methods[length];
// Only stub undefined methods.
if (!console[method]) {
console[method] = noop;
}
}
}());
</script>

<script src="/vendor/modernizr.custom.js"></script>

<!-- only for example-images -->
<script src="/vendor/bower/bootstrap-sass/docs-assets/js/holder.js"></script>
<!--[if lt IE 9]>
<script src="/vendor/bower/nwmatcher/src/nwmatcher.js"></script>
<script src="/vendor/bower/selectivizr/selectivizr.js"></script>
<![endif]-->

<script>
Modernizr.load(
{
test : Modernizr.mq('only all'),
nope : '/vendor/bower/respond/dest/respond.min.js'
}
,
{
test: Modernizr.cssremunit,
nope : '/vendor/bower/rem-unit-polyfill/js/rem.min.js'
}
);
</script>

<!-- load web-fonts -->
<script src="//ajax.googleapis.com/ajax/libs/webfont/1.4.7/webfont.js"></script>
Expand All @@ -51,10 +92,6 @@

{% flush %}

{{ plugin['in_header'] | raw }}

{% flush %}

<link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon">
{% endblock %}
</head>
Expand Down Expand Up @@ -131,9 +168,14 @@
<li><a href="./index.html" title="Scroll to top"><i class="glyphicon glyphicon-chevron-up"></i></a></li>
</ul>

{{ plugin['in_footer'] | raw }}
{# JavaScript #}
{% block footer_js %}
<script src="/js-min/plugins.js"></script>
<script src="/js-min/app.js"></script>

{{ logger | raw }}
<!-- only for example-images -->
<script src="/vendor/bower/bootstrap-sass/docs-assets/js/holder.js"></script>
{% endblock %}

</body>
</html>
3 changes: 3 additions & 0 deletions web/.bowerrc
@@ -0,0 +1,3 @@
{
"directory" : "vendor/bower/"
}
3 changes: 2 additions & 1 deletion web/Gruntfile.js
Expand Up @@ -84,7 +84,8 @@ module.exports = function(grunt) {
sourceMap: true
},
src: [
'vendor/bower/bootstrap-sass/dist/js/bootstrap.min.js'
'vendor/bower/bootstrap-sass/dist/js/bootstrap.min.js',
'vendor/modernizr.custom..js'
],
dest: 'js/plugins.js'
}
Expand Down
6 changes: 5 additions & 1 deletion web/bower.json
Expand Up @@ -6,6 +6,10 @@
"normalize-scss": "3.*",
"font-awesome": "4.0.*",
"bootstrap-sass": "3.*",
"jquery": "2.*"
"jquery": "1.*",
"nwmatcher": "~1.3.3",
"selectivizr": "~1.0.2",
"respond": "~1.4.2",
"rem-unit-polyfill": "~1.3.2"
}
}
4 changes: 2 additions & 2 deletions web/css-min/app.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion web/css-min/app.css.map

Large diffs are not rendered by default.

18 changes: 11 additions & 7 deletions web/css/app.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion web/css/app.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion web/js-min/app.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 0 additions & 6 deletions web/js-min/bootstrap.js

This file was deleted.

1 change: 0 additions & 1 deletion web/js-min/bootstrap.js.map

This file was deleted.

6 changes: 0 additions & 6 deletions web/js-min/bootstrap.min.js

This file was deleted.

1 change: 0 additions & 1 deletion web/js-min/bootstrap.min.js.map

This file was deleted.

2 changes: 1 addition & 1 deletion web/js-min/plugins.js

Large diffs are not rendered by default.

0 comments on commit a418d23

Please sign in to comment.