Move all default styles in the templates directory. re #79

--HG--
rename : styles/FontAwesome.otf => templates/default/styles/FontAwesome.otf
rename : styles/font-awesome.css => templates/default/styles/font-awesome.css
rename : styles/fontawesome-webfont.eot => templates/default/styles/fontawesome-webfont.eot
rename : styles/fontawesome-webfont.svg => templates/default/styles/fontawesome-webfont.svg
rename : styles/fontawesome-webfont.ttf => templates/default/styles/fontawesome-webfont.ttf
rename : styles/fontawesome-webfont.woff => templates/default/styles/fontawesome-webfont.woff
rename : styles/style-base.css => templates/default/styles/style-base.css
rename : styles/style-default.css => templates/default/styles/style-default.css
rename : styles/style-eink.css => templates/default/styles/style-eink.css
rename : styles/style-iphone.css => templates/default/styles/style-iphone.css
This commit is contained in:
Sébastien Lucas 2014-02-16 16:55:38 +01:00
parent 96288dcb12
commit 8803152273
12 changed files with 3 additions and 3 deletions

View file

@ -81,7 +81,7 @@ function getCurrentOption ($option) {
} }
function getCurrentCss () { function getCurrentCss () {
return "styles/style-" . getCurrentOption ("style") . ".css"; return "templates/" . getCurrentTemplate () . "/styles/style-" . getCurrentOption ("style") . ".css";
} }
function getCurrentTemplate () { function getCurrentTemplate () {
@ -940,7 +940,7 @@ class PageCustomize extends Page
private function getStyleList () { private function getStyleList () {
$result = array (); $result = array ();
foreach (glob ("styles/style-*.css") as $filename) { foreach (glob ("templates/" . getCurrentTemplate () . "/styles/style-*.css") as $filename) {
if (preg_match ('/styles\/style-(.*?)\.css/', $filename, $m)) { if (preg_match ('/styles\/style-(.*?)\.css/', $filename, $m)) {
array_push ($result, $m [1]); array_push ($result, $m [1]);
} }

View file

@ -28,7 +28,7 @@
<link rel="icon" type="image/vnd.microsoft.icon" href="{{=it.favico}}" /> <link rel="icon" type="image/vnd.microsoft.icon" href="{{=it.favico}}" />
<link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Open+Sans:400,300italic,800,300,400italic,600,600italic,700,700italic,800italic&subset=latin,cyrillic" /> <link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Open+Sans:400,300italic,800,300,400italic,600,600italic,700,700italic,800italic&subset=latin,cyrillic" />
<link rel="stylesheet" type="text/css" href="resources/normalize/normalize.css?v={{=it.version}}" /> <link rel="stylesheet" type="text/css" href="resources/normalize/normalize.css?v={{=it.version}}" />
<link rel="stylesheet" type="text/css" href="styles/font-awesome.css?v={{=it.version}}" media="screen" /> <link rel="stylesheet" type="text/css" href="templates/default/styles/font-awesome.css?v={{=it.version}}" media="screen" />
<link rel="stylesheet" type="text/css" href="{{=it.current_css}}?v={{=it.version}}" media="screen" /> <link rel="stylesheet" type="text/css" href="{{=it.current_css}}?v={{=it.version}}" media="screen" />
{{? it.server_side_rendering == 0}} {{? it.server_side_rendering == 0}}

View file

Before

Width:  |  Height:  |  Size: 193 KiB

After

Width:  |  Height:  |  Size: 193 KiB