diff --git a/app/assets/stylesheets/common/components/badges.css.scss b/app/assets/stylesheets/common/components/badges.css.scss index b75aa112efa..b752d83371a 100644 --- a/app/assets/stylesheets/common/components/badges.css.scss +++ b/app/assets/stylesheets/common/components/badges.css.scss @@ -11,7 +11,6 @@ %badge { display: inline-block; font-weight: bold; - line-height: 1; white-space: nowrap; @include border-radius-all(10px); } @@ -54,10 +53,10 @@ h1 a.badge-category div {vertical-align: top;} .badge-notification { @extend %badge; padding: 4px; - padding-top: 3px; color: $tertiary_text_color; font-size: 11px; - min-width: 10px; + line-height: 1; + min-width: 11px; text-align: center; background-color: $badge-notification-background-color; &[href] { @@ -67,12 +66,12 @@ h1 a.badge-category div {vertical-align: top;} // New posts &.new-posts, &.unread-posts { - background-color: $emphasis_text_color; + background-color: lighten($emphasis_text_color, 20%); color: $tertiary_text_color; font-weight: normal; } - + // Click count diff --git a/app/assets/stylesheets/common/foundation/variables.scss b/app/assets/stylesheets/common/foundation/variables.scss index ed776a3af03..f221dfa397d 100644 --- a/app/assets/stylesheets/common/foundation/variables.scss +++ b/app/assets/stylesheets/common/foundation/variables.scss @@ -131,7 +131,7 @@ $nav-like-button-background-color-active: lighten($pink, 22%) !default; // -------------------------------------------------- $topic-list-border-color: lighten($black, 50%) !default; -$topic-list-th-color: $black !default; +$topic-list-th-color: lighten($black, 35%) !default; $topic-list-th-border-color: lighten($black, 50%) !default; $topic-list-th-background-color: lighten($black, 76%) !default; $topic-list-td-color: lighten($black, 35%) !default; @@ -155,7 +155,7 @@ $controls_active: darken($blue, 10%); // Basics // -------------------------------------------------- -$primary_border_color: lighten($black, 60%); +$primary_border_color: lighten($black, 70%); $secondary_border_color: lighten($black, 76%); $tertiary_border_color: $white; $highlight_border_color: $yellow; diff --git a/app/assets/stylesheets/desktop/header.scss b/app/assets/stylesheets/desktop/header.scss index 3b24f76a569..192ef69b009 100644 --- a/app/assets/stylesheets/desktop/header.scss +++ b/app/assets/stylesheets/desktop/header.scss @@ -144,7 +144,7 @@ } #main-outlet { - padding-top: 80px; + padding-top: 82px; } // Dropdowns diff --git a/app/assets/stylesheets/desktop/topic-list.scss b/app/assets/stylesheets/desktop/topic-list.scss index 7d454b46093..07a12934f78 100644 --- a/app/assets/stylesheets/desktop/topic-list.scss +++ b/app/assets/stylesheets/desktop/topic-list.scss @@ -11,7 +11,7 @@ .list-controls { .nav { float: left; - margin-bottom: 20px; + margin-bottom: 22px; } .btn { @@ -58,16 +58,16 @@ // -------------------------------------------------- #topic-list { - border: 1px solid $primary_border_color; width: 100%; border-collapse: separate; border-spacing: 0; margin: 0 0 10px; + border: 1px solid $primary_border_color; a.title {color: $primary_text_color;} a.title:visited:not(.badge-notification) {color: lighten($primary_text_color, 35%);} > tbody > tr { - &:nth-child(even) { + &:nth-child(odd) { background-color: lighten($secondary_background_color, 77%); } &.archived a { @@ -101,10 +101,9 @@ } th { color: $topic-list-th-color; - font-weight: bold; - font-size: 13px; - background: lighten($secondary_background_color, 70%); - + font-weight: normal; + font-size: 14px; + button i.fa {color: $topic-list-th-color;} } td { @@ -206,7 +205,7 @@ .sortable { cursor: pointer; &:hover { - background-color: lighten($secondary_background_color, 60%); + background-color: lighten($secondary_background_color, 76%); } @include unselectable; } diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss index 4dcfdae7bbb..8f770c44b5f 100644 --- a/app/assets/stylesheets/desktop/topic-post.scss +++ b/app/assets/stylesheets/desktop/topic-post.scss @@ -54,7 +54,7 @@ h1 .topic-statuses .topic-status i {margin-right: 5px;} left: 120px; z-index: 400; padding: 5px 12px; - border: 1px solid lighten($primary_border_color, 10%); + border: 1px solid $primary_border_color; font-size: 12px; margin-left: -8px; background: $primary_background_color; @@ -243,7 +243,7 @@ a.star { .topic-map { margin: 20px 0 0 0; - border: 1px solid lighten($primary_border_color, 10%); + border: 1px solid $primary_border_color; .buttons .btn { &:hover {border: 1px solid $primary_border_color !important;} @@ -482,7 +482,7 @@ iframe { .topic-meta-data { margin-bottom: 10px; width: 92px; - border-top: 1px solid lighten($primary_border_color, 10%); + border-top: 1px solid $primary_border_color; padding-top: 30px; img { @@ -754,7 +754,7 @@ blockquote { /* solo quotes */ } .topic-body { - border-top: 1px solid lighten($primary_border_color, 10%); + border-top: 1px solid $primary_border_color; float: left; position: relative; padding: 10px 0 15px 0; diff --git a/app/assets/stylesheets/desktop/topic.scss b/app/assets/stylesheets/desktop/topic.scss index 32c1c8287c8..3618f70a8e0 100644 --- a/app/assets/stylesheets/desktop/topic.scss +++ b/app/assets/stylesheets/desktop/topic.scss @@ -74,7 +74,7 @@ .private_message #topic-title .private-message-glyph { display: inline; } #topic-closing-info { - border-top: 1px solid lighten($primary_border_color, 10%) ; + border-top: 1px solid $primary_border_color; padding-top: 10px; height: 20px; } diff --git a/app/assets/stylesheets/desktop/user.scss b/app/assets/stylesheets/desktop/user.scss index 71c0cd38db6..d2e09bdab69 100644 --- a/app/assets/stylesheets/desktop/user.scss +++ b/app/assets/stylesheets/desktop/user.scss @@ -338,7 +338,7 @@ .item { padding: 20px 8px 15px 8px; background-color: $primary_background_color; - border-bottom: 1px solid lighten($primary_border_color, 10%); + border-bottom: 1px solid $primary_border_color; } .type { color: $primary_text_color; diff --git a/app/assets/stylesheets/mobile/modal.scss b/app/assets/stylesheets/mobile/modal.scss index d6e81348188..a3573e38b86 100644 --- a/app/assets/stylesheets/mobile/modal.scss +++ b/app/assets/stylesheets/mobile/modal.scss @@ -14,11 +14,10 @@ z-index: 2070; } - // Prevent background scrolling when a modal is open - overflow: hidden; - position: fixed; } +.modal-open #main {overflow:hidden;} + .modal-backdrop { position: fixed; top: 0;