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 2015-03-19 15:58:08 -07:00
commit b6965ad01f
14 changed files with 183 additions and 201 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/Schema-development.md
View File

@ -68,11 +68,13 @@ theme are as follows:
Set the size of shadows shown with inline images. Accepts a numerical Set the size of shadows shown with inline images. Accepts a numerical
value. Note shadows are not applied to smileys. value. Note shadows are not applied to smileys.
* converse_width * converse_width
Set the maximum width of conversations. Accepts px, or %. Set the maximum width of the content region in px.
* nav_min_opacity * nav_min_opacity
* top_photo * top_photo
* reply_photo * reply_photo
* sloppy_photos
Determins whether photos are "sloppy" or aligned. Set or unset (1 or '') If a your_schema_name.css file is found, the content of this file will be attached to the end of style.css.
This gives the schem developer the possiblity to override any style component.
#include doc/macros/main_footer.bb; #include doc/macros/main_footer.bb;

7
doc/schema_development.bb
View File

@ -66,11 +66,12 @@ theme are as follows:
Set the size of shadows shown with inline images. Accepts a numerical Set the size of shadows shown with inline images. Accepts a numerical
value. Note shadows are not applied to smileys.[/li] value. Note shadows are not applied to smileys.[/li]
[li] converse_width [li] converse_width
Set the maximum width of conversations. Accepts px, or %.[/li] Set the maximum width of the content region in px.[/li]
[li] nav_min_opacity[/li] [li] nav_min_opacity[/li]
[li] top_photo[/li] [li] top_photo[/li]
[li] reply_photo[/li] [li] reply_photo[/li]
[li] sloppy_photos
Determins whether photos are "sloppy" or aligned. Set or unset (1 or '')[/li] If a your_schema_name.css file is found, the content of this file will be attached to the end of style.css.
This gives the schem developer the possiblity to override any style component.
#include doc/macros/main_footer.bb; #include doc/macros/main_footer.bb;

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

