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

Merge pull request #2305 from awesomerobot/master 

some adjustments for the username relocation...
This commit is contained in:
Jeff Atwood 2014-04-29 21:55:17 -07:00
parent f6c22cc299 7361519e52
commit 8c0041bcda
1 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,9 +52,9 @@ h1 .topic-statuses .topic-status i {
.reply-to-tab { .reply-to-tab {
position: absolute; position: absolute;
right: 300px; right: 330px;
z-index: 400; z-index: 400;
padding: 5px 12px; padding: 2px 10px 4px;
border: 1px solid $primary_border_color; border: 1px solid $primary_border_color;
font-size: 12px; font-size: 12px;
background: $primary_background_color; background: $primary_background_color;
@ -70,7 +70,7 @@ h1 .topic-statuses .topic-status i {
.topic-meta-data-inside { .topic-meta-data-inside {
float: right; float: right;
margin-top: -36px; margin-top: -54px;
float: right; float: right;
font-size: 12px; font-size: 12px;
} }
@ -226,8 +226,8 @@ nav.post-controls {
&.bottom .arrow {float: right; margin: 0 0 0 0;} &.bottom .arrow {float: right; margin: 0 0 0 0;}
&.top { &.top {
margin-left: 112px; margin-left: 66px;
max-width: 775px; max-width: 713px;
.topic-meta-data {padding-left: 13px;} .topic-meta-data {padding-left: 13px;}
@include medium-width { @include medium-width {
@ -254,15 +254,15 @@ nav.post-controls {
.topic-meta-data { .topic-meta-data {
position: relative; position: relative;
.avatar { .avatar {
margin-left: 10px;
margin-top: -10px; margin-top: -10px;
} }
} }
.topic-meta-data h5 { .topic-meta-data h5 {
position: absolute; position: absolute;
left: 100px; left: 75px;
top: 0px; top: 4px;
z-index: 1; z-index: 1;
font-size: 13px;
width: 100%; width: 100%;
a { a {
font-weight: bold; font-weight: bold;
@ -270,7 +270,7 @@ nav.post-controls {
} }
} }
.topic-meta-data-inside { .topic-meta-data-inside {
margin: -3px 0 0 0; margin: -10px 0 0 0;
color: $secondary_text_color; color: $secondary_text_color;
} }
.topic-meta-data {padding-top: 20px;} .topic-meta-data {padding-top: 20px;}
@ -565,8 +565,8 @@ iframe {
.names { .names {
position: absolute; position: absolute;
left: 110px; left: 66px;
top: 5px; top: 30px;
width: 400px; width: 400px;
z-index: 1; z-index: 1;
} }
@ -579,8 +579,7 @@ iframe {
width: 45px; width: 45px;
height: 45px; height: 45px;
position: absolute; position: absolute;
left: 30px; top: 35px;
top: 10px;
} }
.contents { .contents {
@ -643,8 +642,8 @@ iframe {
} }
.contents .cooked { .contents .cooked {
margin-right: 50px; margin-right: 60px;
margin-top: 30px; margin-top: 37px;
word-wrap: break-word; word-wrap: break-word;
h1, h2, h3, h4, h5, h6 { margin: 30px 0 10px; } h1, h2, h3, h4, h5, h6 { margin: 30px 0 10px; }
@ -723,7 +722,7 @@ iframe {
.topic-meta-data { .topic-meta-data {
h3 { h3 {
font-size: 13px; font-size: 15px;
margin-top: 5px; margin-top: 5px;
overflow: hidden; overflow: hidden;
line-height: 1.2em; line-height: 1.2em;
@ -797,8 +796,7 @@ blockquote { /* solo quotes */
.gutter { .gutter {
float: left; float: left;
margin-top: 5px;
margin-top: 6px;
ul {margin: 0;} ul {margin: 0;}
padding-left: 10px; padding-left: 10px;
@ -826,7 +824,7 @@ blockquote { /* solo quotes */
float: left; float: left;
position: relative; position: relative;
border-top: 1px solid $primary_border_color; border-top: 1px solid $primary_border_color;
padding: 10px 0 15px 0; padding: 20px 0 15px 0;
&.highlighted { &.highlighted {
background-color: $emphasis_background_color; background-color: $emphasis_background_color;
} }
@ -846,9 +844,9 @@ blockquote { /* solo quotes */
//columns //columns
.span14 { width: 70%; padding-left: 1%; } //main content .span14 { width: 70%; } //main content
.span2 {width: 9%; } .span2 {width: 6%; }
.span11 {width: 85%; padding-left: 2%;} .span11 {width: 86%; padding-left: 2%;}
.span5 {width: 19%; padding-left: 1%; } .span5 {width: 19%; padding-left: 1%; }