codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-28 01:56:01 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

handful of alignment fixes

Browse source
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"}}
{{#if searchContext}}
<div>
<div class='search-context'>
<label>
{{input type="checkbox" name="searchContext" checked=searchContextEnabled}} {{searchContextDescription}}
</label>

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

@ -1,13 +1,13 @@
{{#if 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>
{{i18n topic.progress.go_top}}
</button>
<div class='jump-form'>
{{input value=toPostNumber}} <button {{action jumpPost}} class='btn'>{{i18n topic.progress.go}}</button>
</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}}
<i class="fa fa-caret-down"></i>
</button>

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

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

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

@ -4,7 +4,7 @@
color: darken($primary, 40%);;
border: 1px solid lighten($primary, 60%);
font-size: $base-font-size * 0.86;
line-height: 16px;
line-height: 19px;
margin: 0;
display: inline-block;
background-color: $secondary;
@ -57,7 +57,7 @@
/* Badge listing in /badges. */
table.badges-listing {
margin: 20px 0;
border-bottom: 1px solid $primary;
border-bottom: 1px solid scale-color-diff();
.user-badge {
font-size: $base-font-size;
@ -78,7 +78,7 @@ table.badges-listing {
}
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 {
display: block;
padding: 3px 15px;
padding: 3px 9px;
clear: both;
font-weight: normal;
line-height: 18px;