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

some topic-list simplification

This commit is contained in:
Kris Aubuchon 2013-10-28 12:25:52 -04:00
parent 3909f93a7e
commit 1cb7b29b62
3 changed files with 27 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,7 +22,6 @@ button {
line-height: 18px;
text-align: center;
cursor: pointer;
@include border-radius-all(4px);
&:active {
text-shadow: none;
}
@ -45,20 +44,20 @@ button {
// --------------------------------------------------
.btn {
border: 1px solid rgba($black, 0.3);
color: $btn-default-color;
@include linear-gradient($white, $btn-default-background-color);
border: none;
color: #534d4b;
font-weight: normal;
background: #ddd;
&[href] {
color: $btn-default-color;
}
&:hover,
&:focus {
@include linear-gradient($white, $btn-default-background-color-hover);
@include box-shadow(none);
background: #888;
color: #fff;
}
&:active {
@include linear-gradient($btn-default-background-color, $white);
@include box-shadow(inset 0 1px 3px rgba($black, 0.2));
margin-top: 1px; margin-bottom: -1px;
}
&[disabled] {
@include linear-gradient($white, $btn-default-background-color);
@ -76,19 +75,24 @@ button {
// --------------------------------------------------
.btn-primary {
border: 1px solid $btn-primary-border-color;
border: none;
color: $white;
text-shadow: 0 1px 0 rgba($black, 0.2);
font-weight: bold;
@include linear-gradient($btn-primary-background-color, $btn-primary-background-color-dark);
@include box-shadow((inset 0 1px 0 rgba($white, 0.33), inset 0 -1px 2px rgba($black, 0.2)));
color: darken(#e4f2f8, 35%);
background: #e4f2f8;
&[href] {
color: $white;
}
&:hover,
&:focus {
@include linear-gradient($btn-primary-background-color, $btn-primary-background-color-light);
@include box-shadow(inset 0 1px 0 rgba($white, 0.33));
color: darken(#e4f2f8, 45%);
background: darken(#e4f2f8, 10%);
}
&:active {
@include linear-gradient($btn-primary-background-color-dark, $btn-primary-background-color);

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

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

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

@ -16,6 +16,8 @@
.btn {
float: right;
margin-left: 8px;
font-size: 16px;
font-weight: normal;
}
}
@ -36,19 +38,15 @@
// --------------------------------------------------
#topic-list {
border: 1px solid #ddd;
width: 100%;
border-collapse: separate;
border-spacing: 0;
border: 1px solid $topic-list-border-color;
@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;}
a.title:visited:not(.badge-notification) {color: #888;}
tbody tr {
background-color: $white;
&:nth-child(even) {
background-color: darken($white, 2%);
background-color: #f8f8f8;
}
&.archived a {
opacity: 0.6;
@ -83,13 +81,8 @@
color: $topic-list-th-color;
font-weight: bold;
font-size: 13px;
background: #f6f6f6;
&:first-of-type {
@include border-radius-all(4px 0 0 0);
}
&:last-of-type {
@include border-radius-all(0 4px 0 0);
}
background: #eee;
}
td {
//border-top: 1px solid $topic-list-td-border-color;
@ -285,12 +278,10 @@
float: left;
}
> footer {
border: 1px solid $topic-list-border-color;
border: 1px solid #ddd;
border-top: 0;
padding: 7px 10px;
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 {
float: left;
margin: 3px 7px 0 0;