Merge branch 'develop' of https://github.com/friendica/friendica into develop
This commit is contained in:
commit
76adcdc031
|
|
@ -158,7 +158,9 @@ function group_get_members($gid) {
|
|||
if(intval($gid)) {
|
||||
$r = q("SELECT `group_member`.`contact-id`, `contact`.* FROM `group_member`
|
||||
INNER JOIN `contact` ON `contact`.`id` = `group_member`.`contact-id`
|
||||
WHERE `gid` = %d AND `group_member`.`uid` = %d ORDER BY `contact`.`name` ASC ",
|
||||
WHERE `gid` = %d AND `group_member`.`uid` = %d AND
|
||||
NOT `contact`.`self` AND NOT `contact`.`blocked` AND NOT `contact`.`pending`
|
||||
ORDER BY `contact`.`name` ASC ",
|
||||
intval($gid),
|
||||
intval(local_user())
|
||||
);
|
||||
|
|
|
|||
|
|
@ -153,7 +153,7 @@
|
|||
var notifications_empty = unescape($("#nav-notifications-menu").html());
|
||||
|
||||
/* nav update event */
|
||||
$('nav').bind('nav-update', function(e,data){;
|
||||
$('nav').bind('nav-update', function(e,data){
|
||||
var invalid = $(data).find('invalid').text();
|
||||
if(invalid == 1) { window.location.href=window.location.href }
|
||||
|
||||
|
|
@ -203,6 +203,13 @@
|
|||
var birthdaystoday = $(data).find('birthdays-today').text();
|
||||
if(birthdaystoday == 0) { $('#birthdays-update').removeClass('notif-birthdays-today') } else { $('#birthdays-update').addClass('notif-birthdays-today') }
|
||||
|
||||
$(".sidebar-group-li .notify").removeClass("show");
|
||||
$(data).find("group").each(function() {
|
||||
var gid = this.id;
|
||||
var gcount = this.innerHTML;
|
||||
$(".group-"+gid+" .notify").addClass("show").text(gcount);
|
||||
});
|
||||
|
||||
|
||||
var eNotif = $(data).find('notif')
|
||||
|
||||
|
|
|
|||
|
|
@ -615,15 +615,17 @@ function admin_page_site(&$a) {
|
|||
$theme_choices = array();
|
||||
$theme_choices_mobile = array();
|
||||
$theme_choices_mobile["---"] = t("No special theme for mobile devices");
|
||||
$files = glob('view/theme/*');
|
||||
$files = glob('view/theme/*'); /**/
|
||||
if($files) {
|
||||
foreach($files as $file) {
|
||||
if (intval(file_exists($file . '/unsupported')))
|
||||
continue;
|
||||
|
||||
$f = basename($file);
|
||||
$theme_name = ((file_exists($file . '/experimental')) ? sprintf("%s - \x28Experimental\x29", $f) : $f);
|
||||
if (file_exists($file . '/mobile')) {
|
||||
$theme_choices_mobile[$f] = $theme_name;
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
$theme_choices[$f] = $theme_name;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -230,4 +230,3 @@ function group_content(&$a) {
|
|||
return replace_macros($tpl, $context);
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
2589
util/messages.po
2589
util/messages.po
File diff suppressed because it is too large
Load diff
|
|
@ -4,7 +4,7 @@
|
|||
<div id="sidebar-group-list">
|
||||
<ul role="menu" id="sidebar-group-ul">
|
||||
{{foreach $groups as $group}}
|
||||
<li role="menuitem" class="sidebar-group-li">
|
||||
<li role="menuitem" class="sidebar-group-li group-{{$group.id}}">
|
||||
{{if $group.cid}}
|
||||
<input type="checkbox"
|
||||
class="{{if $group.selected}}ticked{{else}}unticked {{/if}} action"
|
||||
|
|
@ -16,6 +16,7 @@
|
|||
<a class="groupsideedit" href="{{$group.edit.href}}" title="{{$edittext}}"><span id="edit-sidebar-group-element-{{$group.id}}" class="group-edit-icon iconspacer small-pencil"><span class="sr-only">{{$edittext}}</span></span></a>
|
||||
{{/if}}
|
||||
<a id="sidebar-group-element-{{$group.id}}" class="sidebar-group-element {{if $group.selected}}group-selected{{/if}}" href="{{$group.href}}">{{$group.text}}</a>
|
||||
<span class="notify"></span>
|
||||
</li>
|
||||
{{/foreach}}
|
||||
</ul>
|
||||
|
|
|
|||
|
|
@ -2039,6 +2039,17 @@ a.mail-list-link {
|
|||
#sidebar-group-list ul {
|
||||
list-style-type: none;
|
||||
}
|
||||
.sidebar-group-li .notify {
|
||||
display: none;
|
||||
font-size: 9px;
|
||||
border: 1px solid rgb(221, 221, 221);
|
||||
padding: 2px;
|
||||
float: right;
|
||||
background-color: #BABDB6;
|
||||
}
|
||||
.sidebar-group-li .notify.show {
|
||||
display: block;
|
||||
}
|
||||
|
||||
#sidebar-group-list .icon, #sidebar-group-list .iconspacer {
|
||||
display: inline-block;
|
||||
|
|
|
|||
|
|
@ -463,7 +463,7 @@ a:hover {
|
|||
text-decoration: underline;
|
||||
}
|
||||
blockquote {
|
||||
background: #ffffff;
|
||||
background: #FFFFFF;
|
||||
padding: 1em;
|
||||
margin-left: 1em;
|
||||
border-left: 1em solid #e6e6e6;
|
||||
|
|
@ -1013,6 +1013,21 @@ aside .posted-date-selector-months {
|
|||
.widget .tool.selected {
|
||||
background: url('../../../images/selected.png') no-repeat left center;
|
||||
}
|
||||
.widget .notify {
|
||||
display: none;
|
||||
background-color: #19AEFF;
|
||||
border-radius: 5px;
|
||||
font-size: 10px;
|
||||
padding: 1px 3px;
|
||||
min-width: 15px;
|
||||
text-align: right;
|
||||
float: right;
|
||||
color: #ffffff;
|
||||
margin-right: 10px;
|
||||
}
|
||||
.widget .notify.on {
|
||||
display: block;
|
||||
}
|
||||
/* widget: search */
|
||||
#add-search-popup {
|
||||
width: 200px;
|
||||
|
|
|
|||
|
|
@ -463,7 +463,7 @@ a:hover {
|
|||
text-decoration: underline;
|
||||
}
|
||||
blockquote {
|
||||
background: #ffffff;
|
||||
background: #FFFFFF;
|
||||
padding: 1em;
|
||||
margin-left: 1em;
|
||||
border-left: 1em solid #e6e6e6;
|
||||
|
|
@ -1013,6 +1013,21 @@ aside .posted-date-selector-months {
|
|||
.widget .tool.selected {
|
||||
background: url('../../../images/selected.png') no-repeat left center;
|
||||
}
|
||||
.widget .notify {
|
||||
display: none;
|
||||
background-color: #19AEFF;
|
||||
border-radius: 5px;
|
||||
font-size: 10px;
|
||||
padding: 1px 3px;
|
||||
min-width: 15px;
|
||||
text-align: right;
|
||||
float: right;
|
||||
color: #ffffff;
|
||||
margin-right: 10px;
|
||||
}
|
||||
.widget .notify.on {
|
||||
display: block;
|
||||
}
|
||||
/* widget: search */
|
||||
#add-search-popup {
|
||||
width: 200px;
|
||||
|
|
|
|||
143
view/theme/quattro/js/quattro.js
Normal file
143
view/theme/quattro/js/quattro.js
Normal file
|
|
@ -0,0 +1,143 @@
|
|||
$(document).ready(function(){
|
||||
$('nav').bind('nav-update', function(e,data){
|
||||
var notifCount = $(data).find('notif').attr('count');
|
||||
var intro = $(data).find('intro').text();
|
||||
var mail = $(data).find('mail').text();
|
||||
|
||||
$(".tool .notify").removeClass("on");
|
||||
$(data).find("group").each(function() {
|
||||
var gid = this.id;
|
||||
var gcount = this.innerHTML;
|
||||
$(".group-"+gid+" .notify").addClass("on").text(gcount);
|
||||
});
|
||||
|
||||
console.log(intro,mail);
|
||||
|
||||
if (notifCount > 0 ) {
|
||||
Tinycon.setBubble(notifCount);
|
||||
} else {
|
||||
Tinycon.setBubble('');
|
||||
}
|
||||
|
||||
if (intro>0){
|
||||
$("#nav-introductions-link").addClass("on");
|
||||
} else {
|
||||
$("#nav-introductions-link").removeClass("on");
|
||||
}
|
||||
|
||||
if (mail>0){
|
||||
$("#nav-messages-link").addClass("on");
|
||||
} else {
|
||||
$("#nav-messages-link").removeClass("on");
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
/*
|
||||
* show and hide contact action buttons in
|
||||
* contacts page on contacts' checkbox selection
|
||||
*/
|
||||
$('.contact-select').bind('click', function(e) {
|
||||
var y = e.clientY;
|
||||
var elm = $("#contacts-actions");
|
||||
y=y-40;
|
||||
if (y<0) y=0;
|
||||
if (y+elm.height() > $("html").height()) y=$("html").height()-elm.height();
|
||||
elm.css('top', y+"px");
|
||||
if ($(".contact-select:checked").length > 0) {
|
||||
elm.show();
|
||||
} else {
|
||||
elm.hide();
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
function insertFormatting(comment,BBcode,id) {
|
||||
|
||||
var tmpStr = $("#comment-edit-text-" + id).val();
|
||||
if(tmpStr == comment) {
|
||||
tmpStr = "";
|
||||
$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
|
||||
$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
|
||||
openMenu("comment-edit-submit-wrapper-" + id);
|
||||
$("#comment-edit-text-" + id).val(tmpStr);
|
||||
}
|
||||
|
||||
textarea = document.getElementById("comment-edit-text-" +id);
|
||||
if (document.selection) {
|
||||
textarea.focus();
|
||||
selected = document.selection.createRange();
|
||||
if (BBcode == "url"){
|
||||
selected.text = "["+BBcode+"]" + "http://" + selected.text + "[/"+BBcode+"]";
|
||||
} else
|
||||
selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
|
||||
} else if (textarea.selectionStart || textarea.selectionStart == "0") {
|
||||
var start = textarea.selectionStart;
|
||||
var end = textarea.selectionEnd;
|
||||
if (BBcode == "url"){
|
||||
textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
|
||||
} else
|
||||
textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
function showThread(id) {
|
||||
$("#collapsed-comments-" + id).show()
|
||||
$("#collapsed-comments-" + id + " .collapsed-comments").show()
|
||||
}
|
||||
function hideThread(id) {
|
||||
$("#collapsed-comments-" + id).hide()
|
||||
$("#collapsed-comments-" + id + " .collapsed-comments").hide()
|
||||
}
|
||||
|
||||
|
||||
function cmtBbOpen(id) {
|
||||
$("#comment-edit-bb-" + id).show();
|
||||
}
|
||||
function cmtBbClose(id) {
|
||||
$("#comment-edit-bb-" + id).hide();
|
||||
}
|
||||
|
||||
$(document).ready(function() {
|
||||
|
||||
$('html').click(function() { $("#nav-notifications-menu" ).hide(); });
|
||||
|
||||
$('.group-edit-icon').hover(
|
||||
function() {
|
||||
$(this).addClass('icon'); $(this).removeClass('iconspacer');},
|
||||
function() {
|
||||
$(this).removeClass('icon'); $(this).addClass('iconspacer');}
|
||||
);
|
||||
|
||||
$('.sidebar-group-element').hover(
|
||||
function() {
|
||||
id = $(this).attr('id');
|
||||
$('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');},
|
||||
|
||||
function() {
|
||||
id = $(this).attr('id');
|
||||
$('#edit-' + id).removeClass('icon');$('#edit-' + id).addClass('iconspacer');}
|
||||
);
|
||||
|
||||
|
||||
$('.savedsearchdrop').hover(
|
||||
function() {
|
||||
$(this).addClass('drop'); $(this).addClass('icon'); $(this).removeClass('iconspacer');},
|
||||
function() {
|
||||
$(this).removeClass('drop'); $(this).removeClass('icon'); $(this).addClass('iconspacer');}
|
||||
);
|
||||
|
||||
$('.savedsearchterm').hover(
|
||||
function() {
|
||||
id = $(this).attr('id');
|
||||
$('#drop-' + id).addClass('icon'); $('#drop-' + id).addClass('drophide'); $('#drop-' + id).removeClass('iconspacer');},
|
||||
|
||||
function() {
|
||||
id = $(this).attr('id');
|
||||
$('#drop-' + id).removeClass('icon');$('#drop-' + id).removeClass('drophide'); $('#drop-' + id).addClass('iconspacer');}
|
||||
);
|
||||
|
||||
});
|
||||
|
||||
|
||||
|
|
@ -420,7 +420,7 @@
|
|||
body {
|
||||
font-family: Liberation Sans, helvetica, arial, clean, sans-serif;
|
||||
font-size: 11px;
|
||||
background-color: #f6ecf9;
|
||||
background-color: #F6ECF9;
|
||||
color: #2d2d2d;
|
||||
margin: 50px 0px 0px 0px;
|
||||
display: table;
|
||||
|
|
@ -463,7 +463,7 @@ a:hover {
|
|||
text-decoration: underline;
|
||||
}
|
||||
blockquote {
|
||||
background: #ffffff;
|
||||
background: #FFFFFF;
|
||||
padding: 1em;
|
||||
margin-left: 1em;
|
||||
border-left: 1em solid #e6e6e6;
|
||||
|
|
@ -1013,6 +1013,21 @@ aside .posted-date-selector-months {
|
|||
.widget .tool.selected {
|
||||
background: url('../../../images/selected.png') no-repeat left center;
|
||||
}
|
||||
.widget .notify {
|
||||
display: none;
|
||||
background-color: #19AEFF;
|
||||
border-radius: 5px;
|
||||
font-size: 10px;
|
||||
padding: 1px 3px;
|
||||
min-width: 15px;
|
||||
text-align: right;
|
||||
float: right;
|
||||
color: #ffffff;
|
||||
margin-right: 10px;
|
||||
}
|
||||
.widget .notify.on {
|
||||
display: block;
|
||||
}
|
||||
/* widget: search */
|
||||
#add-search-popup {
|
||||
width: 200px;
|
||||
|
|
@ -1689,7 +1704,7 @@ span[id^="showmore-wrap"] {
|
|||
height: 20px;
|
||||
width: 500px;
|
||||
font-weight: bold;
|
||||
border: 1px solid #f6ecf9;
|
||||
border: 1px solid #F6ECF9;
|
||||
}
|
||||
#jot #jot-title:-webkit-input-placeholder {
|
||||
font-weight: normal;
|
||||
|
|
@ -1716,7 +1731,7 @@ span[id^="showmore-wrap"] {
|
|||
margin: 0px;
|
||||
height: 20px;
|
||||
width: 200px;
|
||||
border: 1px solid #f6ecf9;
|
||||
border: 1px solid #F6ECF9;
|
||||
}
|
||||
#jot #jot-category:hover {
|
||||
border: 1px solid #999999;
|
||||
|
|
|
|||
|
|
@ -442,6 +442,20 @@ aside {
|
|||
/*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
|
||||
.action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
|
||||
|
||||
.notify {
|
||||
display: none;
|
||||
background-color: #19AEFF;
|
||||
border-radius: 5px;
|
||||
font-size: 10px;
|
||||
padding: 1px 3px;
|
||||
min-width: 15px;
|
||||
text-align: right;
|
||||
float: right;
|
||||
color: rgb(255, 255, 255);
|
||||
margin-right: 10px;
|
||||
|
||||
&.on { display: block; }
|
||||
}
|
||||
}
|
||||
|
||||
/* widget: search */
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<div id="sidebar-group-list">
|
||||
<ul>
|
||||
{{foreach $groups as $group}}
|
||||
<li class="tool {{if $group.selected}}selected{{/if}}">
|
||||
<li class="tool {{if $group.selected}}selected{{/if}} group-{{$group.id}}">
|
||||
<a href="{{$group.href}}" class="label">
|
||||
{{$group.text}}
|
||||
</a>
|
||||
|
|
@ -21,6 +21,7 @@
|
|||
{{if $group.ismember}}checked="checked"{{/if}}
|
||||
/>
|
||||
{{/if}}
|
||||
<span class="notify"></span>
|
||||
</li>
|
||||
{{/foreach}}
|
||||
</ul>
|
||||
|
|
|
|||
|
|
@ -9,148 +9,7 @@
|
|||
|
||||
function quattro_init(&$a) {
|
||||
$a->theme_info = array();
|
||||
set_template_engine($a, 'smarty3');
|
||||
|
||||
|
||||
$a->page['htmlhead'] .= '<script src="'.$a->get_baseurl().'/view/theme/quattro/tinycon.min.js"></script>';
|
||||
$a->page['htmlhead'] .= <<< EOT
|
||||
<script>
|
||||
$(document).ready(function(){
|
||||
$('nav').bind('nav-update', function(e,data){
|
||||
var notifCount = $(data).find('notif').attr('count');
|
||||
var intro = $(data).find('intro').text();
|
||||
var mail = $(data).find('mail').text();
|
||||
|
||||
console.log(intro,mail);
|
||||
|
||||
if (notifCount > 0 ) {
|
||||
Tinycon.setBubble(notifCount);
|
||||
} else {
|
||||
Tinycon.setBubble('');
|
||||
}
|
||||
|
||||
if (intro>0){
|
||||
$("#nav-introductions-link").addClass("on");
|
||||
} else {
|
||||
$("#nav-introductions-link").removeClass("on");
|
||||
}
|
||||
|
||||
if (mail>0){
|
||||
$("#nav-messages-link").addClass("on");
|
||||
} else {
|
||||
$("#nav-messages-link").removeClass("on");
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
/*
|
||||
* show and hide contact action buttons in
|
||||
* contacts page on contacts' checkbox selection
|
||||
*/
|
||||
$('.contact-select').bind('click', function(e) {
|
||||
var y = e.clientY;
|
||||
var elm = $("#contacts-actions");
|
||||
y=y-40;
|
||||
if (y<0) y=0;
|
||||
if (y+elm.height() > $("html").height()) y=$("html").height()-elm.height();
|
||||
elm.css('top', y+"px");
|
||||
if ($(".contact-select:checked").length > 0) {
|
||||
elm.show();
|
||||
} else {
|
||||
elm.hide();
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
function insertFormatting(comment,BBcode,id) {
|
||||
|
||||
var tmpStr = $("#comment-edit-text-" + id).val();
|
||||
if(tmpStr == comment) {
|
||||
tmpStr = "";
|
||||
$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
|
||||
$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
|
||||
openMenu("comment-edit-submit-wrapper-" + id);
|
||||
$("#comment-edit-text-" + id).val(tmpStr);
|
||||
}
|
||||
|
||||
textarea = document.getElementById("comment-edit-text-" +id);
|
||||
if (document.selection) {
|
||||
textarea.focus();
|
||||
selected = document.selection.createRange();
|
||||
if (BBcode == "url"){
|
||||
selected.text = "["+BBcode+"]" + "http://" + selected.text + "[/"+BBcode+"]";
|
||||
} else
|
||||
selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
|
||||
} else if (textarea.selectionStart || textarea.selectionStart == "0") {
|
||||
var start = textarea.selectionStart;
|
||||
var end = textarea.selectionEnd;
|
||||
if (BBcode == "url"){
|
||||
textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
|
||||
} else
|
||||
textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
function showThread(id) {
|
||||
$("#collapsed-comments-" + id).show()
|
||||
$("#collapsed-comments-" + id + " .collapsed-comments").show()
|
||||
}
|
||||
function hideThread(id) {
|
||||
$("#collapsed-comments-" + id).hide()
|
||||
$("#collapsed-comments-" + id + " .collapsed-comments").hide()
|
||||
}
|
||||
|
||||
|
||||
function cmtBbOpen(id) {
|
||||
$("#comment-edit-bb-" + id).show();
|
||||
}
|
||||
function cmtBbClose(id) {
|
||||
$("#comment-edit-bb-" + id).hide();
|
||||
}
|
||||
|
||||
$(document).ready(function() {
|
||||
|
||||
$('html').click(function() { $("#nav-notifications-menu" ).hide(); });
|
||||
|
||||
$('.group-edit-icon').hover(
|
||||
function() {
|
||||
$(this).addClass('icon'); $(this).removeClass('iconspacer');},
|
||||
function() {
|
||||
$(this).removeClass('icon'); $(this).addClass('iconspacer');}
|
||||
);
|
||||
|
||||
$('.sidebar-group-element').hover(
|
||||
function() {
|
||||
id = $(this).attr('id');
|
||||
$('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');},
|
||||
|
||||
function() {
|
||||
id = $(this).attr('id');
|
||||
$('#edit-' + id).removeClass('icon');$('#edit-' + id).addClass('iconspacer');}
|
||||
);
|
||||
|
||||
|
||||
$('.savedsearchdrop').hover(
|
||||
function() {
|
||||
$(this).addClass('drop'); $(this).addClass('icon'); $(this).removeClass('iconspacer');},
|
||||
function() {
|
||||
$(this).removeClass('drop'); $(this).removeClass('icon'); $(this).addClass('iconspacer');}
|
||||
);
|
||||
|
||||
$('.savedsearchterm').hover(
|
||||
function() {
|
||||
id = $(this).attr('id');
|
||||
$('#drop-' + id).addClass('icon'); $('#drop-' + id).addClass('drophide'); $('#drop-' + id).removeClass('iconspacer');},
|
||||
|
||||
function() {
|
||||
id = $(this).attr('id');
|
||||
$('#drop-' + id).removeClass('icon');$('#drop-' + id).removeClass('drophide'); $('#drop-' + id).addClass('iconspacer');}
|
||||
);
|
||||
|
||||
});
|
||||
|
||||
|
||||
</script>
|
||||
EOT;
|
||||
$a->page['htmlhead'] .= '<script src="'.$a->get_baseurl().'/view/theme/quattro/js/quattro.js"></script>';;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ body, section, nav .nav-menu, div.pager, ul.tabs {
|
|||
}
|
||||
|
||||
nav {
|
||||
min-width: 480px;
|
||||
min-width: 100%;
|
||||
}
|
||||
|
||||
.wall-item-container .wall-item-content {
|
||||
|
|
@ -88,3 +88,29 @@ nav ul {
|
|||
.wall-item-container.thread_level_7 .wall-item-content {
|
||||
max-width: 100%;
|
||||
}
|
||||
|
||||
/* aside in/out */
|
||||
.mobile-aside-toggle {
|
||||
display: block !important;
|
||||
}
|
||||
.mobile-aside-toggle a {
|
||||
line-height: 35px;
|
||||
padding: 0 10px;
|
||||
}
|
||||
.mobile-aside-toggle a i {
|
||||
font-size: 22px;
|
||||
color: #CCC;
|
||||
}
|
||||
|
||||
aside {
|
||||
display: block;
|
||||
position: absolute;
|
||||
max-width: 400px;
|
||||
width: 80%;
|
||||
left: -100%;
|
||||
transition: left 0.5s;
|
||||
}
|
||||
|
||||
aside.show {
|
||||
left: 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -269,7 +269,7 @@ div.pager {
|
|||
/* global */
|
||||
body {
|
||||
/* font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; */
|
||||
font-family: system, -apple-system, ".SFNSText-Regular", "San Francisco", "Roboto", "Segoe UI", "Helvetica Neue", "Lucida Grande", sans-serif;
|
||||
font-family: system,-apple-system,".SFNSText-Regular","San Francisco","Roboto","Segoe UI","Helvetica Neue","Lucida Grande",Helvetica,Arial,sans-serif;
|
||||
font-size: 14px;
|
||||
/* font-size: 13px;
|
||||
line-height: 19.5px; */
|
||||
|
|
@ -366,6 +366,17 @@ code {
|
|||
#sidebar-group-list .tool:hover {
|
||||
background: #EEE;
|
||||
}
|
||||
#sidebar-group-list .notify {
|
||||
min-width: 10px;
|
||||
text-align: center;
|
||||
color: #FFF;
|
||||
background-color: #CB4437;
|
||||
font: bold 10px Arial;
|
||||
padding: 3px;
|
||||
border-radius: 10px;
|
||||
display: none;
|
||||
}
|
||||
#sidebar-group-list .notify.show { display: inline-block; }
|
||||
.tool .label {
|
||||
/* float: left; */
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,6 +7,11 @@
|
|||
</header>
|
||||
<nav role="menubar">
|
||||
<ul>
|
||||
<li class="mobile-aside-toggle" style="display:none;">
|
||||
<a href="#">
|
||||
<i class="icons icon-list"></i>
|
||||
</a>
|
||||
</li>
|
||||
{{if $nav.home}}
|
||||
<li role="menuitem" id="nav-home-link" class="nav-menu {{$sel.home}}">
|
||||
<a accesskey="p" class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" >{{$nav.home.1}}</a>
|
||||
|
|
|
|||
|
|
@ -86,6 +86,14 @@ function cmtBbOpen(id) {
|
|||
function cmtBbClose(id) {
|
||||
$("#comment-edit-bb-" + id).hide();
|
||||
}
|
||||
|
||||
$(document).ready(function() {
|
||||
$(".mobile-aside-toggle a").click(function(e){
|
||||
e.preventDefault();
|
||||
$("aside").toggleClass("show");
|
||||
});
|
||||
});
|
||||
|
||||
</script>
|
||||
EOT;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue