github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-03 22:14:37 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

clean up topic summary / map CSS a bit

Browse Source
This commit is contained in:
Jeff Atwood 2015-05-22 01:28:34 -07:00
parent 83e404fce9
commit 9e74f232e0
2 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/stylesheets/desktop/topic-post.scss
View File

@ -314,6 +314,7 @@ a.star {
margin: 20px 0 0 0; margin: 20px 0 0 0;
background: dark-light-diff($primary, $secondary, 97%, -45%); background: dark-light-diff($primary, $secondary, 97%, -45%);
border: 1px solid dark-light-diff($primary, $secondary, 90%, -65%); border: 1px solid dark-light-diff($primary, $secondary, 90%, -65%);
border-top: none; // would cause double top border
section { section {
border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -65%); border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -65%);
@ -324,6 +325,7 @@ a.star {
color: scale-color($primary, $lightness: 20%); color: scale-color($primary, $lightness: 20%);
line-height: 23px; line-height: 23px;
font-weight: normal; font-weight: normal;
font-size: 1em;
} }
h4 { h4 {
@ -419,10 +421,8 @@ a.star {
background: dark-light-diff($primary, $secondary, 97%, -45%); background: dark-light-diff($primary, $secondary, 97%, -45%);
border-left: 1px solid dark-light-diff($primary, $secondary, 90%, -65%); border-left: 1px solid dark-light-diff($primary, $secondary, 90%, -65%);
&:hover { &:hover {
background: dark-light-diff($primary, $secondary, 65%, -85%);
color: $primary; color: $primary;
border: none !important; background: dark-light-diff($primary, $secondary, 90%, -65%);
span.badge-posts {color: $primary;}
} }
&.collapsed { &.collapsed {

22
app/assets/stylesheets/mobile/topic-post.scss
View File

@ -154,18 +154,21 @@ a.star {
.topic-map { .topic-map {
margin: 10px; margin: 10px;
background: scale-color(scale-color-diff(), $lightness: 40%); background: dark-light-diff($primary, $secondary, 97%, -45%);
border: 1px solid dark-light-diff($primary, $secondary, 90%, -65%);
border-top: none; // would cause double top border
h3 { h3 {
margin-bottom: 4px; margin-bottom: 4px;
color: scale-color($primary, $lightness: 50%); color: scale-color($primary, $lightness: 20%);
line-height: 23px; line-height: 23px;
font-weight: normal; font-weight: normal;
font-size: 1em;
} }
h4 { h4 {
margin: 0 0 3px 0; margin: 0 0 3px 0;
color: $primary; color: scale-color($primary, $lightness: 50%);
font-weight: normal; font-weight: normal;
font-size: 0.857em; font-size: 0.857em;
line-height: 15px; line-height: 15px;
@ -199,14 +202,10 @@ a.star {
} }
} }
/* in expanded avatar view, limit to one line for now */
.avatars.clearfix { .avatars.clearfix {
height:40px;
overflow:hidden;
margin-left: 10px; margin-left: 10px;
} }
.avatar { .avatar {
float: left; float: left;
margin-right: 4px; margin-right: 4px;
@ -269,16 +268,13 @@ a.star {
float: right; float: right;
.btn { .btn {
border: 0; border: 0;
border-bottom: 1px solid scale-color-diff();
border-left: 1px solid scale-color-diff();
padding: 0 15px; padding: 0 15px;
color: $primary; color: $primary;
background: scale-color-diff(); background: dark-light-diff($primary, $secondary, 97%, -45%);
border-left: 1px solid dark-light-diff($primary, $secondary, 90%, -65%);
&:hover { &:hover {
background: scale-color($primary, $lightness: 75%);
color: $primary; color: $primary;
border-bottom: 1px solid scale-color-diff(); background: dark-light-diff($primary, $secondary, 90%, -65%);
} }
.fa { .fa {
margin: 0; margin: 0;