1
0
mirror of https://github.com/flarum/core.git synced 2025-07-31 13:40:20 +02:00

Merge branch 'master' into compact-posts

This commit is contained in:
Toby Zerner
2015-09-15 11:27:49 +09:30
55 changed files with 1465 additions and 461 deletions

View File

@@ -45,7 +45,7 @@
text-overflow: ellipsis;
.read & {
color: mix(@heading-color, @body-bg, 60%);
color: mix(@heading-color, @body-bg, 55%);
}
.unread & {
font-weight: 600;
@@ -59,6 +59,12 @@
> li {
display: inline;
opacity: 0.7;
.transition(opacity 0.2s);
.DiscussionListItem:hover &, .DiscussionListItem.active & {
opacity: 1;
}
}
.username {
font-weight: bold;

View File

@@ -0,0 +1,11 @@
.LogInButton {
&:extend(.Button--block);
}
.LogInButtons {
width: 200px;
margin: 0 auto 20px;
.LogInButton {
margin-bottom: 5px;
}
}

View File

@@ -139,7 +139,7 @@
font-size: 100%;
font-weight: bold;
}
img {
img, iframe {
max-width: 100%;
}
}

View File

@@ -126,6 +126,9 @@
& .icon {
font-size: 14px;
}
&.online .fa-circle {
color: @online-user-circle-color;
}
&.online .icon {
font-size: 12px;
}

View File

@@ -10,6 +10,7 @@
@import "EditUserModal.less";
@import "Hero.less";
@import "IndexPage.less";
@import "LogInButton.less";
@import "LogInModal.less";
@import "NotificationGrid.less";
@import "NotificationList.less";

View File

@@ -27,8 +27,7 @@
&[disabled],
&[readonly],
fieldset[disabled] & {
// background-color: @input-bg-disabled;
opacity: 1; // iOS fix for unreadable disabled content; see https://github.com/twbs/bootstrap/issues/11655
opacity: 0.5;
}
&[disabled],

View File

@@ -27,7 +27,7 @@
@text-color: #111;
@link-color: saturate(@primary-color, 10%);
@heading-color: @text-color;
@muted-color: hsl(@secondary-hue, min(25%, @secondary-sat), 60%);
@muted-color: hsl(@secondary-hue, min(25%, @secondary-sat), 55%);
@muted-more-color: #aaa;
@shadow-color: rgba(0, 0, 0, 0.35);
@@ -130,3 +130,5 @@
@tooltip-bg: rgba(0, 0, 0, 0.9);
@tooltip-color: #fff;
@online-user-circle-color: #7FBA00;