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

FIX: visual regressions on title-wrapper

This commit is contained in:
Joffrey JAFFEUX 2017-08-31 15:08:09 +02:00 committed by GitHub
parent 0957ac9ee2
commit 56468582ee
5 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,19 +18,20 @@
{{text-field id="edit-title" value=buffered.title maxlength=siteSettings.max_topic_title_length autofocus="true"}} {{text-field id="edit-title" value=buffered.title maxlength=siteSettings.max_topic_title_length autofocus="true"}}
{{#if showCategoryChooser}} {{#if showCategoryChooser}}
<br>
{{category-select-box class="small" value=buffered.category_id}} {{category-select-box class="small" value=buffered.category_id}}
{{/if}} {{/if}}
{{#if canEditTags}} {{#if canEditTags}}
<br>
{{tag-chooser tags=buffered.tags categoryId=buffered.category_id}} {{tag-chooser tags=buffered.tags categoryId=buffered.category_id}}
{{/if}} {{/if}}
{{plugin-outlet name="edit-topic" args=(hash model=model buffered=buffered)}} {{plugin-outlet name="edit-topic" args=(hash model=model buffered=buffered)}}
<div class="actions"> <br>
{{d-button action="finishedEditingTopic" class="btn-primary btn-small submit-edit" icon="check"}} {{d-button action="finishedEditingTopic" class="btn-primary btn-small submit-edit" icon="check"}}
{{d-button action="cancelEditingTopic" class="btn-small cancel-edit" icon="times"}} {{d-button action="cancelEditingTopic" class="btn-small cancel-edit" icon="times"}}
</div>
{{else}} {{else}}
<h1> <h1>
{{#unless model.is_warning}} {{#unless model.is_warning}}

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

@ -169,6 +169,7 @@ header .discourse-tag {color: $tag-color }
} }
.tag-chooser { .tag-chooser {
width: 100%;
margin: 5px 0; margin: 5px 0;
ul.select2-choices { ul.select2-choices {
max-height: 40px; max-height: 40px;
@ -176,6 +177,10 @@ header .discourse-tag {color: $tag-color }
} }
} }
.title-wrapper .tag-chooser {
width: 500px;
}
.admin-tag { .admin-tag {
position: relative; position: relative;
float: right; float: right;

15
app/assets/stylesheets/common/base/topic.scss
View File

@ -48,20 +48,9 @@
#topic-title { #topic-title {
.title-wrapper { .title-wrapper {
display: flex; float: left;
flex: 1; width: 90%;
flex-direction: column;
max-width: 450px;
#edit-title, .tag-chooser, .category-select-box {
flex: 1;
width: auto;
}
#edit-title {
margin-bottom: 5px;
}
.btn-small { .btn-small {
margin: 0 6px 0 0; margin: 0 6px 0 0;
} }

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

@ -21,16 +21,14 @@
padding-top: 14px; padding-top: 14px;
margin-bottom: 10px; margin-bottom: 10px;
.tag-chooser {
width: 100%;
max-width: 450px;
}
.star { .star {
font-size: 1.429em; font-size: 1.429em;
margin-top: 6px; margin-top: 6px;
margin-right: 6px; margin-right: 6px;
} }
#edit-title, .category-select-box {
width: 500px;
}
h1 { h1 {
font-size: 1.8em; font-size: 1.8em;
line-height: 1.2em; line-height: 1.2em;
@ -44,10 +42,6 @@
vertical-align: middle; vertical-align: middle;
} }
.private-message-glyph { display: none; } .private-message-glyph { display: none; }
.actions {
flex: 1;
align-items: center;
}
} }
.private-message-glyph { .private-message-glyph {

12
app/assets/stylesheets/mobile/topic.scss
View File

@ -180,14 +180,24 @@ sup sup, sub sup, sup sub, sub sub { top: 0; }
// inline editing of title on mobile // inline editing of title on mobile
.title-wrapper { .title-wrapper {
#edit-title { input#edit-title {
width: 95%;
padding: 5px; padding: 5px;
box-sizing: border-box;
} }
.btn-small { .btn-small {
padding: 8px 12px; padding: 8px 12px;
margin: 6px 6px 0 0; margin: 6px 6px 0 0;
} }
.select2-container {
margin-top: 8px;
width: 95% !important;
}
.category-select-box {
margin-top: 8px;
width: 95%;
}
} }
// make mobile timeline top and bottom dates easier to select // make mobile timeline top and bottom dates easier to select