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

fixing classes

Browse Source
This commit is contained in:
Mario Vavti 2017-03-10 17:02:55 +01:00
parent b1c97dfcfd
commit 0f9ddbf3b2
24 changed files with 73 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
view/css/bootstrap-red.css vendored
View File

@ -10,6 +10,10 @@ nav .badge {
}
.nav-item.nav-item-hack {
height: 1.9rem;
}
#navbar-collapse-1 i {
font-size: 1rem;
}
@ -17,11 +21,6 @@ nav .badge {
/* nav overrides end */
aside .nav-pills > li > a,
.response-list .nav-pills > li > a {
padding: 6px 10px;
}
nav .dropdown-menu {
max-height: 70vh;
overflow: auto;

21
view/css/widgets.css
View File

@ -20,34 +20,15 @@
.widget-nav-pills-icons {
opacity: 0;
padding: 6px 10px;
float: right;
position: relative;
z-index:1;
}
.widget-nav-pills-checkbox {
padding: 6px 10px;
padding: 0.6rem 1.4rem;
float: right;
position: relative;
z-index:1;
cursor: pointer;
}
i.widget-nav-pills-icons,
i.widget-nav-pills-checkbox {
margin-top: 2px;
}
.widget-nav-pills-icons:hover + a {
background-color: #eee;
}
.widget-nav-pills-checkbox:hover + a {
background-color: #eee;
}
li:hover .widget-nav-pills-icons {
opacity: 1;
}

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

@ -1169,9 +1169,15 @@ margin-right: 50px;
}
.generic-icons {
font-size: 1.2em;
font-size: 1rem;
color: $toolicon_colour;
margin-right: 7px;
margin-right: 0.5rem;
}
.generic-icons-right {
font-size: 1rem;
color: $toolicon_colour;
margin-left: 0.5rem;
}
.generic-icons:hover {
@ -1476,6 +1482,11 @@ img.mail-conv-sender-photo {
color: $toolicon_colour;
}
.widget .nav-item:hover {
background-color: #eee;
border-radius: $radiuspx;
}
#note-text {
border: 1px solid #ccc;
border-radius: $radiuspx;
@ -2063,17 +2074,6 @@ dl.bb-dl > dd > li {
border-left: 3px solid #eee;
}
.nav-pills-stacked-icons {
padding: 6px 10px;
float: right;
position: relative;
z-index:1;
}
.nav-pills-stacked-icons:hover + a {
background-color: #eee;
}
.app-icon {
font-size: 80px;
color: $toolicon_colour;

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

@ -102,7 +102,7 @@ if (! $nav_icon_colour)
if (! $nav_active_icon_colour)
$nav_active_icon_colour = "#fff";
if (! $link_colour)
$link_colour = "#337AB7";
$link_colour = "#0275d8";
if (! $banner_colour)
$banner_colour = "#fff";
if (! $bgcolour)

2
view/tpl/abook_edit.tpl
View File

@ -4,7 +4,7 @@
<div class="pull-right">
<div class="btn-group">
<button id="connection-dropdown" class="btn btn-outline-secondary btn-sm dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="fa fa-caret-down"></i>&nbsp;{{$tools_label}}
<i class="fa fa-cog"></i>&nbsp;{{$tools_label}}
</button>
<ul class="dropdown-menu dropdown-menu-right" aria-labelledby="dLabel">
<li><a href="{{$tools.view.url}}" title="{{$tools.view.title}}">{{$tools.view.label}}</a></li>

2
view/tpl/conv_item.tpl
View File

@ -139,7 +139,7 @@
</div>
{{/if}}
<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-menu-{{$item.id}}">
<i class="fa fa-caret-down"></i>
<i class="fa fa-cog"></i>
</button>
<ul class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="wall-item-menu-{{$item.id}}">
{{if $item.share}}

2
view/tpl/conv_list.tpl
View File

@ -113,7 +113,7 @@
{{/if}}
<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="wall-item-menu-{{$item.id}}">
<i class="fa fa-caret-down"></i>
<i class="fa fa-cog"></i>
</button>
<ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-menu-{{$item.id}}">
{{if $item.share}}

2
view/tpl/events-js.tpl
View File

@ -2,7 +2,7 @@
<div class="section-title-wrapper">
<div class="pull-right">
<div class="dropdown">
<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-caret-down"></i>&nbsp;{{$view_label}}</button>
<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-cog"></i>&nbsp;{{$view_label}}</button>
<ul class="dropdown-menu">
<li><a href="#" onclick="changeView('changeView', 'month'); return false;">{{$month}}</a></li>
<li><a href="#" onclick="changeView('changeView', 'agendaWeek'); return false;">{{$week}}</a></li>

4
view/tpl/generic_links_widget.tpl
View File

@ -2,9 +2,9 @@
{{if $title}}<h3>{{$title}}</h3>{{/if}}
{{if $desc}}<div class="desc">{{$desc}}</div>{{/if}}
<ul class="nav nav-pills nav-stacked">
<ul class="nav nav-pills flex-column">
{{foreach $items as $item}}
<li><a href="{{$item.url}}" class="{{if $item.selected}}active{{/if}}">{{$item.label}}</a></li>
<li class="nav-item"><a href="{{$item.url}}" class="nav-link{{if $item.selected}} active{{/if}}">{{$item.label}}</a></li>
{{/foreach}}
</ul>

14
view/tpl/group_side.tpl
View File

@ -1,20 +1,20 @@
<div class="widget" id="group-sidebar">
<h3>{{$title}}</h3>
<div>
<ul class="nav nav-pills nav-stacked">
<ul class="nav nav-pills flex-column">
{{foreach $groups as $group}}
<li>
<li class="nav-item nav-item-hack">
{{if $group.cid}}
<i id="group-{{$group.id}}" class="widget-nav-pills-checkbox fa {{if $group.ismember}}fa-check-square-o{{else}}fa-square-o{{/if}}" onclick="contactgroupChangeMember('{{$group.id}}','{{$group.enc_cid}}'); return true;"></i>
<i id="group-{{$group.id}}" class="widget-nav-pills-checkbox fa fa-fw {{if $group.ismember}}fa-check-square-o{{else}}fa-square-o{{/if}}" onclick="contactgroupChangeMember('{{$group.id}}','{{$group.enc_cid}}'); return true;"></i>
{{/if}}
{{if $group.edit}}
<a href="{{$group.edit.href}}" class="widget-nav-pills-icons" title="{{$edittext}}"><i class="fa fa-pencil"></i></a>
<a href="{{$group.edit.href}}" class="nav-link{{if $group.selected}} active{{/if}} widget-nav-pills-icons" title="{{$edittext}}"><i class="fa fa-fw fa-pencil"></i></a>
{{/if}}
<a{{if $group.selected}} class="group-selected"{{/if}} href="{{$group.href}}">{{$group.text}}</a>
<a class="nav-link{{if $group.selected}} active{{/if}}" href="{{$group.href}}">{{$group.text}}</a>
</li>
{{/foreach}}
<li>
<a href="group/new" title="{{$createtext}}" ><i class="fa fa-plus-circle"></i> {{$createtext}}</a>
<li class="nav-item">
<a class="nav-link" href="group/new" title="{{$createtext}}" ><i class="fa fa-plus-circle"></i> {{$createtext}}</a>
</li>
</ul>

4
view/tpl/help.tpl
View File

@ -22,9 +22,9 @@
function docoTocToggle() {
if($('#doco-top-toc').is(':visible')) {
$('#doco-toc-toggle').removeClass('fa-caret-down').addClass('fa-caret-right');
$('#doco-toc-toggle').removeClass('fa-cog').addClass('fa-caret-right');
} else {
$('#doco-toc-toggle').removeClass('fa-caret-right').addClass('fa-caret-down');
$('#doco-toc-toggle').removeClass('fa-caret-right').addClass('fa-cog');
}
$('#doco-top-toc').toggle();

2
view/tpl/jot.tpl
View File

@ -128,7 +128,7 @@
{{if $writefiles || $weblink || $setloc || $clearloc || $feature_expire || $feature_encrypt || $feature_voting}}
<div class="btn-group visible-xs visible-sm">
<button type="button" id="more-tools" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
<i id="more-tools-icon" class="fa fa-caret-down jot-icons"></i>
<i id="more-tools-icon" class="fa fa-cog jot-icons"></i>
</button>
<ul class="dropdown-menu" role="menu">
{{if $visitor}}

2
view/tpl/mail_conv.tpl
View File

@ -21,7 +21,7 @@
{{/if}}
<div class="pull-right dropdown">
<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="mail-item-menu-{{$mail.id}}">
<i class="fa fa-caret-down"></i>
<i class="fa fa-cog"></i>
</button>
<ul class="dropdown-menu" role="menu" aria-labelledby="mail-item-menu-{{$mail.id}}">
{{if $mail.can_recall}}

2
view/tpl/mail_head.tpl
View File

@ -1,6 +1,6 @@
<div class="widget">
<h3>{{$header}}</h3>
<ul class="nav nav-pills nav-stacked">
<ul class="nav nav-pills flex-column">
{{foreach $messages as $message}}
{{include file="mail_list.tpl"}}
{{/foreach}}

4
view/tpl/mail_list.tpl
View File

@ -1,5 +1,5 @@
<li>
<a href="mail/{{$message.mailbox}}/{{$message.id}}" class="{{if $message.selected}}active{{/if}}">
<li class="nav-item">
<a href="mail/{{$message.mailbox}}/{{$message.id}}" class="nav-link{{if $message.selected}} active{{/if}}">
<span class="{{if $message.seen}}seen{{else}}unseen{{/if}}">{{$message.subject}}</span><br>
<span class="conv-participants">{{$message.from_name}} > {{$message.to_name}}</span><br>
<span class="wall-item-ago autotime" title="{{$message.date}}">{{$message.date}}</span>

10
view/tpl/message_side.tpl
View File

@ -1,9 +1,9 @@
<div class="widget">
<h3>{{$title}}</h3>
<ul class="nav nav-pills nav-stacked">
<li><a href="{{$combined.url}}"{{if $combined.sel}} class="active"{{/if}}>{{$combined.label}}</a></li>
<li><a href="{{$inbox.url}}"{{if $inbox.sel}} class="active"{{/if}}>{{$inbox.label}}</a></li>
<li><a href="{{$outbox.url}}"{{if $outbox.sel}} class="active"{{/if}}>{{$outbox.label}}</a></li>
<li><a href="{{$new.url}}"{{if $new.sel}} class="active"{{/if}}>{{$new.label}}</a></li>
<ul class="nav nav-pills flex-column">
<li class="nav-item"><a href="{{$combined.url}}" class="nav-link{{if $combined.sel}} active{{/if}}">{{$combined.label}}</a></li>
<li class="nav-item"><a href="{{$inbox.url}}" class="nav-link{{if $inbox.sel}} active{{/if}}">{{$inbox.label}}</a></li>
<li class="nav-item"><a href="{{$outbox.url}}" class="nav-link{{if $outbox.sel}} active{{/if}}">{{$outbox.label}}</a></li>
<li class="nav-item"><a href="{{$new.url}}" class="nav-link{{if $new.sel}} active{{/if}}">{{$new.label}}</a></li>
</ul>
</div>

2
view/tpl/nav.tpl
View File

@ -75,7 +75,7 @@
{{/if}}
</div>
{{/if}}
<div class="collapse navbar-collapse " id="navbar-collapse-1">
<div class="collapse navbar-collapse" id="navbar-collapse-1">
<ul class="navbar-nav mr-auto">
{{if $nav.network}}
<li class="nav-item dropdown net-button" style="display: none;">

10
view/tpl/peoplefind.tpl
View File

@ -8,10 +8,10 @@
</div>
</div>
</form>
<ul class="nav nav-pills nav-stacked">
{{if $similar}}<li><a href="match" >{{$similar}}</a></li>{{/if}}
{{if $loggedin}}<li><a href="directory?suggest=1" >{{$suggest}}</a></li>{{/if}}
<li><a href="randprof" >{{$random}}</a></li>
{{if $loggedin}}{{if $inv}}<li><a href="invite" >{{$inv}}</a></li>{{/if}}{{/if}}
<ul class="nav nav-pills flex-column">
{{if $similar}}<li class="nav-item"><a class="nav-link" href="match" >{{$similar}}</a></li>{{/if}}
{{if $loggedin}}<li class="nav-item"><a class="nav-link" href="directory?suggest=1" >{{$suggest}}</a></li>{{/if}}
<li class="nav-item"><a class="nav-link" href="randprof" >{{$random}}</a></li>
{{if $loggedin}}{{if $inv}}<li class="nav-item"><a class="nav-link" href="invite" >{{$inv}}</a></li>{{/if}}{{/if}}
</ul>
</div>

2
view/tpl/photo_view.tpl
View File

@ -5,7 +5,7 @@
{{if $tools || $map || $edit}}
<div class="btn-group">
<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-caret-down"></i>&nbsp;{{$tools_label}}
<i class="fa fa-cog"></i>&nbsp;{{$tools_label}}
</button>
<ul class="dropdown-menu dropdown-menu-right">
{{if $tools}}

6
view/tpl/posted_date_widget.tpl
View File

@ -3,12 +3,12 @@
function toggle_posted_date_button() {
if($('#posted-date-dropdown').is(':visible')) {
$('#posted-date-icon').removeClass('fa-caret-up');
$('#posted-date-icon').addClass('fa-caret-down');
$('#posted-date-icon').addClass('fa-cog');
$('#posted-date-dropdown').hide();
}
else {
$('#posted-date-icon').addClass('fa-caret-up');
$('#posted-date-icon').removeClass('fa-caret-down');
$('#posted-date-icon').removeClass('fa-cog');
$('#posted-date-dropdown').show();
}
}
@ -40,7 +40,7 @@ function toggle_posted_date_button() {
{{/foreach}}
{{if $cutoff}}
</div>
<button class="btn btn-outline-secondary btn-sm" onclick="toggle_posted_date_button(); return false;"><i id="posted-date-icon" class="fa fa-caret-down"></i></button>
<button class="btn btn-outline-secondary btn-sm" onclick="toggle_posted_date_button(); return false;"><i id="posted-date-icon" class="fa fa-cog"></i></button>
{{/if}}
</ul>
</div>

2
view/tpl/profile_edit.tpl
View File

@ -2,7 +2,7 @@
<div class="section-title-wrapper">
<div class="dropdown pull-right" id="profile-edit-links">
<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="fa fa-caret-down"></i>&nbsp;{{$tools_label}}
<i class="fa fa-cog"></i>&nbsp;{{$tools_label}}
</button>
<ul class="dropdown-menu">
<li class="nav-item">

2
view/tpl/prv_message.tpl
View File

@ -77,7 +77,7 @@
{{/if}}
<div class="btn-group visible-xs visible-sm">
<button type="button" id="more-tools" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
<i id="more-tools-icon" class="fa fa-caret-down jot-icons"></i>
<i id="more-tools-icon" class="fa fa-cog jot-icons"></i>
</button>
<ul class="dropdown-menu dropdown-menu-right" role="menu">
<li class="visible-xs"><a href="#" id="prvmail-attach-sub"><i class="fa fa-paperclip"></i>&nbsp;{{$attach}}</a></li>

2
view/tpl/search_item.tpl
View File

@ -71,7 +71,7 @@
<div class="wall-item-tools">
<div class="wall-item-tools-right btn-group pull-right">
<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-caret-down"></i>
<i class="fa fa-cog"></i>
</button>
<ul class="dropdown-menu">
{{if $item.thread_action_menu}}

2
view/tpl/wiki.tpl
View File

@ -4,7 +4,7 @@
{{if $showPageControls}}
<div id="page-tools" class="btn-group" style="display: none;">
<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-caret-down"></i>&nbsp;{{$tools_label}}
<i class="fa fa-cog"></i>&nbsp;{{$tools_label}}
</button>
<ul class="dropdown-menu dropdown-menu-right">
{{if $renamePage}}