diff options
| author | friendica <info@friendica.com> | 2014-09-15 13:39:41 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-09-15 13:39:41 -0700 |
| commit | c841714ba5d0df349e0f9d972fafa18a72fc4f1e (patch) | |
| tree | 392e96df448b09ed06955ed32505b82898cf4139 | |
| parent | 5ea6f27792f378fe21306ce8caef6b86911c3f6f (diff) | |
| parent | eaf3bd3326a657662321df791280b41293f54ef2 (diff) | |
| download | volse-hubzilla-c841714ba5d0df349e0f9d972fafa18a72fc4f1e.tar.gz volse-hubzilla-c841714ba5d0df349e0f9d972fafa18a72fc4f1e.tar.bz2 volse-hubzilla-c841714ba5d0df349e0f9d972fafa18a72fc4f1e.zip | |
Merge https://github.com/friendica/red into pending_merge
| -rw-r--r-- | doc/main.bb | 4 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 24 |
2 files changed, 20 insertions, 8 deletions
diff --git a/doc/main.bb b/doc/main.bb index e0cca3d31..9baeeebda 100644 --- a/doc/main.bb +++ b/doc/main.bb @@ -49,8 +49,8 @@ Zot is the great new communicaton protocol invented especially for the Red Matri [zrl=[baseurl]/help/faq_admins]FAQ For Admins[/zrl]
[size=large][b]Technical Documentation[/b][/size]
-[zrl=[baseurl]/help/Zot---A-High-Level-Overview.md[/zrl]A high level overview of Zot[/zrl]
-[zrl=[baseurl]/help/zot]An introduction to Zot/zrl]
+[zrl=[baseurl]/help/Zot---A-High-Level-Overview]A high level overview of Zot[/zrl]
+[zrl=[baseurl]/help/zot]An introduction to Zot[/zrl]
[zrl=[baseurl]/help/zot_structures]Zot Stuctures[/zrl]
[zrl=[baseurl]/help/comanche]Comanche Page Descriptions[/zrl]
[zrl=[baseurl]/help/Creating-Templates]Creating Comanche Templates[/zrl]
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 7c203d475..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: 1rem; + font-size: 1.334em; } h5, h6 { - font-size: 0.75rem; + 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 { |