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

FIX: minor css tweaks to title-wrapper

This commit is contained in:
Joffrey JAFFEUX 2017-08-31 11:16:08 +02:00 committed by GitHub
parent 84e992363c
commit 0957ac9ee2
5 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,20 +18,19 @@
{{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 width=350 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)}}
<br> <div class="actions">
{{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,7 +169,6 @@ 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;
@ -177,10 +176,6 @@ header .discourse-tag {color: $tag-color }
} }
} }
.title-wrapper .tag-chooser {
width: 500px;
}
.admin-tag { .admin-tag {
position: relative; position: relative;
float: right; float: right;

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

@ -48,14 +48,25 @@
#topic-title { #topic-title {
.title-wrapper { .title-wrapper {
float: left; display: flex;
width: 90%; flex: 1;
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;
} }
.badge-wrapper { .badge-wrapper {
float: left;
margin-right: 12px; margin-right: 12px;
} }

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

@ -20,29 +20,34 @@
z-index: 1000; z-index: 1000;
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 { width: 500px; }
h1 { h1 {
font-size: 1.8em; font-size: 1.8em;
line-height: 1.2em; line-height: 1.2em;
overflow: hidden; overflow: hidden;
a {color: $primary;} a {color: $primary;}
} }
.topic-statuses { .topic-statuses {
margin-top: -2px; margin-top: -2px;
} }
.select2-container { .select2-container {
vertical-align: middle; vertical-align: middle;
margin-right: 5px;
margin-bottom: 2px;
} }
.private-message-glyph { display: none; } .private-message-glyph { display: none; }
.actions {
flex: 1;
align-items: center;
}
} }
.private-message-glyph { .private-message-glyph {
@ -89,7 +94,7 @@
} }
#topic-progress-expanded { #topic-progress-expanded {
border: 1px solid $primary-low; border: 1px solid $primary-low;
padding: 5px; padding: 5px;
background: $secondary; background: $secondary;

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

@ -180,18 +180,14 @@ 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 {
input#edit-title { #edit-title {
width: 95%;
padding: 5px; padding: 5px;
} }
.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;
}
} }
// make mobile timeline top and bottom dates easier to select // make mobile timeline top and bottom dates easier to select