diff options
| author | Thomas Willingham <beardyunixer@beardyunixer.com> | 2014-09-15 17:10:11 +0100 |
|---|---|---|
| committer | Thomas Willingham <beardyunixer@beardyunixer.com> | 2014-09-15 17:10:11 +0100 |
| commit | 68ecc673b109be50dc04cf72af8ce2296c70b86b (patch) | |
| tree | 0ecaa24425d2f69528ad99763d929cccd677d148 /view | |
| parent | e3b967f475e8933567ba7d80dacb6d496224fe55 (diff) | |
| parent | eaf3bd3326a657662321df791280b41293f54ef2 (diff) | |
| download | volse-hubzilla-68ecc673b109be50dc04cf72af8ce2296c70b86b.tar.gz volse-hubzilla-68ecc673b109be50dc04cf72af8ce2296c70b86b.tar.bz2 volse-hubzilla-68ecc673b109be50dc04cf72af8ce2296c70b86b.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'view')
| -rw-r--r-- | view/js/main.js | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 24 |
2 files changed, 19 insertions, 7 deletions
diff --git a/view/js/main.js b/view/js/main.js index d0fcf0077..d6b405258 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -713,7 +713,7 @@ function updateConvItems(mode,data) { 'lt100': '-2', 'lt240': '-2', 'lt320': '-2', - 'lt500': '-0', + 'lt500': '-1', 'lt640': '-1', 'lt1024': '-0' } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index bb11ddbb9..380d6d49c 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2060,11 +2060,11 @@ img.mail-list-sender-photo { .wall-item-ago { color: #777; - font-size: 0.8em; + font-size: 0.833em; } .wall-item-ago i { - font-size: 0.8em; + font-size: 0.833em; } .wall-item-content { @@ -2082,7 +2082,7 @@ img.mail-list-sender-photo { } .comment-icon { - font-size: 0.8em; + font-size: 0.833em; color: $toolicon_colour; } @@ -2256,15 +2256,27 @@ blockquote { } h1, h2 { - font-size: 1.15rem; + font-size: 1.583em; } h3, h4 { - font-size: $font_size; + font-size: 1.334em; } h5, h6 { - font-size: $body_font_size; + font-size: 0.75rem; +} + +.wall-item-content h1, .wall-item-content h2 { + font-size: 1.319em; +} + +.wall-item-title { + font-size: $font_size; +} + +.wall-item-title h3, .wall-item-content h3, .wall-item-content h4 { + font-size: 1.112em; } .dropdown-menu { |