From aee73d901a976bada65d9fc5340cf7483210917f Mon Sep 17 00:00:00 2001
From: Kris Aubuchon <shout@k-ris.com>
Date: Wed, 2 Jul 2014 23:21:45 -0400
Subject: [PATCH] fixing a handful of issues
---
app/assets/stylesheets/common/base/_topic-list.scss | 1 +
app/assets/stylesheets/desktop/topic-post.scss | 9 ++++-----
app/assets/stylesheets/desktop/topic.scss | 1 +
app/assets/stylesheets/mobile/topic.scss | 1 +
app/views/layouts/_head.html.erb | 4 ++--
5 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss
index 023c1c0f1ab..772394f2c49 100644
--- a/app/assets/stylesheets/common/base/_topic-list.scss
+++ b/app/assets/stylesheets/common/base/_topic-list.scss
@@ -18,6 +18,7 @@
border-collapse: separate;
border-spacing: 0;
border-top: 1px solid scale-color-diff();
+ background: rgba($secondary, .8);
> tbody > tr {
&:nth-child(even) {
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index ae6e22d5c6d..ab4526d0bb7 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -538,8 +538,7 @@ iframe {
.extra-info-wrapper {
float: left;
- width: 78%;
- max-width: 800px;
+ max-width: 875px;
.topic-statuses {
i { color: $header_primary; }
.unpinned { color: $header_primary; }
@@ -550,14 +549,14 @@ iframe {
@include medium-width {
.extra-info-wrapper {
- max-width: 740px;
+ max-width: 770px;
}
}
@include small-width {
.extra-info-wrapper {
- max-width: 680px;
+ max-width: 720px;
}
}
@@ -565,7 +564,7 @@ iframe {
h1 {
margin: 5px 0 0 0;
font-size: 1.6em;
- line-height: 1.2em;
+ line-height: 1.3em;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
diff --git a/app/assets/stylesheets/desktop/topic.scss b/app/assets/stylesheets/desktop/topic.scss
index ccac704a2ad..7e6542acf77 100644
--- a/app/assets/stylesheets/desktop/topic.scss
+++ b/app/assets/stylesheets/desktop/topic.scss
@@ -131,6 +131,7 @@ a:hover.reply-new {
height: 20px;
text-align: center;
margin-bottom: 0;
+ font-size: 16px;
}
button.btn {
float: right;
diff --git a/app/assets/stylesheets/mobile/topic.scss b/app/assets/stylesheets/mobile/topic.scss
index 4a42b6c20ab..0fbf326668f 100644
--- a/app/assets/stylesheets/mobile/topic.scss
+++ b/app/assets/stylesheets/mobile/topic.scss
@@ -90,6 +90,7 @@
width: 45px;
height: 20px;
text-align: center;
+ font-size: 16px;
}
button.btn {
float: right !important;
diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb
index 180569c3958..f215b5d9761 100644
--- a/app/views/layouts/_head.html.erb
+++ b/app/views/layouts/_head.html.erb
@@ -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="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/discourse_stylesheet" %>
- <%= discourse_csrf_tags %>
\ No newline at end of file
+ <%= discourse_csrf_tags %>