diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss index 19c86a13e14..7ed5e07b6b9 100644 --- a/app/assets/stylesheets/common/admin/admin_base.scss +++ b/app/assets/stylesheets/common/admin/admin_base.scss @@ -4,6 +4,16 @@ @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 { font-size: 12px; float: right; diff --git a/app/assets/stylesheets/common/components/buttons.css.scss b/app/assets/stylesheets/common/components/buttons.css.scss index 4c230eb31b8..298e996584d 100644 --- a/app/assets/stylesheets/common/components/buttons.css.scss +++ b/app/assets/stylesheets/common/components/buttons.css.scss @@ -22,7 +22,6 @@ button { line-height: 18px; text-align: center; cursor: pointer; - @include border-radius-all(4px); &:active { text-shadow: none; } @@ -45,19 +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: #e8e8e8; &[href] { color: $btn-default-color; } - &:hover, - &:focus { - @include linear-gradient($white, $btn-default-background-color-hover); - @include box-shadow(none); + &:hover + { + background: #aaa; + color: #fff; } &: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)); } &[disabled] { @@ -76,23 +76,29 @@ 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))); + font-weight: normal; + + color: #fff; + background: $btn-primary-background-color; + + + + + &[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)); + &:hover + { + color: #fff; + background: darken($btn-primary-background-color, 12%); } &: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)); + color: #fff; } &[disabled] { text-shadow: 0 1px 0 rgba($black, 0.2); @@ -105,28 +111,21 @@ button { // -------------------------------------------------- .btn-danger { - border: 1px solid $btn-danger-border-color; color: $white; - text-shadow: 0 1px 0 rgba($black, 0.2); - font-weight: bold; - @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))); + font-weight: normal; + background: $btn-danger-background-color; &[href] { color: $white; } - &:hover, - &:focus { - @include linear-gradient($btn-danger-background-color, $btn-danger-background-color-light); - @include box-shadow(inset 0 1px 0 rgba($white, 0.33)); + &:hover{ + background: $btn-danger-background-color-dark; } &: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)); } &[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))); + } } diff --git a/app/assets/stylesheets/common/components/navs.css.scss b/app/assets/stylesheets/common/components/navs.css.scss index af27d4e8a07..9206fece1ad 100644 --- a/app/assets/stylesheets/common/components/navs.css.scss +++ b/app/assets/stylesheets/common/components/navs.css.scss @@ -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; } diff --git a/app/assets/stylesheets/desktop/topic-list.scss b/app/assets/stylesheets/desktop/topic-list.scss index aecf0526eba..dcf0d1d4ff1 100644 --- a/app/assets/stylesheets/desktop/topic-list.scss +++ b/app/assets/stylesheets/desktop/topic-list.scss @@ -16,7 +16,27 @@ .btn { float: right; 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 { @@ -36,19 +56,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 +99,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 +296,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; @@ -362,7 +371,6 @@ float: left; } .category-dropdown-button { - padding: 4px 10px 3px 8px; border-left: 1px solid rgba(0, 0, 0, 0.15); font-size: 16px; width: 10px; @@ -430,19 +438,20 @@ ol.category-breadcrumb { position: absolute; border: 1px solid #ccc; background-color: white; - width: 200px; + max-width: 300px; + min-width: 140px; height: 200px; padding: 8px 5px 0 7px; z-index: 100; - margin-top: 31px; + margin-top: 30px; .badge-category { font-size: 13px; line-height: 26px; - padding: 0px 8px; float: none; } + div { margin-bottom: 10px; } diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss index 2355b8019f8..1b3f46dab19 100644 --- a/app/assets/stylesheets/desktop/topic-post.scss +++ b/app/assets/stylesheets/desktop/topic-post.scss @@ -1,4 +1,5 @@ @import "common/foundation/variables"; +@import "common/foundation/mixins"; .container { @@ -113,6 +114,12 @@ nav.post-controls { 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 { + + @include box-shadow(inset 0 1px 3px rgba($black, 0.2)); + } &.hidden { display: none; @@ -344,6 +353,13 @@ a.star { border-bottom: 1px solid #ccc; } + + &:active { + + + @include box-shadow(inset 0 1px 3px rgba($black, 0.2)); + } + &.collapsed { border-bottom: 0; padding-bottom: 1px; @@ -566,13 +582,10 @@ h1, h2, h3 {margin: 10px 0;} #show-topic-admin { - color: #7b7b7b; right: 20px; padding: 5px 8px; margin-top: 5px; - - }