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

The flattening part 2, cleaned up styling so it is more consistent with the removal of border yesterday 

quote style now matches block quote style
This commit is contained in:
Sam 2013-07-10 12:17:43 +10:00
parent db196ee126
commit 7cee5efab8
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/stylesheets/application/topic-post.css.scss
View File

@ -629,7 +629,7 @@
top: 12px; top: 12px;
left: -9px; left: -9px;
border-width: 10px 10px 10px 0; border-width: 10px 10px 10px 0;
border-right-color: #cecece; border-right-color: #dfdfdf;
} }
&:after { &:after {
top: 13px; top: 13px;
@ -661,7 +661,6 @@
.topic-summary { .topic-summary {
margin-top: 8px; margin-top: 8px;
border: 1px solid #b9b9b9;
background-color: darken($white, 3%); background-color: darken($white, 3%);
@include border-radius-all(4px); @include border-radius-all(4px);
@include box-shadow(0 1px 2px rgba($black, 0.07)); @include box-shadow(0 1px 2px rgba($black, 0.07));

17
app/assets/stylesheets/application/topic.css.scss
View File

@ -177,17 +177,18 @@
// When we are quoting something // When we are quoting something
aside.quote { aside.quote {
border-left: 5px solid #d7d7d7;
margin-top: 14px; margin-top: 14px;
border: 1px solid #eee;
font-size: 14px; font-size: 14px;
line-height: 20px; line-height: 20px;
padding-left: 5px;
background-color: #f1f1f1;
overflow: hidden; overflow: hidden;
@include border-radius-all(4px);
&:nth-of-type(1) { &:nth-of-type(1) {
margin: 0; margin: 0;
} }
.title { .title {
padding: 8px; padding: 8px 8px 0px;
background-color: #f1f1f1; background-color: #f1f1f1;
a, a,
.avatar { .avatar {
@ -235,7 +236,6 @@
border: 0; border: 0;
padding: 8px; padding: 8px;
color: #333; color: #333;
background-color: $white;
*:last-child { *:last-child {
margin-bottom: 0; margin-bottom: 0;
} }
@ -384,7 +384,6 @@ kbd {
#topic-progress-wrapper.docked { #topic-progress-wrapper.docked {
#topic-progress { #topic-progress {
border-bottom: 1px solid $gray;
margin-left: 6px; margin-left: 6px;
} }
position: absolute; position: absolute;
@ -396,9 +395,7 @@ kbd {
&.hidden { &.hidden {
display: none; display: none;
} }
border-left: 1px solid $gray; border: none;
border-right: 1px solid $gray;
border-top: 1px solid $gray;
background-color: $white; background-color: $white;
color: $darkish_gray; color: $darkish_gray;
width: 130px; width: 130px;
@ -451,7 +448,9 @@ kbd {
bottom: 0px; bottom: 0px;
width: 0px; width: 0px;
border-right: 1px solid $white; border-right: 1px solid $white;
background-color: #e6f7ef; // background-color: #d4eaf4;
// background-color: #C5E8F7;
background-color: #E4F2F8;
} }
} }