mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-31 13:40:20 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into psr-7

Browse Source 
Conflicts:
	src/Api/Actions/Discussions/IndexAction.php
	src/Api/Actions/SerializeAction.php
	src/Core/Formatter/FormatterManager.php
	src/Extend/ForumAssets.php
	src/Forum/Actions/IndexAction.php
	src/Forum/ForumServiceProvider.php
This commit is contained in:
Franz Liedke
2015-06-17 00:52:50 +02:00
parent a240fbc3ec 8a0cf2dcba
commit 0262f45f57
91 changed files with 1381 additions and 523 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
framework/core/less/forum/index.less
View File

@@ -210,10 +210,9 @@
& .title {
margin: 0 0 6px;
line-height: 1.3;
color: @fl-secondary-color;
color: @fl-body-heading-color;
}
&.unread .title {
color: @fl-body-heading-color;
font-weight: bold;
}
& .info {

4
framework/core/less/lib/variables.less
View File

@@ -21,8 +21,8 @@
@fl-body-secondary-color: hsl(@fl-secondary-hue, min(50%, @fl-secondary-sat), 93%);
@fl-body-bg: #fff;
@fl-body-color: #444;
@fl-body-muted-color: hsl(@fl-secondary-hue, min(25%, @fl-secondary-sat), 66%);
@fl-body-color: #333;
@fl-body-muted-color: hsl(@fl-secondary-hue, min(25%, @fl-secondary-sat), 60%);
@fl-body-muted-more-color: #bbb;
@fl-shadow-color: rgba(0, 0, 0, 0.35);
}