IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
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

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

@ -1,10 +1,10 @@
@import "common/foundation/variables"; @import "common/foundation/variables";
.topic-post { .topic-post {
border-top: 1px solid #ddd; border-top: 1px solid #ddd;
padding: 20px 0 10px 0; padding: 10px 0 10px 0;
&:first-of-type { &:first-of-type {
border-top: none; border-top: none;
} }
} }
@ -22,7 +22,7 @@ span.badge-posts {
margin-right: 5px; margin-right: 5px;
} }
.show-replies { .show-replies {
display: none; display: none;
i { i {
margin-left: 5px; margin-left: 5px;
@ -30,17 +30,17 @@ span.badge-posts {
} }
button.create { button.create {
float: right !important; float: right !important;
border: 1px solid #888; border: 1px solid #888;
margin-right: 0; margin-right: 0;
color: #888; color: #888;
} }
.like { .like {
border-right: 1px solid #ddd; border-right: 1px solid #ddd;
} }
.create i { .create i {
margin-right: 5px; margin-right: 5px;
} }
@ -90,7 +90,7 @@ button {
.embedded-posts { .embedded-posts {
.topic-meta-data h5 a { .topic-meta-data h5 a {
margin-left: 10px; margin-left: 10px;
} }
@ -102,7 +102,7 @@ button {
} }
.post-actions { .post-actions {
margin-left: 10px; margin-left: 10px;
margin-top: 2px; margin-top: 2px;
} }
@ -111,9 +111,9 @@ a.reply-to-tab {
} }
a.star { a.star {
display: inline-block; display: inline-block;
float: left; float: left;
font-size: 1.4em !important; font-size: 1.4em !important;
margin-top: 3px; margin-top: 3px;
} }
@ -126,25 +126,25 @@ a.star {
} }
.topic-summary { .topic-summary {
.btn { .btn {
border-radius: 0 4px 0 4px; border-radius: 0 4px 0 4px;
} }
.topic-links li { .topic-links li {
word-wrap: break-word; word-wrap: break-word;
} }
border-radius: 5px; border-radius: 5px;
margin: 15px 10px 20px 10px; margin: 15px 10px 20px 10px;
border: 1px solid #ddd; border: 1px solid #ddd;
h3 { h3 {
margin-bottom: 4px; margin-bottom: 4px;
color: #323232; color: #323232;
line-height: 23px; line-height: 23px;
} }
h4 { h4 {
margin: 0 0 3px 0; margin: 0 0 3px 0;
color: #6c7376; color: #6c7376;
@ -152,17 +152,17 @@ a.star {
font-size: 12px; font-size: 12px;
line-height: 15px; line-height: 15px;
} }
p, p,
.participants { .participants {
margin: 0 0 7px; margin: 0 0 7px;
} }
ul { ul {
margin: 0; margin: 0;
list-style: none; list-style: none;
} }
.avatars { .avatars {
> div { > div {
float: left; float: left;
@ -179,7 +179,7 @@ a.star {
line-height: 14px; line-height: 14px;
} }
} }
.avatar { .avatar {
float: left; float: left;
margin-right: 4px; margin-right: 4px;
@ -233,7 +233,8 @@ a.star {
background: #ddd; background: #ddd;
&:hover { &:hover {
background: #ccc; background: #ccc;
color: #444; border-bottom: 1px solid #ccc; color: #444;
border-bottom: 1px solid #ccc;
} }
&.collapsed { &.collapsed {
@ -257,7 +258,6 @@ a.star {
clear: left; clear: left;
margin-top: 10px; margin-top: 10px;
padding: 0 10px 0 10px; padding: 0 10px 0 10px;
th.views, td.views, td.activity, th.activity, th.likes, td.likes { th.views, td.views, td.activity, th.activity, th.likes, td.likes {
display: none; display: none;
} }
@ -269,20 +269,21 @@ a.star {
.title { .title {
font-size: 14px; line-height: 8px; font-size: 14px; line-height: 8px;
} }
} }
span.post-count { span.post-count {
background: #000; background: #000;
color: #fff; color: #fff;
opacity: .8; opacity: .8;
} }
#topic-footer-buttons { #topic-footer-buttons {
.btn { .btn {
margin-bottom: 5px; margin-bottom: 5px;
margin-right: 10px; margin-right: 10px;
.icon-star {margin-right: 5px;} .icon-star {margin-right: 5px;}
} }
@ -302,14 +303,14 @@ span.post-count {
.quote-button { .quote-button {
display: none; display: none;
position: absolute; position: absolute;
background-color: #666; background-color: #666;
color: #fff; color: #fff;
padding: 10px; padding: 10px;
width: 90px; width: 90px;
&:hover { &:hover {
background-color: #999; background-color: #999;
cursor: pointer; cursor: pointer;
} }
} }
@ -334,16 +335,16 @@ iframe {
} }
.dropdown-menu li { .dropdown-menu li {
margin: 5px 0; margin: 5px 0;
} }
.btn-group { .btn-group {
margin-top: 50px; margin-top: 50px;
position: relative; position: relative;
} }
.dropdown-toggle { .dropdown-toggle {
float: left; float: left;
position: relative; position: relative;
} }
@ -353,21 +354,21 @@ iframe {
.modal-body { .modal-body {
input[type=text] { input[type=text] {
font-size: 16px; font-size: 16px;
display: block; display: block;
margin-top: 10px; margin-top: 10px;
} }
} }
#share-link { #share-link {
width: 265px; width: 265px;
margin-left: -4px; margin-left: -4px;
h3 { h3 {
margin: 5px 0; margin: 5px 0;
} }
input[type=text] { input[type=text] {
font-size: 16px; font-size: 16px;
width: 92%; width: 92%;
@ -375,16 +376,16 @@ iframe {
} }
} }
#selected-posts { #selected-posts {
padding-left: 20px; padding-left: 20px;
.btn { .btn {
margin-bottom: 10px; margin-bottom: 10px;
} }
} }
.post-select { .post-select {
float: right; float: right;
margin-right: 20px; margin-right: 20px;
margin-top: -20px; margin-top: -20px;
} }
@ -397,11 +398,11 @@ iframe {
} }
#show-topic-admin { #show-topic-admin {
color: #7b7b7b; color: #7b7b7b;
right: 0px; right: 0px;
border-right: 0; border-right: 0;
padding-right: 4px; padding-right: 4px;
padding-left: 5px; padding-left: 5px;
border-radius: 4px 0 0 4px; border-radius: 4px 0 0 4px;
} }
@ -409,9 +410,17 @@ iframe {
font-size: 36px; 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;} span.btn-text {display: none;}
@ -425,7 +434,6 @@ blockquote {
a { a {
margin: 0; margin: 0;
} }
.back:before, .back:before,
.quote-other-topic:before { .quote-other-topic:before {
display: inline-block; display: inline-block;
@ -443,8 +451,11 @@ blockquote {
.quote .title { .quote .title {
border-left: 5px solid #bebebe; border-left: 5px solid #bebebe;
background-color: #f1f1f1; background-color: #f1f1f1;
padding: 10px 10px 0 12px; padding: 10px 10px 0 12px;
.avatar {margin-right: 7px;} .avatar { margin-right: 7px; }
} }
.gutter { display: none; }

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

@ -5,7 +5,7 @@
h3 a {margin-left: 10px;} h3 a {margin-left: 10px;}
} }
.topic-meta-data a {float: left; .topic-meta-data a {float: left;
@ -14,16 +14,15 @@ h3 a {margin-left: 10px;}
.post-info {float: right; margin-top: -28px; margin-right: 15px; .post-info {float: right; margin-top: -28px; margin-right: 15px;
} }
.edits {margin-right: 60px;} .edits {margin-right: 60px;}
#topic-progress-wrapper {display: none;}
#topic-title {margin-bottom: 20px; #topic-title {margin-bottom: 20px;
margin: 0 60px 10px 20px; margin: 0 60px 10px 20px;
line-height: 1.7em; line-height: 1.7em;
@ -40,4 +39,85 @@ a.edit-topic {font-size: 15px;}
#topic-closing-info { #topic-closing-info {
margin-left: 10px; 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;
}
}