diff options
| author | zotlabs <mike@macgirvin.com> | 2016-12-20 15:12:22 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2016-12-20 15:12:22 -0800 |
| commit | 193705a08aae379542b27ce05e0149fee7d5837d (patch) | |
| tree | dc28817fa021dd535b81b66fb166f7c86134f7c0 /view | |
| parent | b59230067ffefbf055dbabbc010680c7479ad6b0 (diff) | |
| parent | 27b4c17f06091b2bd6786a33480a5facb15b7818 (diff) | |
| download | volse-hubzilla-193705a08aae379542b27ce05e0149fee7d5837d.tar.gz volse-hubzilla-193705a08aae379542b27ce05e0149fee7d5837d.tar.bz2 volse-hubzilla-193705a08aae379542b27ce05e0149fee7d5837d.zip | |
Merge branch '2.0RC' of https://github.com/redmatrix/hubzilla into 2.0RC_merge
Diffstat (limited to 'view')
| -rw-r--r-- | view/js/main.js | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 22 | ||||
| -rw-r--r-- | view/tpl/help.tpl | 2 |
3 files changed, 21 insertions, 5 deletions
diff --git a/view/js/main.js b/view/js/main.js index a405f92f7..a6164e602 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -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() { diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 8a632088f..e0f6b2999 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -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; } diff --git a/view/tpl/help.tpl b/view/tpl/help.tpl index 15d8548a3..494869683 100644 --- a/view/tpl/help.tpl +++ b/view/tpl/help.tpl @@ -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> |