aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-04-05 17:14:11 -0700
committerzotlabs <mike@macgirvin.com>2017-04-05 17:14:11 -0700
commit6710a77c26b9f5d621ad839cadeefb08fa066aa2 (patch)
tree8253b2f4bbf5484f45f81a762c7aad61073bc45c /view/theme
parenta4685e6df38dd530b348268f383f59a993607cad (diff)
parenta4f6c24273f5ba321b7255ec228f677483fd3fa3 (diff)
downloadvolse-hubzilla-6710a77c26b9f5d621ad839cadeefb08fa066aa2.tar.gz
volse-hubzilla-6710a77c26b9f5d621ad839cadeefb08fa066aa2.tar.bz2
volse-hubzilla-6710a77c26b9f5d621ad839cadeefb08fa066aa2.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'view/theme')
-rw-r--r--view/theme/redbasic/css/style.css2
-rw-r--r--view/theme/redbasic/js/redbasic.js7
-rw-r--r--view/theme/redbasic/php/config.php2
-rw-r--r--view/theme/redbasic/php/style.php2
4 files changed, 3 insertions, 10 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 1e8d18269..8853a56c3 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -865,7 +865,7 @@ a .generic-icons:hover {
.generic-icons-nav {
- font-size: 1.2em;
+ font-size: 1rem;
margin-right: 7px;
}
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index fb048518e..14b977b80 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -3,13 +3,6 @@
*/
$(document).ready(function() {
- //this is a hotfix to make collapsible bs panels work again. this needs fixing in bootstrap.
- $('a').on('click', function(e) {
- if($(this).data('toggle') == 'collapse') {
- e.preventDefault();
- }
- });
-
// CSS3 calc() fallback (for unsupported browsers)
$('body').append('<div id="css3-calc" style="width: 10px; width: calc(10px + 10px); display: none;"></div>');
if( $('#css3-calc').width() == 10) {
diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php
index 042a495e5..752a02a6a 100644
--- a/view/theme/redbasic/php/config.php
+++ b/view/theme/redbasic/php/config.php
@@ -96,7 +96,7 @@ class RedbasicConfig {
'$background_image' => array('redbasic_background_image', t('Set the background image'), $arr['background_image']),
'$item_colour' => array('redbasic_item_colour', t('Set the background color of items'), $arr['item_colour']),
'$comment_item_colour' => array('redbasic_comment_item_colour', t('Set the background color of comments'), $arr['comment_item_colour']),
- '$font_size' => array('redbasic_font_size', t('Set font-size for the entire application'), $arr['font_size'], t('Examples: 87.5%, 14px')),
+ '$font_size' => array('redbasic_font_size', t('Set font-size for the entire application'), $arr['font_size'], t('Examples: 1rem, 100%, 16px')),
'$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'], t('Example: 4px')),
'$shadow' => array('redbasic_shadow', t('Set shadow depth of photos'), $arr['shadow']),
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index ab760fdc1..a666f96f2 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -95,7 +95,7 @@ if (! $comment_item_colour)
if (! $item_opacity)
$item_opacity = '1';
if (! $font_size)
- $font_size = '1rem';
+ $font_size = '0.875rem';
if (! $font_colour)
$font_colour = '#4d4d4d';
if (! $radius)