codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2025-04-29 07:24:09 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

some topic-list simplification

Browse source
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
app/assets/stylesheets
common/components
buttons.css.scssnavs.css.scss
desktop
topic-list.scss

32
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,20 +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: #ddd;
&[href] { &[href] {
color: $btn-default-color; color: $btn-default-color;
} }
&:hover, &:hover,
&:focus { &:focus {
@include linear-gradient($white, $btn-default-background-color-hover); background: #888;
@include box-shadow(none); color: #fff;
} }
&:active { &:active {
@include linear-gradient($btn-default-background-color, $white); margin-top: 1px; margin-bottom: -1px;
@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);
@ -76,19 +75,24 @@ 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: bold; 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] { &[href] {
color: $white; color: $white;
} }
&:hover, &:hover,
&:focus { &:focus {
@include linear-gradient($btn-primary-background-color, $btn-primary-background-color-light); color: darken(#e4f2f8, 45%);
@include box-shadow(inset 0 1px 0 rgba($white, 0.33)); background: darken(#e4f2f8, 10%);
} }
&:active { &:active {
@include linear-gradient($btn-primary-background-color-dark, $btn-primary-background-color); @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; 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;
} }

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

@ -16,6 +16,8 @@
.btn { .btn {
float: right; float: right;
margin-left: 8px; margin-left: 8px;
font-size: 16px;
font-weight: normal;
} }
} }
@ -36,19 +38,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 +81,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 +278,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;