aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme
diff options
context:
space:
mode:
authormarijus <mario@mariovavti.com>2014-05-01 12:51:34 +0200
committermarijus <mario@mariovavti.com>2014-05-01 12:51:34 +0200
commitdaf497cf465c68dade3f57c026db415c04f34e6f (patch)
tree2e9cd93fcc324d16a468fe0686410527a4464384 /view/theme
parent8a7571e4f62778b51ffc9fcb25a5ddd1e531a29e (diff)
downloadvolse-hubzilla-daf497cf465c68dade3f57c026db415c04f34e6f.tar.gz
volse-hubzilla-daf497cf465c68dade3f57c026db415c04f34e6f.tar.bz2
volse-hubzilla-daf497cf465c68dade3f57c026db415c04f34e6f.zip
revision/redesign of conv_item.tpl
Diffstat (limited to 'view/theme')
-rw-r--r--view/theme/redbasic/css/style.css93
-rw-r--r--view/theme/redbasic/php/config.php3
-rw-r--r--view/theme/redbasic/php/style.php24
-rw-r--r--view/theme/redbasic/tpl/theme_settings.tpl3
4 files changed, 45 insertions, 78 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 26ac639ee..678adbb86 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1383,7 +1383,6 @@ brain is weird like that */
max-height:150px;
background-color:$acpopup_bgcolour;
overflow:auto;
- z-index:100000;
border:1px solid $acpopup_bordercolour;
}
.acpopupitem {
@@ -1662,7 +1661,7 @@ header {
.profile-match-connect { margin-top: 5px; }
-.reshared-content { margin-left: 30px; }
+.reshared-content { margin-left: 20px; }
.shared_header img { margin-right: 10px; }
.tag1 {
@@ -1722,7 +1721,6 @@ margin: 20px;
div#write-pages {
display: block;
-z-index: 99;
background: silver;
width: 100%;
}
@@ -1773,10 +1771,6 @@ a .drop-icons:hover {
font-size: 1.8em;
}
-.item-category {
- margin-right: 10px;
-}
-
.design-tools ul {
list-style-type: none;
}
@@ -1887,6 +1881,7 @@ img.mail-list-sender-photo {
/* conversation */
+.hide-comments-outer,
.thread-wrapper .wall-item-comment-wrapper,
.wall-item-content-wrapper.comment {
margin-left: $comment_indent;
@@ -1897,56 +1892,41 @@ img.mail-list-sender-photo {
}
.wall-item-content-wrapper {
- border-radius: $radiuspx;
background-color: $item_colour;
opacity: $item_opacity;
- border-left: 2px solid $item_bordercolour;
- border-bottom: 1px solid $item_bordercolour;
-}
-
-.wall-item-content-wrapper:hover{
- z-index:99;
-}
-
-.wall-item-comment-wrapper {
- margin-top: 10px;
- border-left: 2px solid $item_bordercolour;
- border-bottom: 1px solid $item_bordercolour;
-}
-
-.wallwall .wwto {
- top: $wwtop;
-}
-
-.wall-item-photo-menu-button {
- background-image: url("../img/photo-menu.jpg");
- background-position: top left;
- background-repeat: no-repeat;
- top: $pmenu_top;
+ padding: 10px;
}
-.wall-item-photo-menu {
- border: 2px solid #444444;
- background: #FFFFFF;
- top: $top_photo;
+.wall-item-content-wrapper {
+ border-top-right-radius: $radiuspx;
+ border-top-left-radius: $radiuspx;
}
-.wall-item-photo-menu ul {
- list-style: none
+.wall-item-content-wrapper:hover {
+ z-index:99;
}
-.wall-item-photo-menu li a:hover {
- color: #FFFFFF;
- background: #3465A4;
- text-decoration: none;
+.hide-comments-outer,
+.wall-item-content-wrapper.comment {
+ background-color: $comment_item_colour;
+ border-left: 3px solid $item_bordercolour;
+ border-radius: 0px;
+ padding: 7px 10px 7px 7px;
}
-.comment .wall-item-photo-menu-button {
- top: $pmenu_reply;
+.wall-item-comment-wrapper {
+ background-color: $comment_item_colour;
+ border-left: 3px solid $item_bordercolour;
+ border-radius: 0px;
+ border-bottom-right-radius: $radiuspx;
+ border-bottom-left-radius: $radiuspx;
}
-.comment .wall-item-photo-menu {
- top: $reply_photo;
+.wall-item-like,
+.wall-item-dislike {
+ font-size: $body_font_size;
+ text-align: left;
+ white-space: normal;
}
.wall-item-photo {
@@ -1967,15 +1947,6 @@ img.mail-list-sender-photo {
box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444;
}
-.wall-item-arrowphoto-wrapper {
- top: $wwtop;
-}
-
-.wall-item-lock {
- font-size: 1.2em;
- color: $toolicon_colour;
-}
-
.wall-item-ago .icon-ok {
color: darkgreen;
}
@@ -1986,11 +1957,12 @@ img.mail-list-sender-photo {
}
.wall-item-ago i {
- font-size: 0.6em;
+ font-size: 0.8em;
}
.wall-item-content {
font-size: $font_size;
+ clear: both;
}
.item-tool {
@@ -1999,7 +1971,7 @@ img.mail-list-sender-photo {
}
.item-tool:hover {
- color: $toolicon_activecolour;
+ /*color: $toolicon_activecolour;*/
}
.like-rotator {
@@ -2320,15 +2292,6 @@ blockquote {
width: 100%;
}
- .thread-wrapper .wall-item-comment-wrapper,
- .wall-item-content-wrapper.comment {
- margin-left: 18px;
- }
-
- .hide-comments-outer {
- margin-left: 18px;
- }
-
.wall-item-photo {
width: 48px !important;
height: 48px !important;
diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php
index ab819f05b..bd4660c97 100644
--- a/view/theme/redbasic/php/config.php
+++ b/view/theme/redbasic/php/config.php
@@ -20,6 +20,7 @@ function theme_content(&$a) {
$arr['bgcolour'] = get_pconfig(local_user(),'redbasic', 'background_colour' );
$arr['background_image'] = get_pconfig(local_user(),'redbasic', 'background_image' );
$arr['item_colour'] = get_pconfig(local_user(),'redbasic', 'item_colour' );
+ $arr['comment_item_colour'] = get_pconfig(local_user(),'redbasic', 'comment_item_colour' );
$arr['item_opacity'] = get_pconfig(local_user(),'redbasic', 'item_opacity' );
$arr['toolicon_colour'] = get_pconfig(local_user(),'redbasic','toolicon_colour');
$arr['toolicon_activecolour'] = get_pconfig(local_user(),'redbasic','toolicon_activecolour');
@@ -56,6 +57,7 @@ function theme_post(&$a) {
set_pconfig(local_user(), 'redbasic', 'banner_colour', $_POST['redbasic_banner_colour']);
set_pconfig(local_user(), 'redbasic', 'background_image', $_POST['redbasic_background_image']);
set_pconfig(local_user(), 'redbasic', 'item_colour', $_POST['redbasic_item_colour']);
+ set_pconfig(local_user(), 'redbasic', 'comment_item_colour', $_POST['redbasic_comment_item_colour']);
set_pconfig(local_user(), 'redbasic', 'item_opacity', $_POST['redbasic_item_opacity']);
set_pconfig(local_user(), 'redbasic', 'toolicon_colour', $_POST['redbasic_toolicon_colour']);
set_pconfig(local_user(), 'redbasic', 'toolicon_activecolour', $_POST['redbasic_toolicon_activecolour']);
@@ -111,6 +113,7 @@ if(feature_enabled(local_user(),'expert'))
'$bgcolour' => array('redbasic_background_colour', t('Set the background colour'), $arr['bgcolour']),
'$background_image' => array('redbasic_background_image', t('Set the background image'), $arr['background_image']),
'$item_colour' => array('redbasic_item_colour', t('Set the background colour of items'), $arr['item_colour']),
+ '$comment_item_colour' => array('redbasic_comment_item_colour', t('Set the background colour of comments'), $arr['comment_item_colour']),
'$item_opacity' => array('redbasic_item_opacity', t('Set the opacity of items'), $arr['item_opacity']),
'$toolicon_colour' => array('redbasic_toolicon_colour',t('Set the basic colour for item icons'),$arr['toolicon_colour']),
'$toolicon_activecolour' => array('redbasic_toolicon_activecolour',t('Set the hover colour for item icons'),$arr['toolicon_activecolour']),
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 87e0b12bb..95ca5a4fe 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -24,7 +24,8 @@ 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');
- $item_colour = get_pconfig($uid, "redbasic", "item_colour");
+ $item_colour = get_pconfig($uid, "redbasic", "item_colour");
+ $comment_item_colour = get_pconfig($uid, "redbasic", "comment_item_colour");
$item_opacity = get_pconfig($uid, "redbasic", "item_opacity");
$body_font_size = get_pconfig($uid, "redbasic", "body_font_size");
$font_size = get_pconfig($uid, "redbasic", "font_size");
@@ -106,7 +107,7 @@ if(! $a->install) {
if (! $navtabs_bgchover)
$navtabs_bgchover = "#eee";
if (! $link_colour)
- $link_colour = "#0080ff";
+ $link_colour = "#428BCA";
if (! $banner_colour)
$banner_colour = "#fff";
if (! $search_background)
@@ -116,7 +117,9 @@ if(! $a->install) {
if (! $background_image)
$background_image ='';
if (! $item_colour)
- $item_colour = "#fdfdfd";
+ $item_colour = "rgba(238,238,238,0.8)";
+ if (! $comment_item_colour)
+ $comment_item_colour = "rgba(254,254,254,0.4)";
if (! $toolicon_colour)
$toolicon_colour = '#777';
if (! $toolicon_activecolour)
@@ -124,7 +127,7 @@ if(! $a->install) {
if (! $item_opacity)
$item_opacity = "1";
if (! $item_bordercolour)
- $item_bordercolour = "#f4f4f4";
+ $item_bordercolour = $item_colour;
if (! $font_size)
$font_size = "1.0em";
if (! $body_font_size)
@@ -152,7 +155,7 @@ if(! $a->install) {
if (! $notif_itemhovercolour)
$notif_itemhovercolour = "#000";
if (! $editbuttons_bgcolour)
- $editbuttons_bgcolour = "#fff";
+ $editbuttons_bgcolour = "transparent";
if (! $editbuttons_bordercolour)
$editbuttons_bordercolour = "#ccc";
if (! $editbuttons_bghover)
@@ -194,7 +197,7 @@ if(! $a->install) {
if (! $input_decohover)
$input_decohover = "none";
if (! $radius)
- $radius = "0";
+ $radius = "4";
if (! $shadow)
$shadow = "0";
if(! $active_colour)
@@ -212,14 +215,10 @@ if(! $a->install) {
$abookself_bgcolour = "#ffdddd";
if(! $top_photo)
$top_photo = '48px';
- $pmenu_top = intval($top_photo) - 16 . 'px';
- $wwtop = intval($top_photo) - 15 . 'px';
- $comment_indent = intval($top_photo) + 10 . 'px';
-
+ if(! $comment_indent)
+ $comment_indent = '0px';
if(! $reply_photo)
$reply_photo = '32px';
- $pmenu_reply = intval($reply_photo) - 16 . 'px';
-
if($nav_min_opacity === false || $nav_min_opacity === '') {
$nav_float_min_opacity = 1.0;
$nav_percent_min_opacity = 100;
@@ -259,6 +258,7 @@ $options = array (
'$bgcolour' => $bgcolour,
'$background_image' => $background_image,
'$item_colour' => $item_colour,
+'$comment_item_colour' => $comment_item_colour,
'$item_opacity' => $item_opacity,
'$item_bordercolour' => $item_bordercolour,
'$toolicon_colour' => $toolicon_colour,
diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl
index b20d17804..71f3bd1f7 100644
--- a/view/theme/redbasic/tpl/theme_settings.tpl
+++ b/view/theme/redbasic/tpl/theme_settings.tpl
@@ -19,6 +19,7 @@
{{include file="field_colorinput.tpl" field=$bgcolour}}
{{include file="field_colorinput.tpl" field=$background_image}}
{{include file="field_colorinput.tpl" field=$item_colour}}
+{{include file="field_colorinput.tpl" field=$comment_item_colour}}
{{include file="field_input.tpl" field=$item_opacity}}
{{include file="field_colorinput.tpl" field=$toolicon_colour}}
{{include file="field_colorinput.tpl" field=$toolicon_activecolour}}
@@ -37,7 +38,7 @@
$(function(){
$('#id_redbasic_nav_bg,#id_redbasic_nav_gradient_top,#id_redbasic_nav_gradient_bottom,#id_redbasic_nav_active_gradient_top,#id_redbasic_nav_active_gradient_bottom').colorpicker();
$('#id_redbasic_nav_bd,#id_redbasic_nav_icon_colour ,#id_redbasic_nav_active_icon_colour,#id_redbasic_banner_colour,#id_redbasic_link_colour,#id_redbasic_background_colour').colorpicker();
- $('#id_redbasic_item_colour,#id_redbasic_toolicon_colour,#id_redbasic_toolicon_activecolour,#id_redbasic_font_colour').colorpicker();
+ $('#id_redbasic_item_colour,#id_redbasic_comment_item_colou,#id_redbasic_toolicon_colour,#id_redbasic_toolicon_activecolour,#id_redbasic_font_colour').colorpicker();
});
</script>