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

handful of alignment fixes

This commit is contained in:
Kris Aubuchon 2014-06-19 14:04:23 -04:00
parent 5cb97d74bd
commit e4d90038cf
5 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/templates/search.js.handlebars
View File

@ -1,6 +1,6 @@
{{view 'search-text-field' value=term searchContextEnabled=searchContextEnabled searchContext=searchContext id="search-term"}} {{view 'search-text-field' value=term searchContextEnabled=searchContextEnabled searchContext=searchContext id="search-term"}}
{{#if searchContext}} {{#if searchContext}}
<div> <div class='search-context'>
<label> <label>
{{input type="checkbox" name="searchContext" checked=searchContextEnabled}} {{searchContextDescription}} {{input type="checkbox" name="searchContext" checked=searchContextEnabled}} {{searchContextDescription}}
</label> </label>

4
app/assets/javascripts/discourse/templates/topic-progress.js.handlebars
View File

@ -1,13 +1,13 @@
{{#if expanded}} {{#if expanded}}
<nav id='topic-progress-expanded'> <nav id='topic-progress-expanded'>
<button {{action jumpTop}} {{bind-attr disabled=jumpTopDisabled}} class='btn full'> <button {{action jumpTop}} {{bind-attr disabled=jumpTopDisabled}} class='btn full no-text'>
<i class="fa fa-caret-up"></i> <i class="fa fa-caret-up"></i>
{{i18n topic.progress.go_top}} {{i18n topic.progress.go_top}}
</button> </button>
<div class='jump-form'> <div class='jump-form'>
{{input value=toPostNumber}} <button {{action jumpPost}} class='btn'>{{i18n topic.progress.go}}</button> {{input value=toPostNumber}} <button {{action jumpPost}} class='btn'>{{i18n topic.progress.go}}</button>
</div> </div>
<button {{action jumpBottom}} {{bind-attr disabled=jumpBottomDisabled}} class='btn full jump-bottom'> <button {{action jumpBottom}} {{bind-attr disabled=jumpBottomDisabled}} class='btn full no-text jump-bottom'>
{{i18n topic.progress.go_bottom}} {{i18n topic.progress.go_bottom}}
<i class="fa fa-caret-down"></i> <i class="fa fa-caret-down"></i>
</button> </button>

5
app/assets/stylesheets/common/base/header.scss
View File

@ -236,6 +236,11 @@
margin: 5px; margin: 5px;
padding: 5px; padding: 5px;
} }
.search-context {
padding: 0 5px;
}
.searching { .searching {
display: block; display: block;
position: absolute; position: absolute;

6
app/assets/stylesheets/common/base/user-badges.scss
View File

@ -4,7 +4,7 @@
color: darken($primary, 40%);; color: darken($primary, 40%);;
border: 1px solid lighten($primary, 60%); border: 1px solid lighten($primary, 60%);
font-size: $base-font-size * 0.86; font-size: $base-font-size * 0.86;
line-height: 16px; line-height: 19px;
margin: 0; margin: 0;
display: inline-block; display: inline-block;
background-color: $secondary; background-color: $secondary;
@ -57,7 +57,7 @@
/* Badge listing in /badges. */ /* Badge listing in /badges. */
table.badges-listing { table.badges-listing {
margin: 20px 0; margin: 20px 0;
border-bottom: 1px solid $primary; border-bottom: 1px solid scale-color-diff();
.user-badge { .user-badge {
font-size: $base-font-size; font-size: $base-font-size;
@ -78,7 +78,7 @@ table.badges-listing {
} }
tr { tr {
border-top: 1px solid $primary; border-top: 1px solid scale-color-diff();
} }
} }

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

@ -850,7 +850,7 @@ blockquote { /* solo quotes */
} }
.dropdown-menu a { .dropdown-menu a {
display: block; display: block;
padding: 3px 15px; padding: 3px 9px;
clear: both; clear: both;
font-weight: normal; font-weight: normal;
line-height: 18px; line-height: 18px;