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

Merge branch '2.0RC' of https://github.com/redmatrix/hubzilla into 2.0RC_merge

Browse Source
This commit is contained in:
zotlabs 2016-12-20 15:12:22 -08:00
commit 193705a08a
5 changed files with 39 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/admin/administrator_guide.md
View File

@ -109,9 +109,9 @@ PHP might differ from the _webserver_ version
* Installation into a top-level domain or sub-domain (without a
directory/path component in the URL) is REQUIRED.
# Manual Installation #
### Manual Installation
#### Unpack the $Projectname files into the root of your web server document area ###
#### Unpack the $Projectname files into the root of your web server document area
If you copy the directory tree to your webserver, make sure that you include the
hidden files like .htaccess.
@ -342,4 +342,4 @@ To immediately clear out all the extra logging stuff you added. Use the informa
1. Enable the **logrot** addon in the official [hubzilla-addons](https://github.com/redmatrix/hubzilla-addons) repo
1. Create a directory in your web root called `log` with webserver write permissions
1. Go to the **logrot** admin settings and enter this folder name as well as the max size and number of retained log files.
1. Go to the **logrot** admin settings and enter this folder name as well as the max size and number of retained log files.

27
doc/toc.html
View File

@ -7,11 +7,19 @@
margin: 3px 0px 10px 10px;
}
#doco-content h1 {
border-bottom: #cccccc thin solid;
#doco-content h3 {
border-bottom: #ccc 3px solid;
padding-bottom: 0.3em;
}
#doco-content h4 {
text-decoration: underline;
}
#doco-content h5 {
text-decoration: underline;
}
#region_1 .widget ul ul {
list-style-type: none;
}
@ -26,8 +34,7 @@
<div class="panel">
<div class="">
<h3 class="panel-title">
<a data-toggle="collapse" data-parent="#accordion" href="#about">
About</a>
About
</h3>
</div>
<div id="about" class="panel-collapse collapse in">
@ -40,8 +47,7 @@
<div class="panel">
<div class="">
<h3 class="panel-title">
<a data-toggle="collapse" data-parent="#accordion" href="#members">
Members</a>
Members
</h3>
</div>
<div id="members" class="panel-collapse collapse in">
@ -54,8 +60,7 @@
<div class="panel">
<div class="">
<h3 class="panel-title">
<a data-toggle="collapse" data-parent="#accordion" href="#administrators">
Administrators</a>
Administrators
</h3>
</div>
<div id="administrators" class="panel-collapse collapse in">
@ -68,8 +73,7 @@
<div class="panel">
<div class="">
<h3 class="panel-title">
<a data-toggle="collapse" data-parent="#accordion" href="#developers">
Developers</a>
Developers
</h3>
</div>
<div id="developers" class="panel-collapse collapse in">
@ -82,8 +86,7 @@
<div class="panel">
<div class="">
<h3 class="panel-title">
<a data-toggle="collapse" data-parent="#accordion" href="#tutorials">
Tutorials</a>
Tutorials
</h3>
</div>
<div id="tutorials" class="panel-collapse collapse in">

2
view/js/main.js
View File

@ -674,6 +674,8 @@ function updateConvItems(mode,data) {
$('.item_' + bParam_mid.substring(0,32)).addClass('item-highlight');
}
$(document.body).trigger("sticky_kit:recalc");
}
function collapseHeight() {

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

@ -42,18 +42,32 @@ main {
max-width: $main_widthpx;
}
h1, .h1, h2, .h2 {
h1, .h1 {
font-size: 2em;
}
h2, .h2 {
font-size: 1.667em;
}
h3, .h3, h4, .h4 {
h3, .h3 {
font-size: 1.334em;
}
h5, .h5, h6, .h6 {
font-size: 0.75rem;
h4, .h4 {
font-size: 1em;
font-weight: bold;
}
h5, .h5 {
font-size: 1em;
}
h6, .h6 {
font-size: 0.75em;
}
.jslider {
font-family: sans-serif, arial, freesans;
}

2
view/tpl/help.tpl
View File

@ -3,7 +3,7 @@
<h2>{{$title}}: {{$heading}}</h2>
</div>
<div class="section-content-wrapper" id="doco-content">
<h3 class="fakelink" id="doco-top-toc-heading"><span onclick="docoTocToggle(); return false;">
<h3 id="doco-top-toc-heading"><span class="fakelink" onclick="docoTocToggle(); return false;">
<i class="fakelink fa fa-caret-right" id="doco-toc-toggle"></i>
{{$tocHeading}}
</span></h3>