Merge pull request #2496 from discourse/revert-2495-master

Revert "background on topic-list, more width on extra-info-wrapper, meta...
This commit is contained in:
Régis Hanol 2014-07-02 16:55:52 +02:00
commit 791fb704f7
4 changed files with 9 additions and 18 deletions

View File

@ -18,7 +18,6 @@
border-collapse: separate; border-collapse: separate;
border-spacing: 0; border-spacing: 0;
border-top: 1px solid scale-color-diff(); border-top: 1px solid scale-color-diff();
background: rgba($secondary, .8);
> tbody > tr { > tbody > tr {
&:nth-child(even) { &:nth-child(even) {

View File

@ -11,15 +11,7 @@ html {
background-color: $secondary; background-color: $secondary;
overflow-y: scroll; overflow-y: scroll;
-webkit-font-smoothing: subpixel-antialiased; -webkit-font-smoothing: subpixel-antialiased;
height: 100%; }
body {
height: 100%;
#main {
height: 100%;
}
}
}
// Links // Links
// -------------------------------------------------- // --------------------------------------------------

View File

@ -538,7 +538,8 @@ iframe {
.extra-info-wrapper { .extra-info-wrapper {
float: left; float: left;
max-width: 875px; width: 78%;
max-width: 800px;
.topic-statuses { .topic-statuses {
i { color: $header_primary; } i { color: $header_primary; }
.unpinned { color: $header_primary; } .unpinned { color: $header_primary; }
@ -549,14 +550,14 @@ iframe {
@include medium-width { @include medium-width {
.extra-info-wrapper { .extra-info-wrapper {
max-width: 770px; max-width: 740px;
} }
} }
@include small-width { @include small-width {
.extra-info-wrapper { .extra-info-wrapper {
max-width: 720px; max-width: 680px;
} }
} }
@ -564,7 +565,7 @@ iframe {
h1 { h1 {
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.2em;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;

View File

@ -1,6 +1,5 @@
<meta name="viewport" content="width=device-width, user-scalable=yes, minimum-scale=0.75, maximum-scale=3.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="author" content=""> <meta name="author" content="">
<meta name="generator" content="Discourse <%= Discourse::VERSION::STRING %> - https://github.com/discourse/discourse version <%= Discourse.git_version %>"> <meta name="generator" content="Discourse <%= Discourse::VERSION::STRING %> - https://github.com/discourse/discourse version <%= Discourse.git_version %>">