github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-22 13:04:10 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #2498 from awesomerobot/master

Browse Source 
fixing a handful of issues
This commit is contained in:
Sam 2014-07-03 17:32:14 +10:00
commit 2ba35ae707
5 changed files with 9 additions and 7 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) {

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

@ -538,8 +538,7 @@ 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; }
@ -550,14 +549,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;
} }
} }
@ -565,7 +564,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;

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

@ -131,6 +131,7 @@ a:hover.reply-new {
height: 20px; height: 20px;
text-align: center; text-align: center;
margin-bottom: 0; margin-bottom: 0;
font-size: 16px;
} }
button.btn { button.btn {
float: right; float: right;

1
app/assets/stylesheets/mobile/topic.scss
View File

@ -90,6 +90,7 @@
width: 45px; width: 45px;
height: 20px; height: 20px;
text-align: center; text-align: center;
font-size: 16px;
} }
button.btn { button.btn {
float: right !important; float: right !important;

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

@ -1,5 +1,5 @@
<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 +11,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 %>