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 #2856 from awesomerobot/master 

changes: topic title editor layout, badge alignment in scrolled header
This commit is contained in:
Jeff Atwood 2014-10-07 08:51:24 -07:00
parent c46b9c0ac3 f4f6236902
commit 305830eb44
6 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/templates/topic.hbs
View File

@ -17,10 +17,12 @@
{{#if editingTopic}} {{#if editingTopic}}
{{#if isPrivateMessage}} {{#if isPrivateMessage}}
<span class="private-message-glyph">{{fa-icon envelope}}</span> <span class="private-message-glyph">{{fa-icon envelope}}</span>
{{text-field id='edit-title' value=newTitle maxLength=maxTitleLength}}
{{else}} {{else}}
{{text-field id='edit-title' value=newTitle maxLength=maxTitleLength}}
</br>
{{category-chooser valueAttribute="id" value=newCategoryId source=category_id}} {{category-chooser valueAttribute="id" value=newCategoryId source=category_id}}
{{/if}} {{/if}}
{{text-field id='edit-title' value=newTitle maxLength=maxTitleLength}}
<button class='btn btn-primary btn-small no-text' {{action "finishedEditingTopic"}}>{{fa-icon check}}</button> <button class='btn btn-primary btn-small no-text' {{action "finishedEditingTopic"}}>{{fa-icon check}}</button>
<button class='btn btn-small no-text' {{action "cancelEditingTopic"}}>{{fa-icon times}}</button> <button class='btn btn-small no-text' {{action "cancelEditingTopic"}}>{{fa-icon times}}</button>

2
app/assets/stylesheets/common/base/combobox.scss
View File

@ -8,7 +8,7 @@
display: inline-block; display: inline-block;
} }
.highlighted .topic-count, .select2-highlighted .category-desc { .highlighted .topic-count, .select2-highlighted .category-desc {
color: $secondary; color: $primary;
} }
.category-desc { .category-desc {
color: scale-color($primary, $lightness: 45%); color: scale-color($primary, $lightness: 45%);

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

@ -12,7 +12,7 @@
} }
.contents { .contents {
margin: 10px 0; margin: 8px 0;
} }
.title { .title {

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

@ -560,7 +560,7 @@ iframe {
} }
.badge-wrapper { .badge-wrapper {
margin: 0; margin: 0 0 0 2px;
padding: 0; padding: 0;
.badge-category { .badge-category {

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

@ -26,7 +26,7 @@
} }
#edit-title { width: 500px; } #edit-title { width: 500px; }
.category-combobox { .category-combobox {
width: 250px; width: 350px;
.select2-drop { .select2-drop {
left: -9000px; left: -9000px;
width: 248px; width: 248px;

4
app/assets/stylesheets/vendor/select2.scss vendored
View File

@ -331,8 +331,8 @@ Version: @@ver@@ Timestamp: @@timestamp@@
.select2-results-dept-7 .select2-result-label { padding-left: 120px } .select2-results-dept-7 .select2-result-label { padding-left: 120px }
.select2-results .select2-highlighted { .select2-results .select2-highlighted {
background: #3875d7; background: dark-light-diff($highlight, $secondary, 50%, -80%);
color: #fff; color: $primary;
} }
.select2-results li em { .select2-results li em {