aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-05-01 17:55:01 -0700
committerfriendica <info@friendica.com>2014-05-01 17:55:01 -0700
commitb9ae19c540e3664b4cc609b849da59ce27a1af91 (patch)
tree309b677e36e8892847ac86e9e760efa003f7f0ca
parentb666aca5c39216270d3ba81b73cdb15d142cf20f (diff)
parent4c9f5031eb5d59c3e637ac0f41af9721f331580d (diff)
downloadvolse-hubzilla-b9ae19c540e3664b4cc609b849da59ce27a1af91.tar.gz
volse-hubzilla-b9ae19c540e3664b4cc609b849da59ce27a1af91.tar.bz2
volse-hubzilla-b9ae19c540e3664b4cc609b849da59ce27a1af91.zip
Merge https://github.com/friendica/red into pending_merge
-rw-r--r--view/theme/redbasic/css/style.css7
-rw-r--r--view/theme/redbasic/php/style.php9
-rw-r--r--view/theme/redbasic/schema/dark.php8
3 files changed, 17 insertions, 7 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 678adbb86..f67a34c2a 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1909,14 +1909,14 @@ img.mail-list-sender-photo {
.hide-comments-outer,
.wall-item-content-wrapper.comment {
background-color: $comment_item_colour;
- border-left: 3px solid $item_bordercolour;
+ border-left: 3px solid $item_colour;
border-radius: 0px;
padding: 7px 10px 7px 7px;
}
.wall-item-comment-wrapper {
background-color: $comment_item_colour;
- border-left: 3px solid $item_bordercolour;
+ border-left: 3px solid $item_colour;
border-radius: 0px;
border-bottom-right-radius: $radiuspx;
border-bottom-left-radius: $radiuspx;
@@ -2018,7 +2018,7 @@ img.mail-list-sender-photo {
/* widgets */
.widget {
- border-bottom: 1px solid #eec;
+ border-bottom: 1px solid $widget_brdrcolour;
-moz-border-radius: $radiuspx;
-webkit-border-radius: $radiuspx;
border-radius: $radiuspx;
@@ -2248,6 +2248,7 @@ blockquote {
.btn-default {
background-color: $editbuttons_bgcolour;
border-color: $editbuttons_bordercolour;
+ color: $editbuttons_colour;
text-shadow: none;
box-shadow: none;
}
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 95ca5a4fe..05f7b96b0 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -126,8 +126,6 @@ if(! $a->install) {
$toolicon_activecolour = '#000';
if (! $item_opacity)
$item_opacity = "1";
- if (! $item_bordercolour)
- $item_bordercolour = $item_colour;
if (! $font_size)
$font_size = "1.0em";
if (! $body_font_size)
@@ -138,6 +136,8 @@ if(! $a->install) {
$selected_active_colour = "#444";
if (! $selected_active_deco)
$selected_active_deco = "none";
+ if (! $widget_brdrcolour)
+ $widget_brdrcolour = "#eec";
if (! $blockquote_colour)
$blockquote_colour = "#000";
if (! $blockquote_bgcolour)
@@ -158,6 +158,8 @@ if(! $a->install) {
$editbuttons_bgcolour = "transparent";
if (! $editbuttons_bordercolour)
$editbuttons_bordercolour = "#ccc";
+ if (! $editbuttons_colour)
+ $editbuttons_colour = "#333";
if (! $editbuttons_bghover)
$editbuttons_bghover = "#ebebeb";
if (! $preview_backgroundimg)
@@ -260,7 +262,6 @@ $options = array (
'$item_colour' => $item_colour,
'$comment_item_colour' => $comment_item_colour,
'$item_opacity' => $item_opacity,
-'$item_bordercolour' => $item_bordercolour,
'$toolicon_colour' => $toolicon_colour,
'$toolicon_activecolour' => $toolicon_activecolour,
'$font_size' => $font_size,
@@ -268,6 +269,7 @@ $options = array (
'$selected_active_colour' => $selected_active_colour,
'$selected_active_deco' => $selected_active_deco,
'$body_font_size' => $body_font_size,
+'$widget_brdrcolour' => $widget_brdrcolour,
'$blockquote_colour' => $blockquote_colour,
'$blockquote_bgcolour' => $blockquote_bgcolour,
'$blockquote_bordercolour' => $blockquote_bordercolour,
@@ -279,6 +281,7 @@ $options = array (
'$notif_itemhovercolour' => $notif_itemhovercolour,
'$editbuttons_bgcolour' => $editbuttons_bgcolour,
'$editbuttons_bordercolour' => $editbuttons_bordercolour,
+'$editbuttons_colour' => $editbuttons_colour,
'$editbuttons_bghover' => $editbuttons_bghover,
'$preview_backgroundimg' => $preview_backgroundimg,
'$acpopup_bgcolour' => $acpopup_bgcolour,
diff --git a/view/theme/redbasic/schema/dark.php b/view/theme/redbasic/schema/dark.php
index 0aa81cef5..78fd98d08 100644
--- a/view/theme/redbasic/schema/dark.php
+++ b/view/theme/redbasic/schema/dark.php
@@ -47,13 +47,17 @@
if (! $bgcolour)
$bgcolour = "#111";
if (! $item_colour)
- $item_colour = "#111";
+ $item_colour = "rgba(28,28,28,0.8)";
+ if (! $comment_item_colour)
+ $comment_item_colour = "rgba(18,18,18,0.4)";
if (! $toolicon_colour)
$toolicon_colour = '#999';
if (! $toolicon_activecolour)
$toolicon_activecolour = '#fff';
if (! $font_colour)
$font_colour = "#ccc";
+ if (! $widget_brdrcolour)
+ $widget_brdrcolour = "#333";
if (! $blockquote_colour)
$blockquote_colour = "#ccc";
if (! $blockquote_bgcolour)
@@ -84,6 +88,8 @@
$editbuttons_bgcolour = "#1e1e1e";
if (! $editbuttons_bordercolour)
$editbuttons_bordercolour = "#222";
+ if (! $editbuttons_colour)
+ $editbuttons_colour = "#ccc";
if (! $editbuttons_bghover)
$editbuttons_bghover = "#222";
if (! $preview_backgroundimg)