@ -493,18 +493,10 @@ footer {
font-size: 0.7em; font-size: 0.7em;
} }
#cboxContent {
color: $dirpopup_txtcol;
}
#colorbox { #colorbox {
padding: 5px; padding: 5px;
} }
#cboxContent a {
color: $dirpopup_linkcol;
}
.app-name { .app-name {
overflow: none; overflow: none;
} }
@ -967,12 +959,12 @@ nav .acpopup {
} }
.fc-state-highlight { .fc-state-highlight {
background: none repeat scroll 0% 0% $cal_bgcolour !important; background: none repeat scroll 0% 0% #FCF8E3 !important;
} }
#colorbox { #colorbox {
border: 0px solid $fancybox_bgcolour; border: 0px solid #fff;
background-color: $fancybox_bgcolour; background-color: #fff;
z-index: 9; z-index: 9;
} }
@ -1590,7 +1582,7 @@ text-decoration: none;
} }
#adminpage table tr:hover { #adminpage table tr:hover {
background-color: $admintable_hoverbgcol; background-color: #BBC7D7;
} }
table { table {
@ -1853,7 +1845,7 @@ img.mail-list-sender-photo {
} }
.abook-pending-contact, .abook-permschange { .abook-pending-contact, .abook-permschange {
background: $abook_changebg; background: orange;
} }
.online-now { .online-now {
@ -1867,7 +1859,7 @@ img.mail-list-sender-photo {
.chat-item-text { .chat-item-text {
border-radius: $radiuspx; border-radius: $radiuspx;
background-color: $chat_txtbgcol; background-color: #eee;
} }
/* nav bootstrap */ /* nav bootstrap */
@ -2194,19 +2186,6 @@ aside .nav > li > a:hover, aside .nav > li > a:focus {
text-decoration: none; text-decoration: none;
} }
.alert-info {
color: $alert_txtcolour;
background-color:$alert_bgcolour;
border-color: $alert_bordercol;
background-image: linear-gradient(to bottom, $alert_bgcolour 0px, $alert_gradientcol 100%);
}
.well {
background-color: $advperm_bgcolour;
border: 1px solid $advperm_bordercol;
background-image: linear-gradient(to bottom, $advperm_gradientcol 0px, $advperm_bgcolour 100%);
}
@media screen and (max-width: 767px) { @media screen and (max-width: 767px) {
aside#region_1 { aside#region_1 {
background: rgba(0, 0, 0, .1); background: rgba(0, 0, 0, .1);

2
view/theme/redbasic/php/config.php
View File

@ -35,7 +35,6 @@ function theme_content(&$a) {
$arr['nav_min_opacity']=get_pconfig(local_channel(),"redbasic","nav_min_opacity"); $arr['nav_min_opacity']=get_pconfig(local_channel(),"redbasic","nav_min_opacity");
$arr['top_photo']=get_pconfig(local_channel(),"redbasic","top_photo"); $arr['top_photo']=get_pconfig(local_channel(),"redbasic","top_photo");
$arr['reply_photo']=get_pconfig(local_channel(),"redbasic","reply_photo"); $arr['reply_photo']=get_pconfig(local_channel(),"redbasic","reply_photo");
$arr['sloppy_photos']=get_pconfig(local_channel(),"redbasic","sloppy_photos");
return redbasic_form($a, $arr); return redbasic_form($a, $arr);
} }
@ -73,7 +72,6 @@ function theme_post(&$a) {
set_pconfig(local_channel(), 'redbasic', 'nav_min_opacity', $_POST['redbasic_nav_min_opacity']); set_pconfig(local_channel(), 'redbasic', 'nav_min_opacity', $_POST['redbasic_nav_min_opacity']);
set_pconfig(local_channel(), 'redbasic', 'top_photo', $_POST['redbasic_top_photo']); set_pconfig(local_channel(), 'redbasic', 'top_photo', $_POST['redbasic_top_photo']);
set_pconfig(local_channel(), 'redbasic', 'reply_photo', $_POST['redbasic_reply_photo']); set_pconfig(local_channel(), 'redbasic', 'reply_photo', $_POST['redbasic_reply_photo']);
set_pconfig(local_channel(), 'redbasic', 'sloppy_photos', $_POST['redbasic_sloppy_photos']);
} }
} }

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

@ -36,7 +36,6 @@ if(! $a->install) {
$converse_width=get_pconfig($uid,"redbasic","converse_width"); $converse_width=get_pconfig($uid,"redbasic","converse_width");
$converse_center=get_pconfig($uid,"redbasic","converse_center"); $converse_center=get_pconfig($uid,"redbasic","converse_center");
$nav_min_opacity=get_pconfig($uid,'redbasic','nav_min_opacity'); $nav_min_opacity=get_pconfig($uid,'redbasic','nav_min_opacity');
$sloppy_photos=get_pconfig($uid,'redbasic','sloppy_photos');
$top_photo=get_pconfig($uid,'redbasic','top_photo'); $top_photo=get_pconfig($uid,'redbasic','top_photo');
$reply_photo=get_pconfig($uid,'redbasic','reply_photo'); $reply_photo=get_pconfig($uid,'redbasic','reply_photo');
@ -262,34 +261,7 @@ if(! $a->install) {
$reply_photo = '32px'; $reply_photo = '32px';
if(! $infomess_bgcolour) if(! $infomess_bgcolour)
$infomess_bgcolour = "#F0F0F0"; $infomess_bgcolour = "#F0F0F0";
if(! $alert_txtcolour)
$alert_txtcolour = "#31708F";
if(! $alert_bgcolour)
$alert_bgcolour = "#D9EDF7";
if(! $alert_bordercol)
$alert_bordercol = "#BCE8F1";
if(! $alert_gradientcol)
$alert_gradientcol = "#B9DEF0";
if(! $advperm_bgcolour)
$advperm_bgcolour = "#F5F5F5";
if(! $advperm_bordercol)
$advperm_bordercol = "#E3E3E3";
if(! $advperm_gradientcol)
$advperm_gradientcol = "#E8E8E8";
if(! $cal_bgcolour)
$cal_bgcolour = "#FCF8E3";
if(! $chat_txtbgcol)
$chat_txtbgcol = "#EEE";
if(! $fancybox_bgcolour)
$fancybox_bgcolour = "#FFFFFF";
if (!$admintable_hoverbgcol)
$admintable_hoverbgcol="#BBC7D7";
if (!$dirpopup_txtcol)
$dirpopup_txtcol="";
if (!$dirpopup_linkcol)
$dirpopup_linkcol="";
if (!$abook_changebg)
$abook_changebg="orange";
if($nav_min_opacity === false || $nav_min_opacity === '') { if($nav_min_opacity === false || $nav_min_opacity === '') {
$nav_float_min_opacity = 1.0; $nav_float_min_opacity = 1.0;
@ -403,39 +375,19 @@ $options = array (
'$top_photo' => $top_photo, '$top_photo' => $top_photo,
'$reply_photo' => $reply_photo, '$reply_photo' => $reply_photo,
'$infomess_bgcolour' => $infomess_bgcolour, '$infomess_bgcolour' => $infomess_bgcolour,
'$alert_txtcolour' => $alert_txtcolour,
'$alert_bgcolour' => $alert_bgcolour,
'$alert_bordercol' => $alert_bordercol,
'$alert_gradientcol' => $alert_gradientcol,
'$advperm_bgcolour' => $advperm_bgcolour,
'$advperm_bordercol' => $advperm_bordercol,
'$advperm_gradientcol' => $advperm_gradientcol,
'$cal_bgcolour' => $cal_bgcolour,
'$chat_txtbgcol' => $chat_txtbgcol,
'$fancybox_bgcolour' => $fancybox_bgcolour,
'$pmenu_top' => $pmenu_top, '$pmenu_top' => $pmenu_top,
'$pmenu_reply' => $pmenu_reply, '$pmenu_reply' => $pmenu_reply,
'$wwtop' => $wwtop,
'$comment_indent' => $comment_indent, '$comment_indent' => $comment_indent,
'$main_width' => $main_width, '$main_width' => $main_width,
'$comment_padding' => $comment_padding,
'$admintable_hoverbgcol' => $admintable_hoverbgcol,
'$dirpopup_txtcol' => $dirpopup_txtcol,
'$dirpopup_linkcol' => $dirpopup_linkcol,
'$abook_changebg' => $abook_changebg,
); );
echo str_replace(array_keys($options), array_values($options), $x); echo str_replace(array_keys($options), array_values($options), $x);
} }
if($sloppy_photos && file_exists('view/theme/redbasic/css/sloppy_photos.css')) {
echo file_get_contents('view/theme/redbasic/css/sloppy_photos.css');
}
if($narrow_navbar && file_exists('view/theme/redbasic/css/narrow_navbar.css')) { if($narrow_navbar && file_exists('view/theme/redbasic/css/narrow_navbar.css')) {
echo file_get_contents('view/theme/redbasic/css/narrow_navbar.css'); echo file_get_contents('view/theme/redbasic/css/narrow_navbar.css');
} }
if($converse_center && file_exists('view/theme/redbasic/css/converse_center.css')) { if($converse_center && file_exists('view/theme/redbasic/css/converse_center.css')) {
$x = file_get_contents('view/theme/redbasic/css/converse_center.css');
echo str_replace(array_keys($options), array_values($options), $x); echo str_replace(array_keys($options), array_values($options), $x);
} }

40
view/theme/redbasic/schema/dark.css
View File

@ -10,4 +10,44 @@
border-bottom: 1px solid #333; border-bottom: 1px solid #333;
} }
.abook-pending-contact, .abook-permschange {
background: #402900;
}
#cboxContent a {
color: #000;
}
#cboxContent {
color: #111;
}
#adminpage table tr:hover {
background-color: #222;
}
#colorbox {
border: 0px solid #1E1E1E;
background-color: #1E1E1E;
}
.chat-item-text {
background-color: #222;
}
.fc-state-highlight {
background: none repeat scroll 0% 0% #333 !important;
}
.well {
background-color: #1E1E1E;
border: 1px solid #222;
background-image: linear-gradient(to bottom, #1E1E1E 0px, #1E1E1E 100%);
}
.alert-info {
color: #CCC;
background-color:#333;
border-color: #444;
background-image: linear-gradient(to bottom, #333 0px, #333 100%);
}

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

@ -158,31 +158,3 @@
$abookself_bgcolour = "#251111"; $abookself_bgcolour = "#251111";
if(! $infomess_bgcolour) if(! $infomess_bgcolour)
$infomess_bgcolour = "#333"; $infomess_bgcolour = "#333";
if(! $alert_txtcolour)
$alert_txtcolour = "#CCC";
if(! $alert_bgcolour)
$alert_bgcolour = "#333";
if(! $alert_bordercol)
$alert_bordercol = "#444";
if(! $alert_gradientcol)
$alert_gradientcol = "#333";
if(! $advperm_bgcolour)
$advperm_bgcolour = "#1E1E1E";
if(! $advperm_bordercol)
$advperm_bordercol = "#222";
if(! $advperm_gradientcol)
$advperm_gradientcol = "#1E1E1E";
if(! $cal_bgcolour)
$cal_bgcolour = "#333";
if(! $chat_txtbgcol)
$chat_txtbgcol = "#222";
if(! $fancybox_bgcolour)
$fancybox_bgcolour = "#1E1E1E";
if (!$admintable_hoverbgcol)
$admintable_hoverbgcol="#222";
if (!$dirpopup_txtcol)
$dirpopup_txtcol="#111";
if (!$dirpopup_linkcol)
$dirpopup_linkcol="#000";
if (!$abook_changebg)
$abook_changebg="#402900";

40
view/theme/redbasic/schema/simple_black_on_white.css
View File

@ -10,4 +10,44 @@
border-bottom: 1px solid #fff; border-bottom: 1px solid #fff;
} }
.abook-pending-contact, .abook-permschange {
background: #fff;
}
#cboxContent a {
color: #fff;
}
#cboxContent {
color: #fff;
}
#adminpage table tr:hover {
background-color: #fff;
}
#colorbox {
border: 0px solid #fff;
background-color: #fff;
}
.chat-item-text {
background-color: #fff;
}
.fc-state-highlight {
background: none repeat scroll 0% 0% #fff !important;
}
.well {
background-color: #fff;
border: 1px solid #000;
background-image: linear-gradient(to bottom, #fff 0px, #fff 100%);
}
.alert-info {
color: #000;
background-color:#fff;
border-color: #000;
background-image: linear-gradient(to bottom, #fff 0px, #fff 100%);
}

28
view/theme/redbasic/schema/simple_black_on_white.php
View File

@ -158,31 +158,3 @@
$abookself_bgcolour = "#fff"; $abookself_bgcolour = "#fff";
if(! $infomess_bgcolour) if(! $infomess_bgcolour)
$infomess_bgcolour = "#fff"; $infomess_bgcolour = "#fff";
if(! $alert_txtcolour)
$alert_txtcolour = "#000";
if(! $alert_bgcolour)
$alert_bgcolour = "#fff";
if(! $alert_bordercol)
$alert_bordercol = "#000";
if(! $alert_gradientcol)
$alert_gradientcol = "#fff";
if(! $advperm_bgcolour)
$advperm_bgcolour = "#fff";
if(! $advperm_bordercol)
$advperm_bordercol = "#000";
if(! $advperm_gradientcol)
$advperm_gradientcol = "#fff";
if(! $cal_bgcolour)
$cal_bgcolour = "#fff";
if(! $chat_txtbgcol)
$chat_txtbgcol = "#fff";
if(! $fancybox_bgcolour)
$fancybox_bgcolour = "#fff";
if (!$admintable_hoverbgcol)
$admintable_hoverbgcol="#fff";
if (!$dirpopup_txtcol)
$dirpopup_txtcol="#fff";
if (!$dirpopup_linkcol)
$dirpopup_linkcol="#fff";
if (!$abook_changebg)
$abook_changebg="#fff";

41
view/theme/redbasic/schema/simple_green_on_black.css
View File

@ -10,4 +10,45 @@
border-bottom: 1px solid #000; border-bottom: 1px solid #000;
} }
.abook-pending-contact, .abook-permschange {
background: #000;
}
#cboxContent a {
color: #000;
}
#cboxContent {
color: #000;
}
#adminpage table tr:hover {
background-color: #000;
}
#colorbox {
border: 0px solid #000;
background-color: #000;
}
.chat-item-text {
background-color: #000;
}
.fc-state-highlight {
background: none repeat scroll 0% 0% #000 !important;
}
.well {
background-color: #000;
border: 1px solid #143D12;
background-image: linear-gradient(to bottom, #000 0px, #000 100%);
}
.alert-info {
color: #50f148;
background-color:#000;
border-color: #143D12;
background-image: linear-gradient(to bottom, #000 0px, #000 100%);
}

28
view/theme/redbasic/schema/simple_green_on_black.php
View File

@ -158,31 +158,3 @@ if (! $navaside_bghover)
$abookself_bgcolour = "#000"; $abookself_bgcolour = "#000";
if(! $infomess_bgcolour) if(! $infomess_bgcolour)
$infomess_bgcolour = "#000"; $infomess_bgcolour = "#000";
if(! $alert_txtcolour)
$alert_txtcolour = "#50f148";
if(! $alert_bgcolour)
$alert_bgcolour = "#000";
if(! $alert_bordercol)
$alert_bordercol = "#143D12";
if(! $alert_gradientcol)
$alert_gradientcol = "#000";
if(! $advperm_bgcolour)
$advperm_bgcolour = "#000";
if(! $advperm_bordercol)
$advperm_bordercol = "#143D12";
if(! $advperm_gradientcol)
$advperm_gradientcol = "#000";
if(! $cal_bgcolour)
$cal_bgcolour = "#000";
if(! $chat_txtbgcol)
$chat_txtbgcol = "#000";
if(! $fancybox_bgcolour)
$fancybox_bgcolour = "#000";
if (!$admintable_hoverbgcol)
$admintable_hoverbgcol="#000";
if (!$dirpopup_txtcol)
$dirpopup_txtcol="#000";
if (!$dirpopup_linkcol)
$dirpopup_linkcol="#000";
if (!$abook_changebg)
$abook_changebg="#000";

41
view/theme/redbasic/schema/simple_white_on_black.css
View File

@ -10,4 +10,45 @@
border-bottom: 1px solid #000; border-bottom: 1px solid #000;
} }
.abook-pending-contact, .abook-permschange {
background: #000;
}
#cboxContent a {
color: #000;
}
#cboxContent {
color: #000;
}
#adminpage table tr:hover {
background-color: #000;
}
#colorbox {
border: 0px solid #000;
background-color: #000;
}
.chat-item-text {
background-color: #000;
}
.fc-state-highlight {
background: none repeat scroll 0% 0% #000 !important;
}
.well {
background-color: #000;
border: 1px solid #fff;
background-image: linear-gradient(to bottom, #000 0px, #000 100%);
}
.alert-info {
color: #fff;
background-color:#000;
border-color: #fff;
background-image: linear-gradient(to bottom, #000 0px, #000 100%);
}

28
view/theme/redbasic/schema/simple_white_on_black.php
View File

@ -158,31 +158,3 @@
$abookself_bgcolour = "#000"; $abookself_bgcolour = "#000";
if(! $infomess_bgcolour) if(! $infomess_bgcolour)
$infomess_bgcolour = "#000"; $infomess_bgcolour = "#000";
if(! $alert_txtcolour)
$alert_txtcolour = "#fff";
if(! $alert_bgcolour)
$alert_bgcolour = "#000";
if(! $alert_bordercol)
$alert_bordercol = "#fff";
if(! $alert_gradientcol)
$alert_gradientcol = "#000";
if(! $advperm_bgcolour)
$advperm_bgcolour = "#000";
if(! $advperm_bordercol)
$advperm_bordercol = "#fff";
if(! $advperm_gradientcol)
$advperm_gradientcol = "#000";
if(! $cal_bgcolour)
$cal_bgcolour = "#000";
if(! $chat_txtbgcol)
$chat_txtbgcol = "#000";
if(! $fancybox_bgcolour)
$fancybox_bgcolour = "#000";
if (!$admintable_hoverbgcol)
$admintable_hoverbgcol="#000";
if (!$dirpopup_txtcol)
$dirpopup_txtcol="#000";
if (!$dirpopup_linkcol)
$dirpopup_linkcol="#000";
if (!$abook_changebg)
$abook_changebg="#000";

4
view/tpl/comment_item.tpl
View File

@ -49,9 +49,9 @@
<!--button class="btn btn-default btn-xs" title="{{$edvideo}}" onclick="insertbbcomment('{{$comment}}','video', {{$id}}); return false;"> <!--button class="btn btn-default btn-xs" title="{{$edvideo}}" onclick="insertbbcomment('{{$comment}}','video', {{$id}}); return false;">
<i class="icon-facetime-video comment-icon"></i> <i class="icon-facetime-video comment-icon"></i>
</button--> </button-->
<!--/div--> </div>
{{if $feature_encrypt}} {{if $feature_encrypt}}
<!--div class='btn-group'--> <div class='btn-group'>
<button class="btn btn-default btn-xs" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#comment-edit-text-' + '{{$id}}',''); return false;"> <button class="btn btn-default btn-xs" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#comment-edit-text-' + '{{$id}}',''); return false;">
<i class="icon-key comment-icon"></i> <i class="icon-key comment-icon"></i>
</button> </button>