Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

further simplification over all, changes include: flatter button style, styling admin table, topic-list style

This commit is contained in:
Kris Aubuchon 2013-10-28 13:46:59 -04:00
parent cafc1a088d
commit c016a081f1
3 changed files with 48 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/stylesheets/common/admin/admin_base.scss
View File

@ -4,6 +4,16 @@
@import "common/foundation/helpers"; @import "common/foundation/helpers";
.admin-contents table {
width: 100%;
tr {text-align: left;}
td, th {padding: 8px;}
th {border-top: 1px solid #ddd;}
td {border-bottom: 1px solid #ddd; border-top: 1px solid #ddd;}
}
.content-list li a span.count { .content-list li a span.count {
font-size: 12px; font-size: 12px;
float: right; float: right;

47
app/assets/stylesheets/common/components/buttons.css.scss
View File

@ -47,17 +47,18 @@ button {
border: none; border: none;
color: #534d4b; color: #534d4b;
font-weight: normal; font-weight: normal;
background: #ddd; background: #e8e8e8;
&[href] { &[href] {
color: $btn-default-color; color: $btn-default-color;
} }
&:hover, &:hover
&:focus { {
background: #888; background: #aaa;
color: #fff; color: #fff;
} }
&:active { &:active {
margin-top: 1px; margin-bottom: -1px; @include linear-gradient( darken(#aaa, 8%), #aaa);
@include box-shadow(inset 0 1px 3px rgba($black, 0.2));
} }
&[disabled] { &[disabled] {
@include linear-gradient($white, $btn-default-background-color); @include linear-gradient($white, $btn-default-background-color);
@ -77,10 +78,10 @@ button {
.btn-primary { .btn-primary {
border: none; border: none;
color: $white; color: $white;
font-weight: bold; font-weight: normal;
color: darken(#e4f2f8, 35%); color: #fff;
background: #e4f2f8; background: $btn-primary-background-color;
@ -89,14 +90,15 @@ button {
&[href] { &[href] {
color: $white; color: $white;
} }
&:hover, &:hover
&:focus { {
color: darken(#e4f2f8, 45%); color: #fff;
background: darken(#e4f2f8, 10%); background: darken($btn-primary-background-color, 12%);
} }
&:active { &:active {
@include linear-gradient($btn-primary-background-color-dark, $btn-primary-background-color); @include linear-gradient(darken($btn-primary-background-color, 18%), darken($btn-primary-background-color, 12%));
@include box-shadow(inset 0 1px 3px rgba($black, 0.2)); @include box-shadow(inset 0 1px 3px rgba($black, 0.2));
color: #fff;
} }
&[disabled] { &[disabled] {
text-shadow: 0 1px 0 rgba($black, 0.2); text-shadow: 0 1px 0 rgba($black, 0.2);
@ -109,28 +111,21 @@ button {
// -------------------------------------------------- // --------------------------------------------------
.btn-danger { .btn-danger {
border: 1px solid $btn-danger-border-color;
color: $white; color: $white;
text-shadow: 0 1px 0 rgba($black, 0.2); font-weight: normal;
font-weight: bold; background: $btn-danger-background-color;
@include linear-gradient($btn-danger-background-color, $btn-danger-background-color-dark);
@include box-shadow((inset 0 1px 0 rgba($white, 0.33), inset 0 -1px 2px rgba($black, 0.2)));
&[href] { &[href] {
color: $white; color: $white;
} }
&:hover, &:hover{
&:focus { background: $btn-danger-background-color-dark;
@include linear-gradient($btn-danger-background-color, $btn-danger-background-color-light);
@include box-shadow(inset 0 1px 0 rgba($white, 0.33));
} }
&:active { &:active {
@include linear-gradient($btn-danger-background-color-dark, $btn-danger-background-color); @include linear-gradient($btn-primary-background-color-dark, $btn-primary-background-color);
@include box-shadow(inset 0 1px 3px rgba($black, 0.2)); @include box-shadow(inset 0 1px 3px rgba($black, 0.2));
} }
&[disabled] { &[disabled] {
text-shadow: 0 1px 0 rgba($black, 0.2);
@include linear-gradient($btn-danger-background-color, $btn-danger-background-color-dark);
@include box-shadow((inset 0 1px 0 rgba($white, 0.33), inset 0 -1px 2px rgba($black, 0.2)));
} }
} }

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

@ -1,4 +1,5 @@
@import "common/foundation/variables"; @import "common/foundation/variables";
@import "common/foundation/mixins";
.container { .container {
@ -113,6 +114,12 @@ nav.post-controls {
background: darken(#e4f2f8, 10%); background: darken(#e4f2f8, 10%);
} }
&:active {
@include linear-gradient(darken(#e4f2f8, 15%), darken(#e4f2f8, 10%));
@include box-shadow(inset 0 1px 3px rgba($black, 0.2));
}
} }
@ -137,9 +144,11 @@ nav.post-controls {
} }
&:active {margin-top: 1px; margin-bottom: -1px;}
&:active { &:active {
@include box-shadow(inset 0 1px 3px rgba($black, 0.2));
} }
&.hidden { &.hidden {
display: none; display: none;
@ -344,6 +353,13 @@ a.star {
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
} }
&:active {
@include box-shadow(inset 0 1px 3px rgba($black, 0.2));
}
&.collapsed { &.collapsed {
border-bottom: 0; border-bottom: 0;
padding-bottom: 1px; padding-bottom: 1px;
@ -566,13 +582,10 @@ h1, h2, h3 {margin: 10px 0;}
#show-topic-admin { #show-topic-admin {
color: #7b7b7b;
right: 20px; right: 20px;
padding: 5px 8px; padding: 5px 8px;
margin-top: 5px; margin-top: 5px;
} }