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

fixing alignment on replies, buttons - also making topic new gutter link visible on touch

This commit is contained in:
Kris Aubuchon 2013-10-22 15:37:44 -04:00
parent 13fa473c6d
commit c2865e3e2c
3 changed files with 91 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,7 +43,7 @@
@include border-radius-all(4px 4px 0 0); @include border-radius-all(4px 4px 0 0);
@include box-shadow(0 1px 3px rgba($black, 0.22)); @include box-shadow(0 1px 3px rgba($black, 0.22));
a:visited {color: #888;} a:visited:not(.badge-notification) {color: #888;}
tbody tr { tbody tr {
background-color: $white; background-color: $white;

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

@ -8,7 +8,7 @@ html {background-color: #fff;}
margin-right: auto; margin-right: auto;
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;
@ -47,7 +47,7 @@ html {background-color: #fff;}
} }
section.post-menu-area { section.post-menu-area, .post-actions {
.discourse-no-touch & { .discourse-no-touch & {
opacity: 0.2; opacity: 0.2;
transition: linear 0.15s; transition: linear 0.15s;
@ -55,7 +55,7 @@ section.post-menu-area {
} }
} }
&:hover section.post-menu-area { &:hover section.post-menu-area, &:hover .post-actions {
opacity: 1; opacity: 1;
} }
@ -75,9 +75,7 @@ section.post-menu-area {
nav.post-controls { nav.post-controls {
background-color: #fff;
padding: 0; padding: 0;
margin-top: 20px;
button {color: #aaa; button {color: #aaa;
margin-right: 2px; margin-right: 2px;
@ -96,7 +94,7 @@ nav.post-controls {
button.show-replies { button.show-replies {
padding: 8px 20px; padding: 8px;
margin-left: 0px; margin-left: 0px;
} }
@ -105,8 +103,8 @@ nav.post-controls {
margin-right: 0; margin-right: 0;
color: darken(#e4f2f8, 35%); color: darken(#e4f2f8, 35%);
background: #e4f2f8; background: #e4f2f8;
padding: 7px 20px; padding: 8px 20px;
border: 1px solid #e4f2f8; border: 1px solid darken(#e4f2f8, 35%);
margin-left: 10px; margin-left: 10px;
&:hover { color: darken(#e4f2f8, 45%); &:hover { color: darken(#e4f2f8, 45%);
@ -127,8 +125,8 @@ nav.post-controls {
padding: 8px 10px; padding: 8px 10px;
vertical-align: top; vertical-align: top;
background: transparent; background: transparent;
border: none; border: 1px solid #ddd;
margin-left: 1px; 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; //removes the pesky square button highlight from some browsers
&:hover { &:hover {
@ -189,22 +187,54 @@ nav.post-controls {
.quote .title {background: #ddd;} .quote .title {background: #ddd;}
blockquote {background: #ddd;} blockquote {background: #ddd;}
&.bottom { margin-top: -11px;
.reply {
border-left: 1px solid #ddd;
border-right: 1px solid #ddd;
&:first-of-type {
border-top: 1px solid #ddd;
}
&:last-of-type {
border-bottom: 1px solid #ddd;
}
}
}
&.top {
.reply {
border-left: 1px solid #ddd;
border-right: 1px solid #ddd;
&:first-of-type {
border-top: 1px solid #ddd;
}
&:last-of-type {
}
}
}
.reply {padding-bottom: 10px;}
.topic-body { .topic-body {
padding-top: 7px;
padding-bottom: 10px;
} }
.topic-meta-data h5 {margin: 5px;} .topic-meta-data h5 {margin: 5px;}
.topic-meta-data-inside { .topic-meta-data-inside {
margin: -3px 15px 0 0; margin: -3px 0 0 0;
color: #aaa; color: #aaa;
} }
.topic-meta-data {padding-top: 20px;} .topic-meta-data {padding-top: 20px;}
} }
@ -212,8 +242,6 @@ nav.post-controls {
.post-action { .post-action {
margin-top: 3px;
margin-bottom: 3px;
.relative-date { .relative-date {
margin-left: 5px; margin-left: 5px;
} }
@ -236,11 +264,9 @@ a.star {
display: none; display: none;
} }
.topic-link {margin-left: -8px;}
.topic-summary { .topic-summary {
button {border-radius: 0;} button {border-radius: 0;}
.btn { .btn {
@ -252,7 +278,7 @@ a.star {
margin: 15px 0 20px 0; margin: 20px 0 0 0;
border: 1px solid #ddd; border: 1px solid #ddd;
h3 { h3 {
@ -456,7 +482,9 @@ iframe {
} }
.extra-info-wrapper {float: left; width: 78%;} .extra-info-wrapper {float: left; width: 78%;
.topic-statuses {margin-right: 5px;}
}
#main .inner a.star {margin-top: 6px;} #main .inner a.star {margin-top: 6px;}
@ -467,11 +495,9 @@ iframe {
a:not(.badge-category) {margin-left: -10px;} a:not(.badge-category) {margin-left: -10px;}
} }
a.star { a.star {
margin-right: 8px; margin-right: 5px;
margin-top: 6px; margin-top: 6px;
} }
@ -692,10 +718,12 @@ blockquote {
ul {margin: 0;} ul {margin: 0;}
padding-left: 10px; padding-left: 10px;
i {font-size: 12px;}
.post-links { .post-links {
margin-top: 6px; margin-top: 3px;
list-style-type: none; list-style-type: none;
padding-left: 20px; padding-left: 19px;
position: relative; position: relative;
margin-left: 5px; margin-left: 5px;
a i { a i {
@ -703,6 +731,7 @@ blockquote {
left: 0; left: 0;
margin-right: 15px; margin-right: 15px;
margin-bottom: 20px; margin-bottom: 20px;
} }
a {color: #aaa;} a {color: #aaa;}
@ -718,12 +747,13 @@ blockquote {
float: left; float: left;
position: relative; position: relative;
width: 720px; width: 720px;
padding: 10px 10px 10px 20px; padding: 10px 10px 15px 20px;
} }
.posts-wrapper { .posts-wrapper {
position: relative; position: relative;
border-bottom: 1px solid #ddd;
} }
@ -749,21 +779,29 @@ blockquote {
.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 {
&.hidden {display: block; opacity: 0; }
&.bottom .arrow {float: right; margin: 0 15px 0 0;} }
&.bottom .arrow {float: right; margin: 0 0 0 0;}
&.top {margin-left: 112px;} &.top {margin-left: 112px;}
.topic-body img {max-width: 100%; height: auto;} .topic-body img {max-width: 100%; height: auto;}
.topic-body, .topic-meta-data {border: none;} .topic-body, .topic-meta-data {border: none;}
.row {border-top: 1px solid #ddd; padding-top: 7px;} .row {border-top: 1px solid #ddd; padding-top: 7px;}
.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;
border-bottom: 10px solid #eee; padding-bottom: 20px;
border-bottom: none;
} }
@ -771,10 +809,11 @@ button.show-replies {
background: #fff; background: #fff;
margin-bottom: 0; margin-bottom: 0;
border-bottom: none; padding-bottom: 10px;
border: 1px solid #ddd;
&:hover {background: #eee; &:hover {background: #eee;
.badge-posts {color: #888;} .badge-posts {color: #888;}
} }

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

@ -2,12 +2,27 @@
.post-info a {color: #aaa;} .post-info a {color: #aaa;}
.topic-meta-data-inside { .topic-meta-data-inside {
float: right;
margin-top: -22px;
float: right; float: right;
margin-top: -19px; margin-top: -19px;
font-size: 12px; font-size: 12px;
} }
.post-actions {
color: #bbb;
text-align: right;
a {color: #bbb;}
.post-action {
display: inline-block;
margin-left: 10px;
margin-top: 10px;
}
}
.post-menu-area {margin-bottom: 10px;}
.post-info { .post-info {
display: inline-block; display: inline-block;
} }
@ -17,7 +32,7 @@
#topic-title { #topic-title {
margin-bottom: 20px; margin-bottom: 20px;
margin: -20px 0 0 0; margin: -20px 0 0 0;
.topic-statuses {margin-left: 5px;}
h1 { h1 {
font-size: 2em; font-size: 2em;
@ -56,7 +71,7 @@ a.edit-topic {font-size: 15px;}
.reply-new { .reply-new {
i { i {
font-size: 12px;
margin-right: 5px; margin-right: 5px;
background: #fff; background: #fff;
border: 1px solid #ddd; border: 1px solid #ddd;
@ -73,7 +88,7 @@ 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 #e4f2f8; border: 1px solid #56aed3;
padding: 2px 4px; padding: 2px 4px;
} }
@ -154,7 +169,6 @@ i {background: #e4f2f8;
.topic-statuses .topic-status { .topic-statuses .topic-status {
padding: 0; padding: 0;
i { i {
margin-left: 5px !important;
font-size:20px; font-size:20px;
} }
@ -181,4 +195,4 @@ i {background: #e4f2f8;
width: 100%; width: 100%;
font-size: 15px; font-size: 15px;
z-index: 495 z-index: 495
} }