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

adding background to topic-list, making max-width larger on extra-info-wrapper, and changing viewport config

This commit is contained in:
Kris Aubuchon 2014-07-02 09:44:03 -04:00
parent a4b7b561dc
commit e0194e69a5
4 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/stylesheets/common/base/_topic-list.scss
View File

@ -18,6 +18,7 @@
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) {

10
app/assets/stylesheets/common/foundation/base.scss
View File

@ -11,7 +11,15 @@ 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
// -------------------------------------------------- // --------------------------------------------------

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

@ -537,10 +537,9 @@ iframe {
.extra-info-wrapper { .extra-info-wrapper {
float: left; float: left;
width: 78%; max-width: 875px;
max-width: 800px;
.topic-statuses { .topic-statuses {
i { color: $header_primary; } i { color: $header_primary; }
.unpinned { color: $header_primary; } .unpinned { color: $header_primary; }
} }
.topic-link { color: $header_primary; } .topic-link { color: $header_primary; }
@ -549,14 +548,14 @@ iframe {
@include medium-width { @include medium-width {
.extra-info-wrapper { .extra-info-wrapper {
max-width: 740px; max-width: 770px;
} }
} }
@include small-width { @include small-width {
.extra-info-wrapper { .extra-info-wrapper {
max-width: 680px; max-width: 720px;
} }
} }
@ -564,7 +563,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.2em; line-height: 1.3em;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;

5
app/views/layouts/_head.html.erb
View File

@ -1,5 +1,6 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, user-scalable=yes, minimum-scale=0.75, maximum-scale=3.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 %>">
@ -11,4 +12,4 @@
<%= render partial: "common/special_font_face" %> <%= render partial: "common/special_font_face" %>
<%= render partial: "common/discourse_stylesheet" %> <%= render partial: "common/discourse_stylesheet" %>
<%= discourse_csrf_tags %> <%= discourse_csrf_tags %>