From 045b1b0d96aeb827c83f997bd715f2b0284b5723 Mon Sep 17 00:00:00 2001 From: Kris Aubuchon Date: Sat, 14 Sep 2013 23:28:28 -0400 Subject: [PATCH] fixed history modal, topic progress now sticky to last post, edits heatmap is back, date/edit links now grey --- .../stylesheets/mobile/history.css.scss | 12 ++++- app/assets/stylesheets/mobile/modal.css.scss | 4 +- .../stylesheets/mobile/topic-post.css.scss | 5 ++ app/assets/stylesheets/mobile/topic.css.scss | 52 ++++++++++++------- 4 files changed, 51 insertions(+), 22 deletions(-) diff --git a/app/assets/stylesheets/mobile/history.css.scss b/app/assets/stylesheets/mobile/history.css.scss index 430d69a6918..c431b2680d4 100644 --- a/app/assets/stylesheets/mobile/history.css.scss +++ b/app/assets/stylesheets/mobile/history.css.scss @@ -6,8 +6,8 @@ .modal.history-modal { .modal-inner-container { - min-width: 960px; - min-height: 500px; + min-width: 100%; + min-height: 100%; } ins { @@ -18,7 +18,9 @@ } .modal-header { height: 42px; + padding-bottom: 10px; } + .modal-body {padding-top: 0px;} .history-loading { margin: 25px 0; width: 120px; @@ -34,5 +36,11 @@ select { height: auto; width: auto; + font-size: 16px; + position: fixed; + margin-top: -45px; + background-color: #fff; } } + +.offset1 {display: none;} diff --git a/app/assets/stylesheets/mobile/modal.css.scss b/app/assets/stylesheets/mobile/modal.css.scss index 402f105e359..da4381dcd95 100644 --- a/app/assets/stylesheets/mobile/modal.css.scss +++ b/app/assets/stylesheets/mobile/modal.css.scss @@ -45,9 +45,11 @@ } .modal-middle-container { margin-top: 10%; + max-width: 100%; + } .modal-inner-container { - max-width: 710px; + max-width: 100%; margin: 0 auto; background-color: #ffffff; border: 1px solid #999; diff --git a/app/assets/stylesheets/mobile/topic-post.css.scss b/app/assets/stylesheets/mobile/topic-post.css.scss index 720e7480186..ff0b7e0bcf9 100644 --- a/app/assets/stylesheets/mobile/topic-post.css.scss +++ b/app/assets/stylesheets/mobile/topic-post.css.scss @@ -16,8 +16,10 @@ nav.post-controls { button {color: #aaa; border-radius: 4px; margin-right: 2px; + } + span.badge-posts { margin-right: 5px; } @@ -34,6 +36,7 @@ button.create { border: 1px solid #888; margin-right: 0; color: #888; + padding-right: 7px; } .like { border-right: 1px solid #ddd; @@ -459,3 +462,5 @@ blockquote { .gutter { display: none; } +.posts-wrapper { position: relative; +} \ No newline at end of file diff --git a/app/assets/stylesheets/mobile/topic.css.scss b/app/assets/stylesheets/mobile/topic.css.scss index ebf8aec63b4..4ff98acefc5 100644 --- a/app/assets/stylesheets/mobile/topic.css.scss +++ b/app/assets/stylesheets/mobile/topic.css.scss @@ -1,34 +1,34 @@ -.topic-meta-data {width: 100%; - - -h3 a {margin-left: 10px;} - -} -.topic-meta-data a {float: left; - - - +.topic-meta-data { + width: 100%; + h3 a {margin-left: 10px;} + a {float: left;} } +.post-info a {color: #aaa;} - -.post-info {float: right; margin-top: -28px; margin-right: 15px; - - +.topic-meta-data-inside { + float: right; + margin-top: -28px; + margin-right: 5px; } -.edits {margin-right: 60px;} +.post-info { + display: inline-block; +} -#topic-title {margin-bottom: 20px; +.edits {margin-right: 5px;} + +#topic-title { + margin-bottom: 20px; margin: 0 60px 10px 20px; line-height: 1.7em; - - -h1 {font-size: 1.5em; margin:0; +h1 { + font-size: 1.5em; + margin:0; a.edit-topic {font-size: 15px;} @@ -121,3 +121,17 @@ a.edit-topic {font-size: 15px;} background-color: #C6F3B6; } } + +#topic-progress-wrapper.docked { + #topic-progress { + } + position: absolute; +} + +.topic-post:last-of-type {padding-bottom: 40px;} + +.heatmap-high {color: #f77 !important;} +.heatmap-med {color: #a00 !important;} +.heatmap-low {color: #700 !important;} + +