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

Merge pull request #1651 from awesomerobot/master

Browse source 
New onebox styles, and a few small fixes
This commit is contained in:
Sam 2013-11-13 22:49:54 -08:00
commit 23deecfe44
5 changed files with 41 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/stylesheets/common/components/badges.css.scss
View file

@ -36,7 +36,6 @@
.badge-notification { .badge-notification {
@extend %badge; @extend %badge;
margin-left: 3px;
padding: 4px; padding: 4px;
padding-top: 3px; padding-top: 3px;
color: $white; color: $white;
@ -47,6 +46,7 @@
&[href] { &[href] {
color: $white; color: $white;
} }
i {font-size: 10px;}
// New posts // New posts
@ -58,7 +58,9 @@
&.clicks { &.clicks {
font-weight: normal; font-weight: normal;
background-color: rgba($black, 0.15) background-color: #ddd;
top: -1px;
color: #666;
} }
} }

1
app/assets/stylesheets/desktop/discourse.scss
View file

@ -226,7 +226,6 @@ blockquote {
background-color: $quote-background; background-color: $quote-background;
border-left: 5px solid darken($quote-background, 20%); border-left: 5px solid darken($quote-background, 20%);
p { p {
margin: 0 5px 5px 0;
} }
} }

14
app/assets/stylesheets/desktop/onebox.scss
View file

@ -12,22 +12,27 @@ a.loading-onebox {
padding-left: 25px; padding-left: 25px;
} }
.onebox-result { .onebox-result {
margin-top: 15px;
padding: 12px 25px 12px 12px;
border-left: 5px solid #bebebe;
background: #eee;
font-size: 14px; font-size: 14px;
> .source { > .source {
margin-bottom: 10px; margin-bottom: 12px;
margin-right: 10px; margin-right: 10px;
padding: 0 0 10px 0;
display: block; display: block;
color: $black; color: $black;
position: relative; position: relative;
border-bottom: 1px solid $inner_border; height: 20px;
.info { .info {
a { a {
color: black; color: black;
text-decoration: none; text-decoration: none;
padding-right: 10px;
} }
background-color: $white;
position: absolute; position: absolute;
font-size: 14px; font-size: 14px;
img.favicon { img.favicon {
@ -37,7 +42,6 @@ a.loading-onebox {
} }
.onebox-result-body { .onebox-result-body {
padding-top: 5px; padding-top: 5px;
font-family: Georgia, Times, "Times New Roman", serif;
img { img {
max-width:200px; max-width:200px;
} }

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

@ -347,7 +347,7 @@ a.star {
} }
#topic-footer-buttons { #topic-footer-buttons {
padding: 20px 10px 0 10px; padding: 10px 10px 0 10px;
p { p {
line-height: 32px; line-height: 32px;
color: #888; color: #888;
@ -479,10 +479,10 @@ iframe {
} }
.contents .cooked { .contents .cooked {
padding-right: 30px; margin-right: 50px;
word-wrap: break-word; word-wrap: break-word;
h1, h2, h3 {margin: 10px 0;} h1, h2, h3 {margin: 10px 0;}
ul, ol {margin: 0 0 0 20px;} ul, ol {margin: 15px 0 0 20px;}
li p {margin: 3px 0;} li p {margin: 3px 0;}
} }
@ -593,14 +593,31 @@ position: relative;
blockquote { /* solo quotes */ blockquote { /* solo quotes */
margin: 14px 0; margin: 14px 0;
padding: 12px; padding: 12px;
p:first-of-type {margin-top: 0;}
p:last-of-type {margin-bottom: 0;}
} }
.quote { /* quotes with attribution */ .quote { /* quotes with attribution */
margin-top: 14px; margin-top: 14px;
.title {margin-right: 0;} blockquote {margin-top: 0; padding-top: 0;
blockquote {margin: 0;} .onebox-result {background-color: #ddd;}
} }
.title {
border-left: 5px solid #bebebe;
background-color: #f1f1f1;
padding: 12px;
.avatar { margin-right: 7px; }
img {margin-top: -4px;}
}
}
.quote-controls { .quote-controls {
float: right; float: right;
color: #aaa; color: #aaa;
@ -624,13 +641,7 @@ blockquote { /* solo quotes */
} }
} }
.quote .title {
border-left: 5px solid #bebebe;
background-color: #f1f1f1;
padding: 10px 10px 0 12px;
.avatar { margin-right: 7px; }
img {margin-top: -4px;}
}
.gutter { .gutter {
float: left; float: left;
@ -900,7 +911,7 @@ clear: both;
} }
article.boxed { article.boxed {
position: relative; position: relative;
line-height: 20px; line-height: 21px;
.select-posts { .select-posts {
position: absolute; position: absolute;

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

@ -68,6 +68,8 @@
#topic-closing-info { #topic-closing-info {
margin-left: 10px; margin-left: 10px;
margin-top: 10px;
height: 20px;
} }
#topic-progress-wrapper { #topic-progress-wrapper {
@ -168,7 +170,7 @@ a:hover.reply-new {
#topic-progress { #topic-progress {
} }
position: absolute; position: absolute;
bottom: -55px; bottom: -70px;
} }
@ -190,8 +192,7 @@ a:hover.reply-new {
.heatmap-med {color: #a00 !important;} .heatmap-med {color: #a00 !important;}
.heatmap-low {color: #700 !important;} .heatmap-low {color: #700 !important;}
.onebox-result {margin-top: 15px;}
.source .info {padding-right: 10px;}
#topic-filter { #topic-filter {
background-color: #ffe; background-color: #ffe;