Skip to content

Commit

Permalink
Fix IE8, Update icomoon
Browse files Browse the repository at this point in the history
  • Loading branch information
@f000
f000 committed Sep 15, 2014
1 parent d77e328 commit a60e62f
Show file tree
Hide file tree
Showing 40 changed files with 843 additions and 221 deletions.
11 changes: 8 additions & 3 deletions Gruntfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,9 @@ module.exports = function(grunt) {
uglify: {
dist: {
options: {
compress: true,
compress: false,
beautify: false,
mangle: true,
mangle: false,
report: 'gzip',
preserveComments:'some'
},
Expand All @@ -101,7 +101,7 @@ module.exports = function(grunt) {
dev: {
options: {
compress: false,
beautify: true,
beautify: false,
mangle: false,
report: 'min',
preserveComments:'all'
Expand Down Expand Up @@ -207,6 +207,11 @@ module.exports = function(grunt) {
src: '<%=dirs.libs%>/respond/dest/respond.min.js',
dest: '<%=dirs.dist%>/js/respond.min.js'
},
boxsizing: {
nonull: true,
src: '<%=dirs.libs%>/box-sizing-polyfill/boxsizing.htc',
dest: '<%=dirs.dist%>/js/boxsizing.htc'
},
fonts: {
nonull: true,
src: '<%=dirs.src%>/fonts/icomoon/fonts/*',
Expand Down
6 changes: 3 additions & 3 deletions bower.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@
"license": "All rights reserved.",
"private": true,
"ignore": [],
"dependencies": {
},
"dependencies": {},
"devDependencies": {
"owl-carousel2": "*",
"respond": ">=1.4.2",
"html5shiv": ">=3.7.2",
"jquery": "^2.1.1",
"modernizr": "^2.8.3",
"bootstrap-sass-official": "^3.2.0",
"colorbox": "^1.5.13"
"colorbox": "^1.5.13",
"box-sizing-polyfill": "*"
}
}
4 changes: 2 additions & 2 deletions dist/css/all.css
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/css/ie8.css
View file

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

28 changes: 15 additions & 13 deletions dist/detail.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,20 @@
<meta name="application-name" content="Ministerstvo životního prostředí"/>
<script src="//use.typekit.net/xfc8vro.js"></script>
<script>try{Typekit.load();}catch(e){}</script>
<script src="js/modernizr-2.8.3-custom.min.js?NCMARK140913154104"></script>
<link rel="stylesheet" media="all" href="css/all.css?NCMARK140913154104"/>
<script src="js/modernizr-2.8.3-custom.min.js?NCMARK140915123737"></script>
<link rel="stylesheet" media="all" href="css/all.css?NCMARK140915123737"/>
<!--[if lt IE 9]>
<link rel="stylesheet" href="css/ie8.css?NCMARK140913154104"/>
<script src="js/html5shiv.min.js?NCMARK140913154104"></script>
<script src="js/respond.min.js?NCMARK140913154104"></script>
<script src="js/ie8.js?NCMARK140913154104"></script>
<link rel="stylesheet" href="css/ie8.css?NCMARK140915123737"/>
<script src="js/html5shiv.min.js?NCMARK140915123737"></script>
<script src="js/respond.min.js?NCMARK140915123737"></script>
<![endif]-->
<noscript>
<link href="css/organizations/icons.fallback.css?NCMARK140913154104" rel="stylesheet"/>
<link href="css/organizations/icons.fallback.css?NCMARK140915123737" rel="stylesheet"/>
</noscript>
<link rel="alternate" type="application/rss+xml" title="Aktuality MŽP" href="http://www.env.cz/C1257458002F0DC7/rss?OpenAgent&amp;type=news"/>
<link rel="shortcut icon" href="favicon.ico?NCMARK140913154104" type="image/x-icon"/>
<link rel="icon" href="favicon.ico?NCMARK140913154104" type="image/x-icon"/>
<link rel="apple-touch-icon" href="apple-touch-icon-precomposed.png?NCMARK140913154104"/>
<link rel="shortcut icon" href="favicon.ico?NCMARK140915123737" type="image/x-icon"/>
<link rel="icon" href="favicon.ico?NCMARK140915123737" type="image/x-icon"/>
<link rel="apple-touch-icon" href="apple-touch-icon-precomposed.png?NCMARK140915123737"/>
<link rel="schema.DC" href="http://purl.org/dc/terms/">
<meta name="DC.title" content="Ministerstvo životního prostředí"/>
<meta name="DC.description" content="Oficiální webové stránky Ministerstva životního prostředí ČR"/>
Expand Down Expand Up @@ -72,7 +71,7 @@ <h3 class="sr-only">Jazyk</h3>
<h1 id="header-logo">
<a href="/" title="Návrat na úvodní stránku" rel="home">
<span class="sr-only">Ministerstvo životního prostředí</span>
<img src="img/logo-mzp-cs.svg?NCMARK140913154104" width="263" height="40" class="img-responsive print-only" alt="Logo MŽP"/>
<img src="img/logo-mzp-cs.svg?NCMARK140915123737" width="263" height="40" class="img-responsive print-only" alt="Logo MŽP"/>
</a>
</h1>
<nav id="main-nav" role="navigation">
Expand Down Expand Up @@ -450,15 +449,18 @@ <h3 class="sr-only">Kontakt</h3>
</li>
</ul>
</nav>
<p><a href="http://creativecommons.org/licenses/by-nc-nd/3.0/cz/" target="_blank" title="Licenční ujednání"><img src="img/licence.svg?NCMARK140913154104" width="80" height="28" alt="Licence CC BY-NC-ND 3.0 CZ" /><span class="sr-only"> (otevře nové okno)</span></a></p>
<p><a href="http://creativecommons.org/licenses/by-nc-nd/3.0/cz/" target="_blank" title="Licenční ujednání"><img src="img/licence.svg?NCMARK140915123737" width="80" height="28" alt="Licence CC BY-NC-ND 3.0 CZ" /><span class="sr-only"> (otevře nové okno)</span></a></p>
<p>&copy; 2008–2014 Ministerstvo životního prostředí</p>
</footer>
</div>
</div>
</div>
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
<script>window.jQuery || document.write('<script src="js/jquery.min.js"><\/script>')</script>
<script src="js/site.min.js?NCMARK140913154104"></script>
<script src="js/site.min.js?NCMARK140915123737"></script>
<!--[if lt IE 9]>
<script src="js/ie8.js?NCMARK140915123737"></script>
<![endif]-->
<script>
/*TODO: production only
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
Expand Down
28 changes: 15 additions & 13 deletions dist/events.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,20 @@
<meta name="application-name" content="Ministerstvo životního prostředí"/>
<script src="//use.typekit.net/xfc8vro.js"></script>
<script>try{Typekit.load();}catch(e){}</script>
<script src="js/modernizr-2.8.3-custom.min.js?NCMARK140913154104"></script>
<link rel="stylesheet" media="all" href="css/all.css?NCMARK140913154104"/>
<script src="js/modernizr-2.8.3-custom.min.js?NCMARK140915123737"></script>
<link rel="stylesheet" media="all" href="css/all.css?NCMARK140915123737"/>
<!--[if lt IE 9]>
<link rel="stylesheet" href="css/ie8.css?NCMARK140913154104"/>
<script src="js/html5shiv.min.js?NCMARK140913154104"></script>
<script src="js/respond.min.js?NCMARK140913154104"></script>
<script src="js/ie8.js?NCMARK140913154104"></script>
<link rel="stylesheet" href="css/ie8.css?NCMARK140915123737"/>
<script src="js/html5shiv.min.js?NCMARK140915123737"></script>
<script src="js/respond.min.js?NCMARK140915123737"></script>
<![endif]-->
<noscript>
<link href="css/organizations/icons.fallback.css?NCMARK140913154104" rel="stylesheet"/>
<link href="css/organizations/icons.fallback.css?NCMARK140915123737" rel="stylesheet"/>
</noscript>
<link rel="alternate" type="application/rss+xml" title="Aktuality MŽP" href="http://www.env.cz/C1257458002F0DC7/rss?OpenAgent&amp;type=news"/>
<link rel="shortcut icon" href="favicon.ico?NCMARK140913154104" type="image/x-icon"/>
<link rel="icon" href="favicon.ico?NCMARK140913154104" type="image/x-icon"/>
<link rel="apple-touch-icon" href="apple-touch-icon-precomposed.png?NCMARK140913154104"/>
<link rel="shortcut icon" href="favicon.ico?NCMARK140915123737" type="image/x-icon"/>
<link rel="icon" href="favicon.ico?NCMARK140915123737" type="image/x-icon"/>
<link rel="apple-touch-icon" href="apple-touch-icon-precomposed.png?NCMARK140915123737"/>
<link rel="schema.DC" href="http://purl.org/dc/terms/">
<meta name="DC.title" content="Ministerstvo životního prostředí"/>
<meta name="DC.description" content="Oficiální webové stránky Ministerstva životního prostředí ČR"/>
Expand Down Expand Up @@ -72,7 +71,7 @@ <h3 class="sr-only">Jazyk</h3>
<h1 id="header-logo">
<a href="/" title="Návrat na úvodní stránku" rel="home">
<span class="sr-only">Ministerstvo životního prostředí</span>
<img src="img/logo-mzp-cs.svg?NCMARK140913154104" width="263" height="40" class="img-responsive print-only" alt="Logo MŽP"/>
<img src="img/logo-mzp-cs.svg?NCMARK140915123737" width="263" height="40" class="img-responsive print-only" alt="Logo MŽP"/>
</a>
</h1>
<nav id="main-nav" role="navigation">
Expand Down Expand Up @@ -489,15 +488,18 @@ <h3 class="sr-only">Kontakt</h3>
</li>
</ul>
</nav>
<p><a href="http://creativecommons.org/licenses/by-nc-nd/3.0/cz/" target="_blank" title="Licenční ujednání"><img src="img/licence.svg?NCMARK140913154104" width="80" height="28" alt="Licence CC BY-NC-ND 3.0 CZ" /><span class="sr-only"> (otevře nové okno)</span></a></p>
<p><a href="http://creativecommons.org/licenses/by-nc-nd/3.0/cz/" target="_blank" title="Licenční ujednání"><img src="img/licence.svg?NCMARK140915123737" width="80" height="28" alt="Licence CC BY-NC-ND 3.0 CZ" /><span class="sr-only"> (otevře nové okno)</span></a></p>
<p>&copy; 2008–2014 Ministerstvo životního prostředí</p>
</footer>
</div>
</div>
</div>
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
<script>window.jQuery || document.write('<script src="js/jquery.min.js"><\/script>')</script>
<script src="js/site.min.js?NCMARK140913154104"></script>
<script src="js/site.min.js?NCMARK140915123737"></script>
<!--[if lt IE 9]>
<script src="js/ie8.js?NCMARK140915123737"></script>
<![endif]-->
<script>
/*TODO: production only
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
Expand Down
Binary file modified dist/fonts/icomoon.eot
View file
Binary file not shown.
Loading

0 comments on commit a60e62f

Please sign in to comment.