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

Merge https://github.com/friendica/red into pending_merge

Browse Source
This commit is contained in:
friendica 2014-09-15 13:39:41 -07:00
commit c841714ba5
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/main.bb
View File

@ -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] [zrl=[baseurl]/help/faq_admins]FAQ For Admins[/zrl]
[size=large][b]Technical Documentation[/b][/size] [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---A-High-Level-Overview]A high level overview of Zot[/zrl]
[zrl=[baseurl]/help/zot]An introduction to Zot/zrl] [zrl=[baseurl]/help/zot]An introduction to Zot[/zrl]
[zrl=[baseurl]/help/zot_structures]Zot Stuctures[/zrl] [zrl=[baseurl]/help/zot_structures]Zot Stuctures[/zrl]
[zrl=[baseurl]/help/comanche]Comanche Page Descriptions[/zrl] [zrl=[baseurl]/help/comanche]Comanche Page Descriptions[/zrl]
[zrl=[baseurl]/help/Creating-Templates]Creating Comanche Templates[/zrl] [zrl=[baseurl]/help/Creating-Templates]Creating Comanche Templates[/zrl]

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

@ -2060,11 +2060,11 @@ img.mail-list-sender-photo {
.wall-item-ago { .wall-item-ago {
color: #777; color: #777;
font-size: 0.8em; font-size: 0.833em;
} }
.wall-item-ago i { .wall-item-ago i {
font-size: 0.8em; font-size: 0.833em;
} }
.wall-item-content { .wall-item-content {
@ -2082,7 +2082,7 @@ img.mail-list-sender-photo {
} }
.comment-icon { .comment-icon {
font-size: 0.8em; font-size: 0.833em;
color: $toolicon_colour; color: $toolicon_colour;
} }
@ -2256,17 +2256,29 @@ blockquote {
} }
h1, h2 { h1, h2 {
font-size: 1.15rem; font-size: 1.583em;
} }
h3, h4 { h3, h4 {
font-size: 1rem; font-size: 1.334em;
} }
h5, h6 { 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 { .dropdown-menu {
font-size: $body_font_size; font-size: $body_font_size;
border-radius: $radiuspx; border-radius: $radiuspx;