github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-01-30 05:27:38 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #2571 from awesomerobot/master

Browse Source 
fixing lingering gutter width issues
This commit is contained in:
Sam 2014-07-23 10:42:25 +10:00
commit 375f0815b6
2 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -701,28 +701,31 @@ blockquote > *:last-child {
} }
.gutter { .gutter {
float: left; margin-top: 13px;
margin-top: 15px; width: 100%;
padding-left: 11px; box-sizing: border-box;
width: 341px; z-index: 1;
ul {margin: 0;} ul {margin: 0;}
li {margin-bottom: 10px;} li {margin-bottom: 10px;}
i {font-size: 12px;} i {font-size: 12px;}
.reply-new, .track-link {
padding-left: 27px;
display: block;
overflow: hidden;
}
.post-links { .post-links {
list-style-type: none; list-style-type: none;
padding-left: 19px;
position: relative; position: relative;
margin-left: 5px;
line-height: 18px; line-height: 18px;
word-wrap: break-word; word-wrap: break-word;
a i { a i {
position: absolute; position: relative;
left: 0; margin-right: 7px;
margin-right: 15px; margin-top: -2px;
margin-bottom: 20px; margin-left: -17px;
margin-top: 2px;
} }
a.track-link {color: scale-color($primary, $lightness: 50%);} a.track-link {color: scale-color($primary, $lightness: 50%);}
a.toggle-more { a.toggle-more {
@ -741,6 +744,7 @@ $topic-avatar-width: 45px;
width: $topic-body-width; width: $topic-body-width;
float: left; float: left;
position: relative; position: relative;
z-index: 2;
border-top: 1px solid scale-color-diff(); border-top: 1px solid scale-color-diff();
padding: 12px $topic-body-width-padding 15px $topic-body-width-padding; padding: 12px $topic-body-width-padding 15px $topic-body-width-padding;
&.highlighted { &.highlighted {
@ -752,6 +756,8 @@ $topic-avatar-width: 45px;
padding-top: 16px; padding-top: 16px;
width: $topic-avatar-width; width: $topic-avatar-width;
float: left; float: left;
position: relative;
z-index: 2;
.wiki { .wiki {
margin-top: 14px; margin-top: 14px;
@ -981,7 +987,7 @@ a.attachment:before {
.private_message .gutter:before, .deleted-topic .gutter:before, .read_restricted .gutter:before { .private_message .gutter:before, .deleted-topic .gutter:before, .read_restricted .gutter:before {
display: block; display: block;
position: absolute; position: absolute;
left: 10px; left: 767px;
color: scale-color-diff(); color: scale-color-diff();
font: 90px/1 FontAwesome; font: 90px/1 FontAwesome;
content: "\f05c"; content: "\f05c";
@ -1049,9 +1055,6 @@ and (max-width : 1140px) {
width: 720px; width: 720px;
} }
} }
.gutter {
width: 200px;
}
.post-cloak .reply-to-tab { .post-cloak .reply-to-tab {
right: 320px; right: 320px;
} }
@ -1065,9 +1068,6 @@ and (max-width : 975px) {
width: 650px; width: 650px;
} }
} }
.gutter {
width: 150px;
}
.post-cloak .reply-to-tab { .post-cloak .reply-to-tab {
right: 300px; right: 300px;
} }
@ -1075,9 +1075,6 @@ and (max-width : 975px) {
@media only screen @media only screen
and (max-width : 940px) { and (max-width : 940px) {
.gutter {
width: 100px;
}
.post-cloak .reply-to-tab { .post-cloak .reply-to-tab {
right: 250px; right: 250px;
} }

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

@ -69,17 +69,17 @@
.private_message #topic-title .private-message-glyph { display: inline; } .private_message #topic-title .private-message-glyph { display: inline; }
a.reply-new { a.reply-new {
position: absolute; margin-top: 3px;
margin-top: -2px;
color: scale-color($primary, $lightness: 50%); color: scale-color($primary, $lightness: 50%);
i { i {
margin-right: 5px; margin-right: 3px;
background: $secondary; background: $secondary;
border: 1px solid scale-color-diff(); border: 1px solid scale-color-diff();
padding: 1.5px 3px; padding: 1.5px 3px;
border-radius: 20px; border-radius: 20px;
transition: linear 0.15s; transition: linear 0.15s;
-webkit-transition: linear 0.15s; -webkit-transition: linear 0.15s;
margin-left: -20px;
} }
} }
@ -294,7 +294,7 @@ kbd
@media only screen @media only screen
and (max-width : 940px) { and (max-width : 940px) {
#topic-progress, #topic-progress-expanded { #topic-progress, #topic-progress-expanded {
left: 295px; left: 295px;
} }