aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/redbasic
diff options
context:
space:
mode:
authormarijus <mario@mariovavti.com>2014-10-10 15:52:56 +0200
committermarijus <mario@mariovavti.com>2014-10-10 15:52:56 +0200
commit4e9bd8b8f0a2629cf1ad7c7274369e795852a8ab (patch)
treeb9bac2faae4b1cf1be196198fcb48079e28dbc7c /view/theme/redbasic
parent053e6061089ba89a53caf264ea4a055cec8be8ba (diff)
downloadvolse-hubzilla-4e9bd8b8f0a2629cf1ad7c7274369e795852a8ab.tar.gz
volse-hubzilla-4e9bd8b8f0a2629cf1ad7c7274369e795852a8ab.tar.bz2
volse-hubzilla-4e9bd8b8f0a2629cf1ad7c7274369e795852a8ab.zip
This is a fix to not interfere the ongoing adding of .generic-content-wrapper with the ongoing styling of redbasic theme.
adding of .generic-content-wrapper is needed and useful for derivative themes but it should not contain any styling information for redbasic theme. therefor i added .generic-content-wrapper-styled as a quickfix for spots where redbasic is not finished yet. Sidenote: please avoid opening a div in one *.tpl and close it in another or (even worse) open a div in a *.tpl and close it in an already templatified mod/*.php. This will really make the code and templates very, very confusing.
Diffstat (limited to 'view/theme/redbasic')
-rw-r--r--view/theme/redbasic/css/style.css2
-rw-r--r--view/theme/redbasic/php/style.php5
2 files changed, 4 insertions, 3 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 57e24e746..c448c877f 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1868,7 +1868,7 @@ img.mail-list-sender-photo {
border-top-left-radius: $radiuspx;
}
-.generic-content-wrapper {
+.generic-content-wrapper-styled {
background-color: $genericcontent_bgcolour;
padding: 10px;
border-radius: $radiuspx;
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 045ddc309..495095fe2 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -24,6 +24,7 @@ if(! $a->install) {
$background_image = get_pconfig($uid, "redbasic", "background_image");
$toolicon_colour = get_pconfig($uid,'redbasic','toolicon_colour');
$toolicon_activecolour = get_pconfig($uid,'redbasic','toolicon_activecolour');
+ $genericcontent_bgcolour = get_pconfig($uid, "redbasic", "genericcontent_bgcolour");
$item_colour = get_pconfig($uid, "redbasic", "item_colour");
$comment_item_colour = get_pconfig($uid, "redbasic", "comment_item_colour");
$comment_border_colour = get_pconfig($uid, "redbasic", "comment_border_colour");
@@ -121,12 +122,12 @@ if(! $a->install) {
$bgcolour = "#fdfdfd";
if (! $background_image)
$background_image ='';
+ if (! $genericcontent_bgcolour)
+ $genericcontent_bgcolour ='rgba(254,254,254,0.8)';
if (! $item_colour)
$item_colour = "rgba(238,238,238,0.8)";
if (! $comment_item_colour)
$comment_item_colour = "rgba(254,254,254,0.4)";
- if (! $genericcontent_bgcolour)
- $genericcontent_bgcolour = $comment_item_colour;
if (! $comment_border_colour)
$comment_border_colour = "rgba(238,238,238,0.8)";
if (! $toolicon_colour)