harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make pcss work (really this time)

Browse Source
This commit is contained in:
friendica 2013-02-07 19:23:21 -08:00
parent 82ed07baa1
commit 9096e4c8e3
2 changed files with 14 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
boot.php
View File

@ -1786,8 +1786,8 @@ if(! function_exists('current_theme_url')) {
global $a;
$t = current_theme();
if (file_exists('view/theme/' . $t . '/php/style.php'))
return($a->get_baseurl() . '/view/theme/' . $t . '/php/style.pcss');
return($a->get_baseurl() . '/view/theme/' . $t . '/css/style.css');
return('view/theme/' . $t . '/php/style.pcss');
return('view/theme/' . $t . '/css/style.css');
}
}
@ -2095,7 +2095,7 @@ function construct_page(&$a) {
head_add_css(((x($a->page,'template')) ? $a->page['template'] : 'default' ) . '.css');
head_add_css('mod_' . $a->module . '.css');
head_add_css('style.css');
head_add_css(current_theme_url());
head_add_js('mod_' . $a->module . '.js');

75
view/theme/redbasic/php/style.php
View File

@ -28,72 +28,19 @@
if ($colour === false) {
$colour = $site_colour;
}
if($colour === false) {
$colour = "light";
if (file_exists("$THEMEPATH/css/style.css")) {
echo file_get_contents("$THEMEPATH/css/style.css");
}
}
if(file_exists('view/theme/' . current_theme() . '/css/style.css')) {
echo file_get_contents('view/theme/' . current_theme() . '/css/style.css');
}
echo "\r\n";
if($redbasic_font_size == "16") {
echo ".wall-item-content {
font-size: 16px;
}";
}
if($redbasic_font_size == "15") {
echo ".wall-item-content {
font-size: 15px;
}";
}
if($redbasic_font_size == "14") {
echo ".wall-item-content {
font-size: 14px;
}";
}
if($redbasic_font_size == "13.5") {
echo ".wall-item-content {
font-size: 13.5px;
}";
}
if($redbasic_font_size == "13") {
echo ".wall-item-content {
font-size: 13px;
}";
}
if($redbasic_font_size == "12.5") {
echo ".wall-item-content {
font-size: 12.5px;
}";
}
if($redbasic_font_size == "12") {
echo ".wall-item-content {
font-size: 12px;
}";
}
if($line_height == "1.5") {
echo ".wall-item-content {
line-height: 1.5;
}";
}
if($line_height == "1.4") {
echo ".wall-item-content {
line-height: 1.4;
}";
}
if($line_height == "1.3") {
echo ".wall-item-content {
line-height: 1.3;
}";
}
if($line_height == "1.2") {
echo ".wall-item-content {
line-height: 1.2;
}";
}
if($line_height == "1.1") {
echo ".wall-item-content {
line-height: 1.1;
}";
if(($redbasic_font_size >= 10.0) && ($redbasic_font_size <= 16.0)) {
echo ".wall-item-content { font-size: $redbasic_font_size; }\r\n";
}
if(($line_height >= 1.0) && ($line_height <= 1.5)) {
echo ".wall-item-content { line-height: $line_height; }\r\n";
}