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

Merge https://github.com/friendica/red into pending_merge

Browse Source
This commit is contained in:
friendica 2014-05-01 17:55:01 -07:00
commit b9ae19c540
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
view/theme/redbasic/css/style.css
View File

@ -1909,14 +1909,14 @@ img.mail-list-sender-photo {
.hide-comments-outer, .hide-comments-outer,
.wall-item-content-wrapper.comment { .wall-item-content-wrapper.comment {
background-color: $comment_item_colour; background-color: $comment_item_colour;
border-left: 3px solid $item_bordercolour; border-left: 3px solid $item_colour;
border-radius: 0px; border-radius: 0px;
padding: 7px 10px 7px 7px; padding: 7px 10px 7px 7px;
} }
.wall-item-comment-wrapper { .wall-item-comment-wrapper {
background-color: $comment_item_colour; background-color: $comment_item_colour;
border-left: 3px solid $item_bordercolour; border-left: 3px solid $item_colour;
border-radius: 0px; border-radius: 0px;
border-bottom-right-radius: $radiuspx; border-bottom-right-radius: $radiuspx;
border-bottom-left-radius: $radiuspx; border-bottom-left-radius: $radiuspx;
@ -2018,7 +2018,7 @@ img.mail-list-sender-photo {
/* widgets */ /* widgets */
.widget { .widget {
border-bottom: 1px solid #eec; border-bottom: 1px solid $widget_brdrcolour;
-moz-border-radius: $radiuspx; -moz-border-radius: $radiuspx;
-webkit-border-radius: $radiuspx; -webkit-border-radius: $radiuspx;
border-radius: $radiuspx; border-radius: $radiuspx;
@ -2248,6 +2248,7 @@ blockquote {
.btn-default { .btn-default {
background-color: $editbuttons_bgcolour; background-color: $editbuttons_bgcolour;
border-color: $editbuttons_bordercolour; border-color: $editbuttons_bordercolour;
color: $editbuttons_colour;
text-shadow: none; text-shadow: none;
box-shadow: none; box-shadow: none;
} }

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

@ -126,8 +126,6 @@ if(! $a->install) {
$toolicon_activecolour = '#000'; $toolicon_activecolour = '#000';
if (! $item_opacity) if (! $item_opacity)
$item_opacity = "1"; $item_opacity = "1";
if (! $item_bordercolour)
$item_bordercolour = $item_colour;
if (! $font_size) if (! $font_size)
$font_size = "1.0em"; $font_size = "1.0em";
if (! $body_font_size) if (! $body_font_size)
@ -138,6 +136,8 @@ if(! $a->install) {
$selected_active_colour = "#444"; $selected_active_colour = "#444";
if (! $selected_active_deco) if (! $selected_active_deco)
$selected_active_deco = "none"; $selected_active_deco = "none";
if (! $widget_brdrcolour)
$widget_brdrcolour = "#eec";
if (! $blockquote_colour) if (! $blockquote_colour)
$blockquote_colour = "#000"; $blockquote_colour = "#000";
if (! $blockquote_bgcolour) if (! $blockquote_bgcolour)
@ -158,6 +158,8 @@ if(! $a->install) {
$editbuttons_bgcolour = "transparent"; $editbuttons_bgcolour = "transparent";
if (! $editbuttons_bordercolour) if (! $editbuttons_bordercolour)
$editbuttons_bordercolour = "#ccc"; $editbuttons_bordercolour = "#ccc";
if (! $editbuttons_colour)
$editbuttons_colour = "#333";
if (! $editbuttons_bghover) if (! $editbuttons_bghover)
$editbuttons_bghover = "#ebebeb"; $editbuttons_bghover = "#ebebeb";
if (! $preview_backgroundimg) if (! $preview_backgroundimg)
@ -260,7 +262,6 @@ $options = array (
'$item_colour' => $item_colour, '$item_colour' => $item_colour,
'$comment_item_colour' => $comment_item_colour, '$comment_item_colour' => $comment_item_colour,
'$item_opacity' => $item_opacity, '$item_opacity' => $item_opacity,
'$item_bordercolour' => $item_bordercolour,
'$toolicon_colour' => $toolicon_colour, '$toolicon_colour' => $toolicon_colour,
'$toolicon_activecolour' => $toolicon_activecolour, '$toolicon_activecolour' => $toolicon_activecolour,
'$font_size' => $font_size, '$font_size' => $font_size,
@ -268,6 +269,7 @@ $options = array (
'$selected_active_colour' => $selected_active_colour, '$selected_active_colour' => $selected_active_colour,
'$selected_active_deco' => $selected_active_deco, '$selected_active_deco' => $selected_active_deco,
'$body_font_size' => $body_font_size, '$body_font_size' => $body_font_size,
'$widget_brdrcolour' => $widget_brdrcolour,
'$blockquote_colour' => $blockquote_colour, '$blockquote_colour' => $blockquote_colour,
'$blockquote_bgcolour' => $blockquote_bgcolour, '$blockquote_bgcolour' => $blockquote_bgcolour,
'$blockquote_bordercolour' => $blockquote_bordercolour, '$blockquote_bordercolour' => $blockquote_bordercolour,
@ -279,6 +281,7 @@ $options = array (
'$notif_itemhovercolour' => $notif_itemhovercolour, '$notif_itemhovercolour' => $notif_itemhovercolour,
'$editbuttons_bgcolour' => $editbuttons_bgcolour, '$editbuttons_bgcolour' => $editbuttons_bgcolour,
'$editbuttons_bordercolour' => $editbuttons_bordercolour, '$editbuttons_bordercolour' => $editbuttons_bordercolour,
'$editbuttons_colour' => $editbuttons_colour,
'$editbuttons_bghover' => $editbuttons_bghover, '$editbuttons_bghover' => $editbuttons_bghover,
'$preview_backgroundimg' => $preview_backgroundimg, '$preview_backgroundimg' => $preview_backgroundimg,
'$acpopup_bgcolour' => $acpopup_bgcolour, '$acpopup_bgcolour' => $acpopup_bgcolour,

8
view/theme/redbasic/schema/dark.php
View File

@ -47,13 +47,17 @@
if (! $bgcolour) if (! $bgcolour)
$bgcolour = "#111"; $bgcolour = "#111";
if (! $item_colour) 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) if (! $toolicon_colour)
$toolicon_colour = '#999'; $toolicon_colour = '#999';
if (! $toolicon_activecolour) if (! $toolicon_activecolour)
$toolicon_activecolour = '#fff'; $toolicon_activecolour = '#fff';
if (! $font_colour) if (! $font_colour)
$font_colour = "#ccc"; $font_colour = "#ccc";
if (! $widget_brdrcolour)
$widget_brdrcolour = "#333";
if (! $blockquote_colour) if (! $blockquote_colour)
$blockquote_colour = "#ccc"; $blockquote_colour = "#ccc";
if (! $blockquote_bgcolour) if (! $blockquote_bgcolour)
@ -84,6 +88,8 @@
$editbuttons_bgcolour = "#1e1e1e"; $editbuttons_bgcolour = "#1e1e1e";
if (! $editbuttons_bordercolour) if (! $editbuttons_bordercolour)
$editbuttons_bordercolour = "#222"; $editbuttons_bordercolour = "#222";
if (! $editbuttons_colour)
$editbuttons_colour = "#ccc";
if (! $editbuttons_bghover) if (! $editbuttons_bghover)
$editbuttons_bghover = "#222"; $editbuttons_bghover = "#222";
if (! $preview_backgroundimg) if (! $preview_backgroundimg)