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

some iterative design changes

This commit is contained in:
Kris Aubuchon 2014-03-12 23:17:18 -04:00
parent aea608c81c
commit bb49b3be82
8 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/stylesheets/common/components/badges.css.scss
View File

@ -11,7 +11,6 @@
%badge { %badge {
display: inline-block; display: inline-block;
font-weight: bold; font-weight: bold;
line-height: 1;
white-space: nowrap; white-space: nowrap;
@include border-radius-all(10px); @include border-radius-all(10px);
} }
@ -54,10 +53,10 @@ h1 a.badge-category div {vertical-align: top;}
.badge-notification { .badge-notification {
@extend %badge; @extend %badge;
padding: 4px; padding: 4px;
padding-top: 3px;
color: $tertiary_text_color; color: $tertiary_text_color;
font-size: 11px; font-size: 11px;
min-width: 10px; line-height: 1;
min-width: 11px;
text-align: center; text-align: center;
background-color: $badge-notification-background-color; background-color: $badge-notification-background-color;
&[href] { &[href] {
@ -67,12 +66,12 @@ h1 a.badge-category div {vertical-align: top;}
// New posts // New posts
&.new-posts, &.unread-posts { &.new-posts, &.unread-posts {
background-color: $emphasis_text_color; background-color: lighten($emphasis_text_color, 20%);
color: $tertiary_text_color; color: $tertiary_text_color;
font-weight: normal; font-weight: normal;
} }
// Click count // Click count

4
app/assets/stylesheets/common/foundation/variables.scss
View File

@ -131,7 +131,7 @@ $nav-like-button-background-color-active: lighten($pink, 22%) !default;
// -------------------------------------------------- // --------------------------------------------------
$topic-list-border-color: lighten($black, 50%) !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-border-color: lighten($black, 50%) !default;
$topic-list-th-background-color: lighten($black, 76%) !default; $topic-list-th-background-color: lighten($black, 76%) !default;
$topic-list-td-color: lighten($black, 35%) !default; $topic-list-td-color: lighten($black, 35%) !default;
@ -155,7 +155,7 @@ $controls_active: darken($blue, 10%);
// Basics // Basics
// -------------------------------------------------- // --------------------------------------------------
$primary_border_color: lighten($black, 60%); $primary_border_color: lighten($black, 70%);
$secondary_border_color: lighten($black, 76%); $secondary_border_color: lighten($black, 76%);
$tertiary_border_color: $white; $tertiary_border_color: $white;
$highlight_border_color: $yellow; $highlight_border_color: $yellow;

2
app/assets/stylesheets/desktop/header.scss
View File

@ -144,7 +144,7 @@
} }
#main-outlet { #main-outlet {
padding-top: 80px; padding-top: 82px;
} }
// Dropdowns // Dropdowns

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

@ -11,7 +11,7 @@
.list-controls { .list-controls {
.nav { .nav {
float: left; float: left;
margin-bottom: 20px; margin-bottom: 22px;
} }
.btn { .btn {
@ -58,16 +58,16 @@
// -------------------------------------------------- // --------------------------------------------------
#topic-list { #topic-list {
border: 1px solid $primary_border_color;
width: 100%; width: 100%;
border-collapse: separate; border-collapse: separate;
border-spacing: 0; border-spacing: 0;
margin: 0 0 10px; margin: 0 0 10px;
border: 1px solid $primary_border_color;
a.title {color: $primary_text_color;} a.title {color: $primary_text_color;}
a.title:visited:not(.badge-notification) {color: lighten($primary_text_color, 35%);} a.title:visited:not(.badge-notification) {color: lighten($primary_text_color, 35%);}
> tbody > tr { > tbody > tr {
&:nth-child(even) { &:nth-child(odd) {
background-color: lighten($secondary_background_color, 77%); background-color: lighten($secondary_background_color, 77%);
} }
&.archived a { &.archived a {
@ -101,10 +101,9 @@
} }
th { th {
color: $topic-list-th-color; color: $topic-list-th-color;
font-weight: bold; font-weight: normal;
font-size: 13px; font-size: 14px;
background: lighten($secondary_background_color, 70%); button i.fa {color: $topic-list-th-color;}
} }
td { td {
@ -206,7 +205,7 @@
.sortable { .sortable {
cursor: pointer; cursor: pointer;
&:hover { &:hover {
background-color: lighten($secondary_background_color, 60%); background-color: lighten($secondary_background_color, 76%);
} }
@include unselectable; @include unselectable;
} }

8
app/assets/stylesheets/desktop/topic-post.scss
View File

@ -54,7 +54,7 @@ h1 .topic-statuses .topic-status i {margin-right: 5px;}
left: 120px; left: 120px;
z-index: 400; z-index: 400;
padding: 5px 12px; padding: 5px 12px;
border: 1px solid lighten($primary_border_color, 10%); border: 1px solid $primary_border_color;
font-size: 12px; font-size: 12px;
margin-left: -8px; margin-left: -8px;
background: $primary_background_color; background: $primary_background_color;
@ -243,7 +243,7 @@ a.star {
.topic-map { .topic-map {
margin: 20px 0 0 0; margin: 20px 0 0 0;
border: 1px solid lighten($primary_border_color, 10%); border: 1px solid $primary_border_color;
.buttons .btn { .buttons .btn {
&:hover {border: 1px solid $primary_border_color !important;} &:hover {border: 1px solid $primary_border_color !important;}
@ -482,7 +482,7 @@ iframe {
.topic-meta-data { .topic-meta-data {
margin-bottom: 10px; margin-bottom: 10px;
width: 92px; width: 92px;
border-top: 1px solid lighten($primary_border_color, 10%); border-top: 1px solid $primary_border_color;
padding-top: 30px; padding-top: 30px;
img { img {
@ -754,7 +754,7 @@ blockquote { /* solo quotes */
} }
.topic-body { .topic-body {
border-top: 1px solid lighten($primary_border_color, 10%); border-top: 1px solid $primary_border_color;
float: left; float: left;
position: relative; position: relative;
padding: 10px 0 15px 0; padding: 10px 0 15px 0;

2
app/assets/stylesheets/desktop/topic.scss
View File

@ -74,7 +74,7 @@
.private_message #topic-title .private-message-glyph { display: inline; } .private_message #topic-title .private-message-glyph { display: inline; }
#topic-closing-info { #topic-closing-info {
border-top: 1px solid lighten($primary_border_color, 10%) ; border-top: 1px solid $primary_border_color;
padding-top: 10px; padding-top: 10px;
height: 20px; height: 20px;
} }

2
app/assets/stylesheets/desktop/user.scss
View File

@ -338,7 +338,7 @@
.item { .item {
padding: 20px 8px 15px 8px; padding: 20px 8px 15px 8px;
background-color: $primary_background_color; background-color: $primary_background_color;
border-bottom: 1px solid lighten($primary_border_color, 10%); border-bottom: 1px solid $primary_border_color;
} }
.type { .type {
color: $primary_text_color; color: $primary_text_color;

5
app/assets/stylesheets/mobile/modal.scss
View File

@ -14,11 +14,10 @@
z-index: 2070; z-index: 2070;
} }
// Prevent background scrolling when a modal is open
overflow: hidden;
position: fixed;
} }
.modal-open #main {overflow:hidden;}
.modal-backdrop { .modal-backdrop {
position: fixed; position: fixed;
top: 0; top: 0;