Leahnaya/pokesprite
1
0
Fork 0
mirror of https://github.com/msikma/pokesprite.git synced 2026-04-25 08:07:20 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use more consistent CSS naming

Browse Source
This commit is contained in:
Michiel Sikma 2017-01-07 19:10:40 +01:00
parent eb4704e0ce
commit b47e4bfaef
No known key found for this signature in database
GPG Key ID: ABBA426CD282C020
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
includes/iconoverview.php
View File

@ -336,11 +336,12 @@ class IconOverview extends IconTplFactory
$markup = $this->decorate_tpl_with_defaults($this->tpl, array(
'resources_dir' => Settings::get('resources_dir'),
'js_output' => Settings::get('js_output'),
'js_output_min' => $js_output_min,
'js_output_min' => str_replace('.js', '.min.js', Settings::get('js_output')),
'html_rel_home' => Settings::get('html_rel_home'),
'icons_amount' => htmlspecialchars(count($this->icon_list)),
'script_date' => Settings::get('script_date'),
'css_output' => str_replace('.scss', '.css', Settings::get('scss_output')),
'css_output_min' => str_replace('.scss', '.min.css', Settings::get('scss_output')),
'title_str_html' => htmlspecialchars(Settings::get('title_str')),
'script_date_html' => htmlspecialchars(Settings::get('script_date')),
'website_html' => htmlspecialchars(Settings::get('website')),
@ -454,6 +455,7 @@ class IconOverview extends IconTplFactory
'html_rel_home' => Settings::get('html_rel_home'),
'script_date' => Settings::get('script_date'),
'css_output' => str_replace('.scss', '.css', Settings::get('scss_output')),
'css_output_min' => str_replace('.scss', '.min.css', Settings::get('scss_output')),
'title_str_html' => htmlspecialchars(Settings::get('title_str')),
'script_date_html' => htmlspecialchars(Settings::get('script_date')),
'icons_amount' => htmlspecialchars(count($this->icon_list)),

4
resources/files-tpl.html
View File

@ -13,10 +13,10 @@
<meta charset="utf-8" />
<title>{{$title_str}} {{$revision}} – Files</title>
<!-- Pokémon icons -->
<link type="text/css" href="{{$css_output}}" rel="stylesheet" media="screen" />
<link type="text/css" href="{{$css_output_min}}" rel="stylesheet" media="screen" />
<script charset="utf-8" src="{{$js_output_min}}" ></script>
<!-- Overview CSS (generated from {{$resources_dir}}overview.scss) -->
<link type="text/css" href="overview.css" rel="stylesheet" media="screen" />
<link type="text/css" href="overview.min.css" rel="stylesheet" media="screen" />
</head>
<body>
<div id="top">

4
resources/overview-tpl.html
View File

@ -13,10 +13,10 @@
<meta charset="utf-8" />
<title>{{$title_str}} {{$revision}} – Icon Overview</title>
<!-- Pokémon icons -->
<link type="text/css" href="{{$css_output}}" rel="stylesheet" media="screen" />
<link type="text/css" href="{{$css_output_min}}" rel="stylesheet" media="screen" />
<script charset="utf-8" src="{{$js_output_min}}" ></script>
<!-- Overview CSS (generated from {{$resources_dir}}overview.scss) -->
<link type="text/css" href="overview.css" rel="stylesheet" media="screen" />
<link type="text/css" href="overview.min.css" rel="stylesheet" media="screen" />
<script>
// By far the easiest method to use this script is simply to tell it
// to wait for the DOM to load and then process it completely.

4
scripts/build.sh
View File

@ -10,8 +10,8 @@ rm -f "$DIR/output/"*
"$DIR/pokesprite.php"
java -jar "$DIR/tools/closure-compiler.jar" --compilation_level ADVANCED_OPTIMIZATIONS --js "$DIR/output/pokesprite.js" --js_output_file "$DIR/output/pokesprite.min.js" --charset UTF-8
rm "$DIR/output/pokesprite.js"
sass --sourcemap=none --style compressed "$DIR/output/pokesprite.scss" "$DIR/output/pokesprite.css"
sass --sourcemap=none --style compressed "$DIR/output/pokesprite.scss" "$DIR/output/pokesprite.min.css"
rm "$DIR/output/pokesprite.scss"
rm -f "$DIR/output/pokesprite.css.map"
sass --sourcemap=none --style compressed "$DIR/resources/overview.scss" "$DIR/output/overview.css"
sass --sourcemap=none --style compressed "$DIR/resources/overview.scss" "$DIR/output/overview.min.css"
rm -f "$DIR/output/overview.css.map"