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 #2774 from awesomerobot/master 

changing the header now that fullname was dropped
This commit is contained in:
Jeff Atwood 2014-09-09 11:52:50 -07:00
parent 79030c874e ebe71ea491
commit bcfd2778d7
3 changed files with 22 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/stylesheets/common/base/header.scss
View File

@ -1,5 +1,5 @@
.d-header { .d-header {
min-width: 100%; width: 100%;
position: absolute; position: absolute;
top: 0; top: 0;
z-index: 1001; z-index: 1001;

11
app/assets/stylesheets/desktop/discourse.scss
View File

@ -14,17 +14,6 @@ html {font-size: 14px/19px;}
} }
} }
@include small-width {
body {
min-width: 760px;
}
.container,
.full-width {
min-width: 760px;
}
}
@media all @media all
and (max-width : 570px) { and (max-width : 570px) {
body { body {

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

@ -523,19 +523,32 @@ iframe {
.extra-info-wrapper { .extra-info-wrapper {
float: left; float: left;
width: 46%; width: 78%;
@media all and (max-width : 1080px) {
width: 75%;
}
@media all and (max-width : 870px) {
width: 70%;
}
@media all and (max-width : 725px) {
width: 61%;
}
.topic-statuses { .topic-statuses {
i { color: $header_primary; } i { color: $header_primary; }
i.fa-envelope { color: $danger; } i.fa-envelope { color: $danger; }
.unpinned { color: $header_primary; } .unpinned { color: $header_primary; }
} }
.topic-link { color: $header_primary;
.topic-link {
color: $header_primary;
display: block; display: block;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
} }
@ -544,7 +557,6 @@ text-overflow: ellipsis;
margin: 5px 0 0 0; margin: 5px 0 0 0;
font-size: 1.6em; font-size: 1.6em;
line-height: 1.3em; line-height: 1.3em;
width: 820px;
} }
@ -1027,11 +1039,6 @@ span.highlighted {
@media all @media all
and (max-width : 1140px) { and (max-width : 1140px) {
.extra-info {
h1 {
width: 720px;
}
}
.post-cloak .reply-to-tab { .post-cloak .reply-to-tab {
right: 320px; right: 320px;
} }
@ -1040,11 +1047,6 @@ and (max-width : 1140px) {
@media all @media all
and (max-width : 975px) { and (max-width : 975px) {
.extra-info {
h1 {
width: 650px;
}
}
.post-cloak .reply-to-tab { .post-cloak .reply-to-tab {
right: 300px; right: 300px;
} }
@ -1059,11 +1061,7 @@ and (max-width : 940px) {
@media all @media all
and (max-width : 870px) { and (max-width : 870px) {
.extra-info {
h1 {
width: 520px;
}
}
.gutter { .gutter {
display: none; display: none;
} }