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

Merge branch 'master' of git://github.com/awesomerobot/discourse into awesomerobot-master 

Conflicts:
	app/assets/stylesheets/mobile/topic-post.css.scss
	app/assets/stylesheets/mobile/topic.css.scss
This commit is contained in:
Robin Ward 2013-09-14 00:39:08 -04:00
parent b39d39dbb6 e1b11c62ea
commit 10c4dee67c
2 changed files with 152 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@
.topic-post {
border-top: 1px solid #ddd;
padding: 20px 0 10px 0;
padding: 10px 0 10px 0;
&:first-of-type {
border-top: none;
}
@ -233,7 +233,8 @@ a.star {
background: #ddd;
&:hover {
background: #ccc;
color: #444; border-bottom: 1px solid #ccc;
color: #444;
border-bottom: 1px solid #ccc;
}
&.collapsed {
@ -257,7 +258,6 @@ a.star {
clear: left;
margin-top: 10px;
padding: 0 10px 0 10px;
th.views, td.views, td.activity, th.activity, th.likes, td.likes {
display: none;
}
@ -269,6 +269,7 @@ a.star {
.title {
font-size: 14px; line-height: 8px;
}
}
@ -409,9 +410,17 @@ iframe {
font-size: 36px;
}
.staff a {border-radius: 4px; padding: 4px; margin: -4px 0 0 -4px; background-color: lighten(yellow, 35%);}
.staff a {
border-radius: 4px;
padding: 4px;
margin: -4px 0 0 -4px;
background-color: lighten(yellow, 35%);}
.user-title {margin-left: 8px; display: inline-block; color: #aaa;}
.user-title {
margin-left: 8px;
display: inline-block;
color: #aaa;
}
span.btn-text {display: none;}
@ -425,7 +434,6 @@ blockquote {
a {
margin: 0;
}
.back:before,
.quote-other-topic:before {
display: inline-block;
@ -443,8 +451,11 @@ blockquote {
.quote .title {
border-left: 5px solid #bebebe;
background-color: #f1f1f1;
padding: 10px 10px 0 12px;
.avatar {margin-right: 7px;}
border-left: 5px solid #bebebe;
background-color: #f1f1f1;
padding: 10px 10px 0 12px;
.avatar { margin-right: 7px; }
}
.gutter { display: none; }

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

@ -21,7 +21,6 @@ h3 a {margin-left: 10px;}
.edits {margin-right: 60px;}
#topic-progress-wrapper {display: none;}
#topic-title {margin-bottom: 20px;
margin: 0 60px 10px 20px;
@ -41,3 +40,84 @@ a.edit-topic {font-size: 15px;}
#topic-closing-info {
margin-left: 10px;
}
.docked #topic-progress {
box-shadow: 0 0 3px #aaa;
}
#topic-progress-wrapper {
position: fixed;
width: 0;
right: 0;
bottom: 0px;
z-index: 500;
margin-right: 140px;
outline: 1px solid transparent;
}
#topic-progress {
box-shadow: 0 0 3px #000;
position: relative;
&.hidden {
display: none;
}
border: none;
background-color: #ddd;
color: #666;
width: 130px;
height: 34px;
.nums {
position: relative;
top: 9px;
width: 100%;
text-align: center;
z-index: 1;
}
button {
padding: 0 1px;
cursor: pointer;
z-index: 1000;
position: absolute;
top: 8px;
left: 4px;
border: 0;
background: none;
color: #666;
i {
font-size: 18px;
}
&:nth-of-type(2) {
right: 4px;
left: auto;
}
&:disabled {
cursor: default;
color: #666;
}
}
h4 {
display: inline;
font-size: 18px;
line-height: 15px;
}
.bg {
position: absolute;
top: 0px;
bottom: 0px;
width: 0px;
border-right: 1px solid #ccc;
// background-color: #d4eaf4;
// background-color: #C5E8F7;
background-color: #C6F3B6;
}
}