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

Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

Browse Source
This commit is contained in:
zotlabs
2017-03-25 14:40:31 -07:00
parent 5c63f7dd58 2115eb26a7
commit e5e0a6b31f
178 changed files with 15561 additions and 11282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
view/theme/redbasic/css/narrow_navbar.css
View File

@@ -1,64 +1,30 @@
@media screen and (min-width: 760px) {
@media screen and (min-width: 767px) {
aside {
padding-top: 52px;
nav.navbar {
padding-top: 1px;
padding-bottom: 1px
}
section {
padding-top: 52px;
}
.navbar-nav > li > a {
padding-top:7px !important;
padding-bottom:3px !important;
}
.navbar {
min-height:25px !important;
}
nav .navbar-header img {
height: 29px;
width: 29px;
margin-top: 1px;
border-radius: 4px;
}
.navbar-left {
height: 29px;
}
.container-fluid {
min-height:29px;
}
.collapse .navbar-collapse {
min-height:29px;
}
#nav-search-text {
margin:6px 15px 4px 15px;
}
#nav-search-spinner {
margin: 16px 0px 0px 25px;
}
header #banner {
margin-top:5px;
}
nav .dropdown-menu,
nav .acpopup {
top: 30px !important;
}
#jGrowl.top-right {
top: 30px;
right: 15px;
nav .badge {
top: 0px;
left: -0.25rem;
}
.contextual-help-content-open {
top: 31px;
top: 2.4rem;
}
aside {
padding-top: 3.5rem;
}
section {
padding-top: 3.5rem;
}
#jGrowl.top-right {
top: 3.5rem;
right: 15px;
}
}

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

File diff suppressed because it is too large Load Diff

41
view/theme/redbasic/js/redbasic.js
View File

