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-02 17:30:33 -07:00
commit f6bcc1dfc4
3 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -100,6 +100,12 @@ code {
max-width: 80%;
}
pre {
background: $pre_bgcolour;
color: $pre_txtcolour;
border:1px solid $pre_borderc;
}
blockquote {
background-color: $blockquote_bgcolour;
border-left: 4px solid $blockquote_bordercolour;
@ -146,7 +152,7 @@ header {
.info-message {
font-size: 1.1em;
border: 1px solid #444;
background-color: #F0F0F0;
background-color: $infomess_bgcolour;
padding: 10px;
-moz-border-radius: $radiuspx;
border-radius: $radiuspx;

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

@ -153,6 +153,12 @@ if(! $a->install) {
$code_bgcolour = "#EEE";
if (! $code_txtcolour)
$code_txtcolour = "#444";
if (! $pre_borderc)
$pre_borderc = "#ccc";
if (! $pre_bgcolour)
$pre_bgcolour = "#F5F5F5";
if (! $pre_txtcolour)
$pre_txtcolour = "#333";
if (! $notif_itemcolour)
$notif_itemcolour = "#000";
if (! $notif_itemhovercolour)
@ -224,6 +230,8 @@ if(! $a->install) {
$comment_indent = '0px';
if(! $reply_photo)
$reply_photo = '32px';
if(! $infomess_bgcolour)
$infomess_bgcolour = "#F0F0F0";
if($nav_min_opacity === false || $nav_min_opacity === '') {
$nav_float_min_opacity = 1.0;
$nav_percent_min_opacity = 100;
@ -281,6 +289,9 @@ $options = array (
'$code_borderc' => $code_borderc,
'$code_bgcolour' => $code_bgcolour,
'$code_txtcolour' => $code_txtcolour,
'$pre_borderc' => $pre_borderc,
'$pre_bgcolour' => $pre_bgcolour,
'$pre_txtcolour' => $pre_txtcolour,
'$notif_itemcolour' => $notif_itemcolour,
'$notif_itemhovercolour' => $notif_itemhovercolour,
'$editbuttons_bgcolour' => $editbuttons_bgcolour,
@ -317,6 +328,7 @@ $options = array (
'$nav_percent_min_opacity' => $nav_percent_min_opacity,
'$top_photo' => $top_photo,
'$reply_photo' => $reply_photo,
'$infomess_bgcolour' => $infomess_bgcolour,
'$pmenu_top' => $pmenu_top,
'$pmenu_reply' => $pmenu_reply,
'$wwtop' => $wwtop,

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

@ -50,6 +50,8 @@
$item_colour = "rgba(28,28,28,0.8)";
if (! $comment_item_colour)
$comment_item_colour = "rgba(18,18,18,0.4)";
if (! $comment_border_colour)
$comment_border_colour = "rgba(28,28,28,0.8)";
if (! $toolicon_colour)
$toolicon_colour = '#999';
if (! $toolicon_activecolour)
@ -69,7 +71,13 @@
if (! $code_bgcolour)
$code_bgcolour = "#000";
if (! $code_txtcolour)
$code_txtcolour = "#fff";
$code_txtcolour = "#bbb";
if (! $pre_borderc)
$pre_borderc = "#090909";
if (! $pre_bgcolour)
$pre_bgcolour = "#000";
if (! $pre_txtcolour)
$pre_txtcolour = "#bbb";
if (! $item_bordercolour)
$item_bordercolour = "#333";
if (! $notif_itemcolour)
@ -128,3 +136,5 @@
$aclbutton_linkcolour = "color: #fff;";
if (! $abookself_bgcolour)
$abookself_bgcolour = "#251111";
if(! $infomess_bgcolour)
$infomess_bgcolour = "#333";