IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-30 04:34:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1440 from awesomerobot/master

Browse Source 
fixed history modal, topic progress now sticky to last post, others...
This commit is contained in:
Sam 2013-09-15 19:12:37 -07:00
commit 0909beebc2
4 changed files with 51 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/assets/stylesheets/mobile/history.css.scss
View File

@ -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;}

4
app/assets/stylesheets/mobile/modal.css.scss
View File

@ -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;

5
app/assets/stylesheets/mobile/topic-post.css.scss
View File

@ -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;
}

50
app/assets/stylesheets/mobile/topic.css.scss
View File

@ -1,34 +1,34 @@
.topic-meta-data {width: 100%;
.topic-meta-data {
width: 100%;
h3 a {margin-left: 10px;}
}
.topic-meta-data a {float: left;
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;}