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

Merge pull request #1589 from awesomerobot/master 

Some underlying topic title clean-up, fixed private message user list alignment
This commit is contained in:
Sam 2013-10-29 17:49:28 -07:00
parent 34be27f425 60d9b4d808
commit 36352e437f
4 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/assets/stylesheets/desktop/discourse.scss
View File

@ -35,6 +35,9 @@ body {
} }
} }
/**/
@include small-width { @include small-width {
body { body {
min-width: $small-width; min-width: $small-width;
@ -117,9 +120,6 @@ body {
color: #e45735; color: #e45735;
} }
a.star { a.star {
display: inline-block;
font-size: 15px;
line-height: 1;
color: #cacaca; color: #cacaca;
&:before { &:before {
font-family: "FontAwesome"; font-family: "FontAwesome";
@ -167,6 +167,8 @@ body {
} }
} }
} }
/**/
.message { .message {
@include border-radius-all(8px); @include border-radius-all(8px);
background-color: $white; background-color: $white;
@ -229,15 +231,14 @@ blockquote {
} }
.topic-statuses { .topic-statuses {
display: inline-block; float: left;
margin: 0; margin: 1px 3px 0 0;
padding: 0; padding: 0;
.topic-status { .topic-status {
padding: 5px 2px 0 0; padding: 0 2px 0 0;
margin: 0; margin: 0;
display: inline-block;
i { i {
font-size: 15px; font-size: 15px;
color: darken($white, 60%); color: darken($white, 60%);
} }
} }

2
app/assets/stylesheets/desktop/topic-list.scss
View File

@ -113,8 +113,6 @@
padding-right: 0; padding-right: 0;
.icon-star { .icon-star {
position: relative; position: relative;
top: -1px;
font-size: 15px !important;
} }
+ .main-link { + .main-link {
padding-left: 0; padding-left: 0;

25
app/assets/stylesheets/desktop/topic-post.scss
View File

@ -220,7 +220,6 @@ nav.post-controls {
a.star { a.star {
display: inline-block; display: inline-block;
float: left; float: left;
font-size: 20px !important;
} }
#main a.star.starred { #main a.star.starred {
@ -325,7 +324,7 @@ a.star {
.participants { .participants {
.user:not(:first-of-type) {margin-top: 10px;} .user {float: left; margin: 7px 20px 7px 0;}
} }
@ -424,8 +423,13 @@ span.post-count {
} }
#topic-title { #topic-title {
z-index: 1000; z-index: 1000;
padding: 25px 10px 15px 10px; padding: 14px 0 8px 0;
h1 { line-height: 1em; overflow: hidden; }
.topic-statuses {margin-top: -2px; .icon-pushpin {margin-top: -1px;}}
.star {font-size: 20px; margin-top: 5px;}
.chzn-container {vertical-align: middle;} .chzn-container {vertical-align: middle;}
} }
@ -462,23 +466,25 @@ iframe {
.topic-statuses {margin-right: 5px;} .topic-statuses {margin-right: 5px;}
} }
#main .inner a.star {margin-top: 6px;}
.extra-info { .extra-info {
h1 { h1 {
margin: 7px 0 0 25px; margin: 5px 0 0 0;
font-size: 2em;
line-height: 1em; line-height: 1em;
a:not(.badge-category) {margin-left: -10px;} overflow: hidden;
} }
a.star { a.star {
margin-right: 5px; margin-right: 5px;
margin-top: 6px; font-size: 20px;
margin-top: 5px;
} }
.topic-statuses {margin-top: -2px;}
.badge-category { .badge-category {
vertical-align: middle ; vertical-align: top;
} }
} }
@ -964,7 +970,6 @@ clear: both;
} }
} }
input#edit-title {margin-left: 10px;}
a.attachment:before { a.attachment:before {
display: inline-block; display: inline-block;

11
app/assets/stylesheets/desktop/topic.scss
View File

@ -29,18 +29,15 @@ margin-left: 10px;
#topic-title { #topic-title {
margin-bottom: 20px; margin-bottom: 20px;
margin: -20px 0 0 0; .star {margin-right: 8px;}
.topic-statuses {margin-left: 5px;}
h1 { h1 {
font-size: 2em;
font-size: 2.2em;
line-height: 1em;
margin: 0; margin: 0;
a.badge-category {vertical-align: middle;} a.badge-category {vertical-align: top;}
a.edit-topic {font-size: 15px;} a.edit-topic {font-size: 15px; position: absolute; margin-left: 8px;}
} }