codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-12-11 00:02:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

some reorganization, touch optimization, poster expansion design

Browse source
This commit is contained in:
Kris Aubuchon 2013-10-30 12:40:16 -04:00
parent 9f42bde110
commit d01185215d
3 changed files with 151 additions and 254 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/assets/stylesheets/desktop/poster_expansion.scss
View file

@ -7,11 +7,11 @@
position: absolute; position: absolute;
left: 20px; left: 20px;
z-index: 990; z-index: 990;
@include border-radius-all(3px); box-shadow: 0 2px 6px rgba(70, 70, 70, 0.4);
@include box-shadow(1px 1px 5px $darkish_gray); margin-top: -2px;
background-color: $white; background-color: $white;
padding: 7px 7px 6px 7px; padding: 12px 12px 5px 12px;
width: 400px; max-width: 350px;
h1.new-user a { h1.new-user a {
color: $dark_gray; color: $dark_gray;

305
app/assets/stylesheets/desktop/topic-post.scss
View file

@ -9,14 +9,12 @@
margin-left: auto; margin-left: auto;
} }
h1 .topic-statuses .topic-status i {margin-right: 5px;}
.full-width { .full-width {
margin-left: 0px; margin-left: 0px;
} }
h1 .topic-statuses .topic-status i {margin-right: 5px;}
.logo-small {margin-right: 8px;} .logo-small {margin-right: 8px;}
.topic-post { .topic-post {
@ -28,9 +26,7 @@ h1 .topic-statuses .topic-status i {margin-right: 5px;}
&:last-of-type { &:last-of-type {
border-bottom: 1px solid #ddd; border-bottom: 1px solid #ddd;
}
}
.reply-to-tab { .reply-to-tab {
display: block; display: block;
@ -43,19 +39,21 @@ h1 .topic-statuses .topic-status i {margin-right: 5px;}
margin-left: -8px; margin-left: -8px;
} }
.avoid-tab {padding-top: 25px; .avoid-tab {
padding-top: 25px;
.topic-meta-data-inside {margin-top: -30px;} .topic-meta-data-inside {margin-top: -30px;}
} }
.gutter { .gutter {
.reply-new { .reply-new {
opacity:0; .discourse-no-touch & {
transition: linear 0.15s; opacity:0;
-webkit-transition: linear 0.15s; transition: linear 0.15s;
} -webkit-transition: linear 0.15s;
} }
.discourse-touch & {opacity: 1;}
}
}
section.post-menu-area, .post-actions { section.post-menu-area, .post-actions {
.discourse-no-touch & { .discourse-no-touch & {
@ -63,6 +61,7 @@ section.post-menu-area, .post-actions {
transition: linear 0.15s; transition: linear 0.15s;
-webkit-transition: linear 0.15s; -webkit-transition: linear 0.15s;
} }
.discourse-touch & {opacity: 1;}
} }
&:hover section.post-menu-area, &:hover .post-actions { &:hover section.post-menu-area, &:hover .post-actions {
@ -82,7 +81,6 @@ nav.post-controls {
padding: 0; padding: 0;
button {color: #aaa; button {color: #aaa;
margin-right: 2px; margin-right: 2px;
} }
span.badge-posts { span.badge-posts {
@ -96,7 +94,6 @@ nav.post-controls {
} }
} }
button.show-replies { button.show-replies {
padding: 8px 15px; padding: 8px 15px;
margin-left: 0px; margin-left: 0px;
@ -122,12 +119,10 @@ nav.post-controls {
} }
.create i { .create i {
margin-right: 5px; margin-right: 5px;
} }
button { button {
font-size: 16px; font-size: 16px;
padding: 8px 10px; padding: 8px 10px;
@ -136,20 +131,16 @@ nav.post-controls {
border: none; border: none;
margin-left: 3px; margin-left: 3px;
transition: all linear 0.15s; transition: all linear 0.15s;
outline: none; //removes the pesky square button highlight from some browsers outline: none;
&:hover { &:hover {
background: #eee; background: #eee;
color: #888; color: #888;
} }
&:active { &:active {
@include box-shadow(inset 0 1px 3px rgba($black, 0.2)); @include box-shadow(inset 0 1px 3px rgba($black, 0.2));
} }
&.hidden { &.hidden {
display: none; display: none;
} }
@ -188,27 +179,20 @@ nav.post-controls {
} }
} }
} }
}
.embedded-posts {
background: #eee;
.quote .title {background: #ddd;}
blockquote {background: #ddd;}
&.bottom { margin-top: -11px;}
.topic-meta-data h5 {margin: 5px;}
.topic-meta-data-inside {
margin: -3px 0 0 0;
color: #aaa;
} }
.topic-meta-data {padding-top: 20px;} .embedded-posts {
background: #eee;
} .quote .title {background: #ddd;}
blockquote {background: #ddd;}
&.bottom { margin-top: -11px;}
.topic-meta-data h5 {margin: 5px;}
.topic-meta-data-inside {
margin: -3px 0 0 0;
color: #aaa;
}
.topic-meta-data {padding-top: 20px;}
}
.post-action { .post-action {
.relative-date { .relative-date {
@ -231,17 +215,15 @@ a.star {
} }
.topic-summary { .topic-summary {
margin: 20px 0 0 0;
border: 1px solid #ddd;
button {border-radius: 0;} button {border-radius: 0;}
.topic-links li { .topic-links li {
word-wrap: break-word; word-wrap: break-word;
} }
margin: 20px 0 0 0;
border: 1px solid #ddd;
h3 { h3 {
margin-bottom: 4px; margin-bottom: 4px;
color: #323232; color: #323232;
@ -322,11 +304,8 @@ a.star {
} }
.participants { .participants { // PMs //
.user {float: left; margin: 7px 20px 7px 0;}
.user {float: left; margin: 7px 20px 7px 0;}
} }
.topic-links { .topic-links {
@ -374,7 +353,6 @@ a.star {
#topic-footer-buttons { #topic-footer-buttons {
padding: 20px 10px 0 10px; padding: 20px 10px 0 10px;
p { p {
line-height: 32px; line-height: 32px;
color: #888; color: #888;
@ -384,29 +362,22 @@ a.star {
#suggested-topics { #suggested-topics {
clear: left; clear: left;
padding: 20px 10px 15px 10px;
.topics table tbody tr {background: #fff;}
.topics table tbody tr {background: #fff;}
table { table {
box-shadow: none; box-shadow: none;
border-radius: 0; border-radius: 0;
border-color: #ddd; border-color: #ddd;
margin-top: 10px; margin-top: 10px;
} }
padding: 20px 10px 15px 10px;
.title { .title {
font-size: 14px; line-height: 8px; font-size: 14px; line-height: 8px;
}
}
} }
span.post-count { span.post-count {
background: #000; background: #000;
color: #fff; color: #fff;
@ -423,14 +394,18 @@ span.post-count {
} }
#topic-title { #topic-title {
z-index: 1000; z-index: 1000;
padding: 14px 0 8px 0; padding: 14px 0 8px 0;
h1 { line-height: 1.2em; overflow: hidden; } h1 {
.topic-statuses {margin-top: -2px; .icon-pushpin {margin-top: -1px;}} line-height: 1.2em;
.star {font-size: 20px; margin-top: 8px;} overflow: hidden;
}
.chzn-container {vertical-align: middle;} .topic-statuses {
margin-top: -2px;
.icon-pushpin {margin-top: -1px;}
}
.star {font-size: 20px; margin-top: 8px;}
.chzn-container {vertical-align: middle;}
} }
article.boxed { article.boxed {
@ -461,12 +436,12 @@ iframe {
max-width: 100%; max-width: 100%;
} }
.extra-info-wrapper {
.extra-info-wrapper {float: left; width: 78%; float: left;
.topic-statuses {margin-right: 5px;} width: 78%;
.topic-statuses {margin-right: 5px;}
} }
.extra-info { .extra-info {
h1 { h1 {
margin: 5px 0 0 0; margin: 5px 0 0 0;
@ -496,14 +471,11 @@ iframe {
padding-top: 30px; padding-top: 30px;
img { text-align: center; } img { text-align: center; }
.contents { .contents { text-align: center;}
h3 { display: block; }
text-align: center;}
h3 {display: block;}
} }
.open>.dropdown-menu { .open>.dropdown-menu {
display: block; display: block;
} }
@ -527,14 +499,10 @@ h3 {display: block;}
} }
.contents .cooked { .contents .cooked {
padding-right: 30px; padding-right: 30px;
h1, h2, h3 {margin: 10px 0;}
h1, h2, h3 {margin: 10px 0;}
} }
.modal-body { .modal-body {
input[type=text] { input[type=text] {
font-size: 16px; font-size: 16px;
@ -582,9 +550,6 @@ h1, h2, h3 {margin: 10px 0;}
margin-top: -20px; margin-top: -20px;
} }
#show-topic-admin { #show-topic-admin {
right: 20px; right: 20px;
padding: 5px 8px; padding: 5px 8px;
@ -592,10 +557,6 @@ h1, h2, h3 {margin: 10px 0;}
} }
.topic-admin-menu { .topic-admin-menu {
h3 {margin-top: 0px;} h3 {margin-top: 0px;}
@ -610,21 +571,19 @@ h1, h2, h3 {margin: 10px 0;}
.staff a { .staff a {
padding: 4px; padding: 4px;
margin: -4px 0 0 0; margin: -4px 0 0 0;
background-color: lighten(yellow, 35%);} background-color: lighten(yellow, 35%);
}
.topic-meta-data { .topic-meta-data {
float: left; float: left;
position: relative; position: relative;
h3 {
h3 { font-size: 13px;
font-size: 13px; margin-top: 5px;
margin-top: 5px; word-wrap: break-word;
word-wrap: break-word; line-height: 1.2em;
line-height: 1.2em; }
}
} }
.user-title { .user-title {
@ -634,19 +593,23 @@ h3 {
font-size: 80%; font-size: 80%;
} }
blockquote {
margin: 0;
padding: 12px;
}
.info-line { .info-line {
margin: 10px 0; margin: 10px 0;
color: #666; color: #666;
} }
.quote .title {margin-right: 0;}
.quote {margin-top: 20px;} blockquote { /* solo quotes */
margin: 14px 0;
padding: 12px;
}
.quote { /* quotes with attribution */
margin-top: 14px;
.title {margin-right: 0;}
blockquote {margin: 0;}
}
.quote-controls { .quote-controls {
float: right; float: right;
color: #aaa; color: #aaa;
@ -670,23 +633,14 @@ blockquote {
} }
} }
.quote .title { .quote .title {
border-left: 5px solid #bebebe; border-left: 5px solid #bebebe;
background-color: #f1f1f1; background-color: #f1f1f1;
padding: 10px 10px 0 12px; padding: 10px 10px 0 12px;
.avatar { margin-right: 7px; } .avatar { margin-right: 7px; }
img {margin-top: -4px;} img {margin-top: -4px;}
.controls {}
} }
.gutter { .gutter {
float: left; float: left;
max-width: 250px; max-width: 250px;
@ -707,15 +661,10 @@ blockquote {
left: 0; left: 0;
margin-right: 15px; margin-right: 15px;
margin-bottom: 20px; margin-bottom: 20px;
} }
a {color: #aaa;} a {color: #aaa;}
li {margin-bottom: 7px;} li {margin-bottom: 7px;}
} }
} }
.topic-body { .topic-body {
@ -724,14 +673,12 @@ blockquote {
position: relative; position: relative;
width: 720px; width: 720px;
padding: 10px 0 15px 20px; padding: 10px 0 15px 20px;
} }
.posts-wrapper { .posts-wrapper {
position: relative; position: relative;
} }
//columns //columns
.span14 { width: 70%; max-width: 720px; } //main content .span14 { width: 70%; max-width: 720px; } //main content
@ -741,17 +688,13 @@ blockquote {
@media screen and (max-width: 966px) { @media screen and (max-width: 966px) {
.gutter {display: none;}
.gutter {display: none;} .span14 { width: 80%; max-width: 720px; } //main content
}
.span14 { width: 80%; max-width: 720px; } //main content
}
.row:before, .row:after {display: table; content: "";} .row:before, .row:after {display: table; content: "";}
.row:after {clear: both;} .row:after {clear: both;}
.embedded-posts { .embedded-posts {
h1, h2, h3 {margin: 10px 0;} h1, h2, h3 {margin: 10px 0;}
&.bottom { &.bottom {
@ -766,39 +709,25 @@ blockquote {
.reply:first-of-type .row {border-top: none;} .reply:first-of-type .row {border-top: none;}
} }
.contents.regular { .contents.regular {
button.show-replies { button.show-replies {
background: #eee; background: #eee;
padding-bottom: 20px; padding-bottom: 20px;
&:hover {background: #ddd; &:hover {background: #ddd;
.badge-posts {color: #888;} .badge-posts {color: #888;}
} }
} }
&.bottom-round button.show-replies { &.bottom-round button.show-replies {
background: #eee; background: #eee;
margin-bottom: 0; margin-bottom: 0;
padding-bottom: 8px; padding-bottom: 8px;
&:hover {background: #ddd;
.badge-posts {color: #888;}
&:hover {background: #ddd; }
.badge-posts {color: #888;}
} }
}
} }
@ -881,48 +810,10 @@ clear: both;
opacity: 1; opacity: 1;
} }
#selected-posts { #selected-posts {
margin-left: 330px; margin-left: 330px;
width: 12%; width: 12%;
.btn {
border: none;
color: $white;
font-weight: normal;
color: #fff;
background: $btn-primary-background-color;
&[href] {
color: $white;
}
&:hover
{
color: #fff;
background: darken($btn-primary-background-color, 12%);
}
&:active {
@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);
@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)));
}
}
p {
font-size: 13px;
}
position: fixed; position: fixed;
z-index: 1000; z-index: 1000;
left: 50%; left: 50%;
@ -931,6 +822,8 @@ clear: both;
padding: 5px; padding: 5px;
margin-bottom: 5px; margin-bottom: 5px;
button { button {
width: 160px; width: 160px;
margin: 4px auto; margin: 4px auto;
@ -945,6 +838,7 @@ clear: both;
margin-top: 10px; margin-top: 10px;
} }
p { p {
font-size: 13px;
margin: 0 0 10px 0; margin: 0 0 10px 0;
} }
p.cancel { p.cancel {
@ -958,6 +852,33 @@ clear: both;
margin-right: 7px; margin-right: 7px;
} }
} }
.btn {
border: none;
color: $white;
font-weight: normal;
color: #fff;
background: $btn-primary-background-color;
&[href] {
color: $white;
}
&:hover
{
color: #fff;
background: darken($btn-primary-background-color, 12%);
}
&:active {
@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);
@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)));
}
}
} }
.topic-post { .topic-post {
&.selected { &.selected {

92
app/assets/stylesheets/desktop/topic.scss
View file

@ -1,3 +1,5 @@
@import "common/foundation/variables";
@import "common/foundation/mixins";
.post-info a {color: #aaa;} .post-info a {color: #aaa;}
@ -8,18 +10,19 @@
font-size: 12px; font-size: 12px;
} }
.post-actions { .post-actions {
clear: both; clear: both;
text-align: right; text-align: right;
.post-action { .post-action {
display: inline-block; display: inline-block;
margin-left: 10px; margin-left: 10px;
margin-top: 10px; margin-top: 10px;
}
} }
.post-menu-area {
margin-bottom: 10px;
margin-top: 20px;
} }
.post-menu-area {margin-bottom: 10px; margin-top: 20px;}
.post-info { .post-info {
display: inline-block; display: inline-block;
@ -30,18 +33,12 @@ margin-left: 10px;
#topic-title { #topic-title {
margin-bottom: 20px; margin-bottom: 20px;
.star {margin-right: 8px;} .star {margin-right: 8px;}
h1 { h1 {
font-size: 2em; font-size: 2em;
margin: 0; margin: 0;
a.badge-category {vertical-align: top;}
a.edit-topic {font-size: 15px; position: absolute; margin-left: 8px;}
a.badge-category {vertical-align: top;} }
a.edit-topic {font-size: 15px; position: absolute; margin-left: 8px;}
}
} }
#topic-closing-info { #topic-closing-info {
@ -59,41 +56,32 @@ a.edit-topic {font-size: 15px; position: absolute; margin-left: 8px;}
bottom: 0px; bottom: 0px;
z-index: 500; z-index: 500;
outline: 1px solid transparent; outline: 1px solid transparent;
} }
.reply-new { .reply-new {
i { i {
font-size: 12px; font-size: 12px;
margin-right: 5px; margin-right: 5px;
background: #fff; background: #fff;
border: 1px solid #ddd; border: 1px solid #ddd;
padding: 2px 4px; padding: 2px 4px;
border-radius: 20px; border-radius: 20px;
transition: linear 0.15s; transition: linear 0.15s;
-webkit-transition: linear 0.15s; -webkit-transition: linear 0.15s;
}
}
} }
a.reply-new {color: #aaa;} a.reply-new {color: #aaa;}
a:hover.reply-new {color: #56aed3; a:hover.reply-new {
color: #56aed3;
i {background: #e4f2f8; i {background: #e4f2f8;
border: 1px solid #56aed3; border: 1px solid #56aed3;
padding: 2px 4px; padding: 2px 4px;
}
} }
}
#topic-progress { #topic-progress {
box-shadow: 0 0 3px #000;
box-shadow: 0 0 3px #000;
position: relative; position: relative;
left: 302px; left: 302px;
&.hidden { &.hidden {
@ -128,12 +116,9 @@ i {background: #e4f2f8;
right: 4px; right: 4px;
left: auto; left: auto;
} }
&:disabled { &:disabled {
cursor: default;
cursor: default; color: #666;
color: #666;
} }
} }
h4 { h4 {
@ -165,14 +150,9 @@ i {background: #e4f2f8;
padding: 0; padding: 0;
i { i {
font-size:20px; font-size:20px;
} }
} }
.heatmap-high {color: #f77 !important;} .heatmap-high {color: #f77 !important;}
.heatmap-med {color: #a00 !important;} .heatmap-med {color: #a00 !important;}
.heatmap-low {color: #700 !important;} .heatmap-low {color: #700 !important;}
@ -180,8 +160,6 @@ i {background: #e4f2f8;
.onebox-result {margin-top: 15px;} .onebox-result {margin-top: 15px;}
.source .info {padding-right: 10px;} .source .info {padding-right: 10px;}
#topic-filter { #topic-filter {
background-color: #ffe; background-color: #ffe;
padding: 8px; padding: 8px;
@ -192,10 +170,8 @@ i {background: #e4f2f8;
z-index: 495 z-index: 495
} }
/* Code, KBD, Sub/sup formatting */ /* Code, KBD, Sub/sup formatting */
code,kbd,pre,samp{ code,kbd,pre,samp{
font-family:monospace, serif; font-size:1em; font-family:monospace, serif; font-size:1em;
} }