github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-12-04 03:23:39 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1597 from awesomerobot/master

Browse Source 
topic vertical alignment fixes, admin logs table width fix
This commit is contained in:
Neil Lalonde 2013-10-31 06:58:10 -07:00
commit d3c7bbe268
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/stylesheets/common/admin/admin_base.scss
View File

@ -756,7 +756,6 @@ table.api-keys {
}
.screened-emails, .screened-urls, .screened-ip-addresses {
width: 900px;
.email, .url {
width: 300px;
}

2
app/assets/stylesheets/desktop/onebox.scss
View File

@ -17,7 +17,7 @@ a.loading-onebox {
> .source {
margin-bottom: 10px;
margin-right: 10px;
padding: 10px 0;
padding: 0 0 10px 0;
display: block;
color: $black;
position: relative;

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

@ -16,6 +16,7 @@
.btn {
float: right;
margin-left: 8px;
margin-bottom: 10px;
font-size: 16px;
font-weight: normal;
}

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

@ -333,8 +333,6 @@ a.star {
}
&:active {
@include box-shadow(inset 0 1px 3px rgba($black, 0.2));
}
@ -501,6 +499,8 @@ iframe {
.contents .cooked {
padding-right: 30px;
h1, h2, h3 {margin: 10px 0;}
ul, ol {margin: 15px 0;}
li p {margin: 3px 0;}
}
.modal-body {
@ -599,6 +599,9 @@ position: relative;
}
blockquote { /* solo quotes */
margin: 14px 0;
padding: 12px;
@ -672,7 +675,7 @@ blockquote { /* solo quotes */
float: left;
position: relative;
width: 720px;
padding: 10px 0 15px 20px;
padding: 10px 10px 15px 20px;
}
.posts-wrapper {