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

Merge pull request #1582 from awesomerobot/master 

continuing default theme simplification/fixes
This commit is contained in:
Sam 2013-10-28 16:51:09 -07:00
parent e52f6e0f6d 0d0a2cb947
commit 5369780556
5 changed files with 89 additions and 59 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;

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

@ -22,7 +22,6 @@ button {
line-height: 18px; line-height: 18px;
text-align: center; text-align: center;
cursor: pointer; cursor: pointer;
@include border-radius-all(4px);
&:active { &:active {
text-shadow: none; text-shadow: none;
} }
@ -45,19 +44,20 @@ button {
// -------------------------------------------------- // --------------------------------------------------
.btn { .btn {
border: 1px solid rgba($black, 0.3); border: none;
color: $btn-default-color; color: #534d4b;
@include linear-gradient($white, $btn-default-background-color); font-weight: normal;
background: #e8e8e8;
&[href] { &[href] {
color: $btn-default-color; color: $btn-default-color;
} }
&:hover, &:hover
&:focus { {
@include linear-gradient($white, $btn-default-background-color-hover); background: #aaa;
@include box-shadow(none); color: #fff;
} }
&:active { &:active {
@include linear-gradient($btn-default-background-color, $white); @include linear-gradient( darken(#aaa, 8%), #aaa);
@include box-shadow(inset 0 1px 3px rgba($black, 0.2)); @include box-shadow(inset 0 1px 3px rgba($black, 0.2));
} }
&[disabled] { &[disabled] {
@ -76,23 +76,29 @@ button {
// -------------------------------------------------- // --------------------------------------------------
.btn-primary { .btn-primary {
border: 1px solid $btn-primary-border-color; border: none;
color: $white; color: $white;
text-shadow: 0 1px 0 rgba($black, 0.2); font-weight: normal;
font-weight: bold;
@include linear-gradient($btn-primary-background-color, $btn-primary-background-color-dark); color: #fff;
@include box-shadow((inset 0 1px 0 rgba($white, 0.33), inset 0 -1px 2px rgba($black, 0.2))); background: $btn-primary-background-color;
&[href] { &[href] {
color: $white; color: $white;
} }
&:hover, &:hover
&:focus { {
@include linear-gradient($btn-primary-background-color, $btn-primary-background-color-light); color: #fff;
@include box-shadow(inset 0 1px 0 rgba($white, 0.33)); 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);
@ -105,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)));
} }
} }

3
app/assets/stylesheets/common/components/navs.css.scss
View File

@ -28,13 +28,12 @@
float: left; float: left;
margin-right: 5px; margin-right: 5px;
> a { > a {
border: 1px solid transparent; border: none;
padding: 5px 12px; padding: 5px 12px;
color: $nav-pills-color; color: $nav-pills-color;
font-size: 16px; font-size: 16px;
line-height: 20px; line-height: 20px;
&:hover { &:hover {
border-color: $nav-pills-border-color-hover;
color: $nav-pills-color-hover; color: $nav-pills-color-hover;
background-color: $nav-pills-background-color-hover; background-color: $nav-pills-background-color-hover;
} }

51
app/assets/stylesheets/desktop/topic-list.scss
View File

@ -16,7 +16,27 @@
.btn { .btn {
float: right; float: right;
margin-left: 8px; margin-left: 8px;
font-size: 16px;
font-weight: normal;
} }
a.badge-category {padding: 3px 12px; font-size: 16px;
&.category-dropdown-button { padding: 3px 10px 3px 8px;
font-size: 14px;
}
}
.badge-category {
font-weight: normal;
text-transform: capitalize;
&.home {padding: 3px 12px;}
}
} }
#category-filter { #category-filter {
@ -36,19 +56,15 @@
// -------------------------------------------------- // --------------------------------------------------
#topic-list { #topic-list {
border: 1px solid #ddd;
width: 100%; width: 100%;
border-collapse: separate; border-collapse: separate;
border-spacing: 0; border-spacing: 0;
border: 1px solid $topic-list-border-color; a.title:visited:not(.badge-notification) {color: #888;}
@include border-radius-all(4px 4px 0 0);
@include box-shadow(0 1px 3px rgba($black, 0.22));
a:visited:not(.badge-notification) {color: #888;}
tbody tr { tbody tr {
background-color: $white;
&:nth-child(even) { &:nth-child(even) {
background-color: darken($white, 2%); background-color: #f8f8f8;
} }
&.archived a { &.archived a {
opacity: 0.6; opacity: 0.6;
@ -83,13 +99,8 @@
color: $topic-list-th-color; color: $topic-list-th-color;
font-weight: bold; font-weight: bold;
font-size: 13px; font-size: 13px;
background: #f6f6f6; background: #eee;
&:first-of-type {
@include border-radius-all(4px 0 0 0);
}
&:last-of-type {
@include border-radius-all(0 4px 0 0);
}
} }
td { td {
//border-top: 1px solid $topic-list-td-border-color; //border-top: 1px solid $topic-list-td-border-color;
@ -285,12 +296,10 @@
float: left; float: left;
} }
> footer { > footer {
border: 1px solid $topic-list-border-color; border: 1px solid #ddd;
border-top: 0; border-top: 0;
padding: 7px 10px; padding: 7px 10px;
background-color: lighten($topic-list-th-background-color, 2%); background-color: lighten($topic-list-th-background-color, 2%);
@include border-radius-all(0 0 4px 4px);
@include box-shadow(0 1px 3px rgba($black, 0.22));
figure { figure {
float: left; float: left;
margin: 3px 7px 0 0; margin: 3px 7px 0 0;
@ -362,7 +371,6 @@
float: left; float: left;
} }
.category-dropdown-button { .category-dropdown-button {
padding: 4px 10px 3px 8px;
border-left: 1px solid rgba(0, 0, 0, 0.15); border-left: 1px solid rgba(0, 0, 0, 0.15);
font-size: 16px; font-size: 16px;
width: 10px; width: 10px;
@ -430,19 +438,20 @@ ol.category-breadcrumb {
position: absolute; position: absolute;
border: 1px solid #ccc; border: 1px solid #ccc;
background-color: white; background-color: white;
width: 200px; max-width: 300px;
min-width: 140px;
height: 200px; height: 200px;
padding: 8px 5px 0 7px; padding: 8px 5px 0 7px;
z-index: 100; z-index: 100;
margin-top: 31px; margin-top: 30px;
.badge-category { .badge-category {
font-size: 13px; font-size: 13px;
line-height: 26px; line-height: 26px;
padding: 0px 8px;
float: none; float: none;
} }
div { div {
margin-bottom: 10px; margin-bottom: 10px;
} }

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;
} }