@@ -16,14 +16,21 @@ $(document).ready(function() {
}
$('#css3-calc').remove(); // Remove the test element
if($(window).width() > 767) {
$('#left_aside_wrapper').stick_in_parent({
offset_top: $('nav').outerHeight(true),
offset_top: $('nav').outerHeight(true) + 10,
parent: '#region_1',
spacer: '#left_aside_spacer'
});
}
if(($(window).width() < 767) && ($('#left_aside_wrapper .widget, #left_aside_wrapper .vcard').length > 0))
$('#expand-aside').show();
else
$('#expand-aside').hide();
$('#expand-aside').on('click', toggleAside);
$('section').on('click', function() {
@@ -41,29 +48,14 @@ $(document).ready(function() {
}
});
if($('#left_aside_wrapper').length && $('#left_aside_wrapper').html().length === 0) {
$('#expand-aside').hide();
}
$('#expand-tabs').click(function() {
if(!$('#tabs-collapse-1').hasClass('in')){
$('html, body').animate({ scrollTop: 0 }, 'slow');
}
$('#expand-tabs-icon').toggleClass('fa-arrow-circle-down').toggleClass('fa-arrow-circle-up');
});
$('.usermenu-head').click(function() {
if($('#navbar-collapse-1, #navbar-collapse-2').hasClass('in')){
$('#navbar-collapse-1, #navbar-collapse-2').removeClass('in');
$('.usermenu').click(function() {
if($('#navbar-collapse-1, #navbar-collapse-2').hasClass('show')){
$('#navbar-collapse-1, #navbar-collapse-2').removeClass('show');
}
});
if($('#tabs-collapse-1').length === 0) {
$('#expand-tabs').hide();
}
$("input[data-role=cat-tagsinput]").tagsinput({
tagClass: 'label label-primary'
tagClass: 'badge badge-pill badge-warning'
});
var doctitle = document.title;
@@ -81,17 +73,14 @@ $(document).ready(function() {
function makeFullScreen(full) {
if(typeof full=='undefined' || full == true) {
$('main').css({'transition': 'none'}).addClass('fullscreen');
$('header, nav, aside, #fullscreen-btn').hide();
$('#tabs-collapse-1').css({'visibility': 'hidden'});
$('main').addClass('fullscreen');
$('header, nav, aside, #fullscreen-btn').attr('style','display:none !important');
$('#inline-btn').show();
}
else {
$('main').removeClass('fullscreen');
$('header, nav, aside, #fullscreen-btn').show();
$('#tabs-collapse-1').css({'visibility': ''});
$('#inline-btn').hide();
$('main').css({'transition': ''});
$(document.body).trigger("sticky_kit:recalc");
}
}
@@ -109,7 +98,7 @@ function toggleAside() {
$('main').addClass('region_1-on')
$('<div id="overlay"></div>').appendTo('section');
$('#left_aside_wrapper').stick_in_parent({
offset_top: $('nav').outerHeight(true) - 10,
offset_top: $('nav').outerHeight(true) + 10,
parent: '#region_1',
spacer: '#left_aside_spacer'
});

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

@@ -46,7 +46,6 @@ class RedbasicConfig {
$arr['toolicon_colour'] = get_pconfig(local_channel(),'redbasic','toolicon_colour');
$arr['toolicon_activecolour'] = get_pconfig(local_channel(),'redbasic','toolicon_activecolour');
$arr['font_size'] = get_pconfig(local_channel(),'redbasic', 'font_size' );
$arr['body_font_size'] = get_pconfig(local_channel(),'redbasic', 'body_font_size' );
$arr['font_colour'] = get_pconfig(local_channel(),'redbasic', 'font_colour' );
$arr['radius'] = get_pconfig(local_channel(),'redbasic', 'radius' );
$arr['shadow'] = get_pconfig(local_channel(),'redbasic', 'photo_shadow' );
@@ -84,7 +83,6 @@ class RedbasicConfig {
set_pconfig(local_channel(), 'redbasic', 'toolicon_colour', $_POST['redbasic_toolicon_colour']);
set_pconfig(local_channel(), 'redbasic', 'toolicon_activecolour', $_POST['redbasic_toolicon_activecolour']);
set_pconfig(local_channel(), 'redbasic', 'font_size', $_POST['redbasic_font_size']);
set_pconfig(local_channel(), 'redbasic', 'body_font_size', $_POST['redbasic_body_font_size']);
set_pconfig(local_channel(), 'redbasic', 'font_colour', $_POST['redbasic_font_colour']);
set_pconfig(local_channel(), 'redbasic', 'radius', $_POST['redbasic_radius']);
set_pconfig(local_channel(), 'redbasic', 'photo_shadow', $_POST['redbasic_shadow']);
@@ -127,10 +125,9 @@ class RedbasicConfig {
'$comment_indent' => array('redbasic_comment_indent', t('Set the indent for comments'), $arr['comment_indent']),
'$toolicon_colour' => array('redbasic_toolicon_colour',t('Set the basic color for item icons'),$arr['toolicon_colour']),
'$toolicon_activecolour' => array('redbasic_toolicon_activecolour',t('Set the hover color for item icons'),$arr['toolicon_activecolour']),
'$body_font_size' => array('redbasic_body_font_size', t('Set font-size for the entire application'), $arr['body_font_size'], t('Example: 14px')),
'$font_size' => array('redbasic_font_size', t('Set font-size for posts and comments'), $arr['font_size']),
'$font_size' => array('redbasic_font_size', t('Set font-size for the entire application'), $arr['font_size'], t('Examples: 87.5%, 14px')),
'$font_colour' => array('redbasic_font_colour', t('Set font-color for posts and comments'), $arr['font_colour']),
'$radius' => array('redbasic_radius', t('Set radius of corners'), $arr['radius']),
'$radius' => array('redbasic_radius', t('Set radius of corners'), $arr['radius'], t('Example: 4px')),
'$shadow' => array('redbasic_shadow', t('Set shadow depth of photos'), $arr['shadow']),
'$converse_width' => array('redbasic_converse_width',t('Set maximum width of content region in pixel'),$arr['converse_width'], t('Leave empty for default width')),
'$align_left' => array('redbasic_align_left',t('Left align page content'),$arr['align_left'], '', array(t('No'),t('Yes'))),

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

@@ -10,33 +10,32 @@ if(! App::$install) {
}
// Load the owners pconfig
$nav_bg = get_pconfig($uid, "redbasic", "nav_bg");
$nav_gradient_top = get_pconfig($uid, "redbasic", "nav_gradient_top");
$nav_gradient_bottom = get_pconfig($uid, "redbasic", "nav_gradient_bottom");
$nav_active_gradient_top = get_pconfig($uid, "redbasic", "nav_active_gradient_top");
$nav_active_gradient_bottom = get_pconfig($uid, "redbasic", "nav_active_gradient_bottom");
$nav_bd = get_pconfig($uid, "redbasic", "nav_bd");
$nav_icon_colour = get_pconfig($uid, "redbasic", "nav_icon_colour");
$nav_active_icon_colour = get_pconfig($uid, "redbasic", "nav_active_icon_colour");
$nav_bg = get_pconfig($uid, 'redbasic', 'nav_bg');
$nav_gradient_top = get_pconfig($uid, 'redbasic', 'nav_gradient_top');
$nav_gradient_bottom = get_pconfig($uid, 'redbasic', 'nav_gradient_bottom');
$nav_active_gradient_top = get_pconfig($uid, 'redbasic', 'nav_active_gradient_top');
$nav_active_gradient_bottom = get_pconfig($uid, 'redbasic', 'nav_active_gradient_bottom');
$nav_bd = get_pconfig($uid, 'redbasic', 'nav_bd');
$nav_icon_colour = get_pconfig($uid, 'redbasic', 'nav_icon_colour');
$nav_active_icon_colour = get_pconfig($uid, 'redbasic', 'nav_active_icon_colour');
$narrow_navbar = get_pconfig($uid,'redbasic','narrow_navbar');
$banner_colour = get_pconfig($uid,'redbasic','banner_colour');
$link_colour = get_pconfig($uid, "redbasic", "link_colour");
$link_colour = get_pconfig($uid, 'redbasic', 'link_colour');
$schema = get_pconfig($uid,'redbasic','schema');
$bgcolour = get_pconfig($uid, "redbasic", "background_colour");
$background_image = get_pconfig($uid, "redbasic", "background_image");
$bgcolour = get_pconfig($uid, 'redbasic', 'background_colour');
$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");
$comment_item_colour = get_pconfig($uid, "redbasic", "comment_item_colour");
$comment_border_colour = get_pconfig($uid, "redbasic", "comment_border_colour");
$comment_indent = get_pconfig($uid, "redbasic", "comment_indent");
$body_font_size = get_pconfig($uid, "redbasic", "body_font_size");
$font_size = get_pconfig($uid, "redbasic", "font_size");
$font_colour = get_pconfig($uid, "redbasic", "font_colour");
$radius = get_pconfig($uid, "redbasic", "radius");
$shadow = get_pconfig($uid,"redbasic","photo_shadow");
$converse_width=get_pconfig($uid,"redbasic","converse_width");
$align_left=get_pconfig($uid,"redbasic","align_left");
$item_colour = get_pconfig($uid, 'redbasic', 'item_colour');
$comment_item_colour = get_pconfig($uid, 'redbasic', 'comment_item_colour');
$comment_border_colour = get_pconfig($uid, 'redbasic', 'comment_border_colour');
$comment_indent = get_pconfig($uid, 'redbasic', 'comment_indent');
$font_size = get_pconfig($uid, 'redbasic', 'font_size');
$font_colour = get_pconfig($uid, 'redbasic', 'font_colour');
$radius = get_pconfig($uid, 'redbasic', 'radius');
$shadow = get_pconfig($uid,'redbasic','photo_shadow');
$converse_width=get_pconfig($uid,'redbasic','converse_width');
$align_left=get_pconfig($uid,'redbasic','align_left');
$nav_min_opacity=get_pconfig($uid,'redbasic','nav_min_opacity');
$top_photo=get_pconfig($uid,'redbasic','top_photo');
$reply_photo=get_pconfig($uid,'redbasic','reply_photo');
@@ -86,59 +85,57 @@ if (! $schema) {
//Set some defaults - we have to do this after pulling owner settings, and we have to check for each setting
//individually. If we don't, we'll have problems if a user has set one, but not all options.
if (! $nav_bg)
$nav_bg = "#222";
$nav_bg = '#222';
if (! $nav_gradient_top)
$nav_gradient_top = "#3c3c3c";
$nav_gradient_top = '#3c3c3c';
if (! $nav_gradient_bottom)
$nav_gradient_bottom = "#222";
$nav_gradient_bottom = '#222';
if (! $nav_active_gradient_top)
$nav_active_gradient_top = "#222";
$nav_active_gradient_top = '#222';
if (! $nav_active_gradient_bottom)
$nav_active_gradient_bottom = "#282828";
$nav_active_gradient_bottom = '#282828';
if (! $nav_bd)
$nav_bd = "#222";
$nav_bd = '#222';
if (! $nav_icon_colour)
$nav_icon_colour = "#999";
$nav_icon_colour = '#999';
if (! $nav_active_icon_colour)
$nav_active_icon_colour = "#fff";
$nav_active_icon_colour = '#fff';
if (! $link_colour)
$link_colour = "#337AB7";
$link_colour = '#0275d8';
if (! $banner_colour)
$banner_colour = "#fff";
$banner_colour = '#fff';
if (! $bgcolour)
$bgcolour = "rgb(254,254,254)";
$bgcolour = 'rgb(254,254,254)';
if (! $background_image)
$background_image ='';
if (! $item_colour)
$item_colour = "rgb(238,238,238)";
$item_colour = 'rgb(238,238,238)';
if (! $comment_item_colour)
$comment_item_colour = "rgb(255,255,255)";
$comment_item_colour = 'rgb(255,255,255)';
if (! $comment_border_colour)
$comment_border_colour = "rgb(255,255,255)";
$comment_border_colour = 'rgb(255,255,255)';
if (! $toolicon_colour)
$toolicon_colour = '#777';
if (! $toolicon_activecolour)
$toolicon_activecolour = '#000';
if (! $item_opacity)
$item_opacity = "1";
$item_opacity = '1';
if (! $font_size)
$font_size = "0.9rem";
if (! $body_font_size)
$body_font_size = "0.75rem";
$font_size = '1rem';
if (! $font_colour)
$font_colour = "#4d4d4d";
$font_colour = '#4d4d4d';
if (! $radius)
$radius = "4";
$radius = '0.25rem';
if (! $shadow)
$shadow = "0";
$shadow = '0';
if (! $converse_width)
$converse_width = "790";
$converse_width = '790';
if(! $top_photo)
$top_photo = '48px';
$top_photo = '2.3rem';
if(! $comment_indent)
$comment_indent = '0px';
if(! $reply_photo)
$reply_photo = '32px';
$reply_photo = '2.3rem';
if($nav_min_opacity === false || $nav_min_opacity === '') {
$nav_float_min_opacity = 1.0;
$nav_percent_min_opacity = 100;
@@ -197,7 +194,6 @@ if(file_exists('view/theme/redbasic/css/style.css')) {
'$toolicon_activecolour' => $toolicon_activecolour,
'$font_size' => $font_size,
'$font_colour' => $font_colour,
'$body_font_size' => $body_font_size,
'$radius' => $radius,
'$shadow' => $shadow,
'$converse_width' => $converse_width,

4
view/theme/redbasic/php/theme.php
View File

@@ -3,8 +3,8 @@
/**
* * Name: Redbasic
* * Description: Hubzilla standard theme
* * Version: 2.0
* * MinVersion: 2.2RC
* * Version: 2.1
* * MinVersion: 2.3.1
* * MaxVersion: 6.0
* * Author: Fabrixxm
* * Maintainer: Mike Macgirvin

3
view/theme/redbasic/tpl/theme_settings.tpl
View File

@@ -1,6 +1,7 @@
{{include file="field_checkbox.tpl" field=$align_left}}
{{include file="field_checkbox.tpl" field=$narrow_navbar}}
{{include file="field_input.tpl" field=$converse_width}}
{{include file="field_input.tpl" field=$font_size}}
{{if $expert}}
{{include file="field_colorinput.tpl" field=$nav_bg}}
{{include file="field_colorinput.tpl" field=$nav_gradient_top}}
@@ -17,8 +18,6 @@
{{include file="field_colorinput.tpl" field=$comment_item_colour}}
{{*include file="field_colorinput.tpl" field=$comment_border_colour*}}
{{*include file="field_input.tpl" field=$comment_indent*}}
{{include file="field_input.tpl" field=$body_font_size}}
{{include file="field_input.tpl" field=$font_size}}
{{include file="field_colorinput.tpl" field=$font_colour}}
{{include file="field_colorinput.tpl" field=$link_colour}}
{{include file="field_colorinput.tpl" field=$banner_colour}}