IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: puts the datepicker on it's own line on mobile device in the feature topic modal

Browse Source
This commit is contained in:
Régis Hanol
2018-05-16 17:33:55 +02:00
parent ae6236d090
commit d5ae0a92ef
2 changed files with 36 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
app/assets/javascripts/discourse/templates/modal/feature-topic.hbs
View File

@@ -36,12 +36,22 @@
<p> <p>
{{i18n "topic.feature_topic.pin_note"}} {{i18n "topic.feature_topic.pin_note"}}
</p> </p>
<p class="with-validation"> {{#if site.isMobileDevice}}
{{{pinMessage}}} <p>
{{d-icon "clock-o"}} {{{pinMessage}}}
{{date-picker-future value=model.pinnedInCategoryUntil}} </p>
{{popup-input-tip validation=pinInCategoryValidation shownAt=pinInCategoryTipShownAt}} <p class="with-validation">
</p> {{date-picker-future value=model.pinnedInCategoryUntil}}
{{popup-input-tip validation=pinInCategoryValidation shownAt=pinInCategoryTipShownAt}}
</p>
{{else}}
<p class="with-validation">
{{{pinMessage}}}
{{d-icon "clock-o"}}
{{date-picker-future value=model.pinnedInCategoryUntil}}
{{popup-input-tip validation=pinInCategoryValidation shownAt=pinInCategoryTipShownAt}}
</p>
{{/if}}
<p> <p>
{{d-button action="pin" icon="thumb-tack" label="topic.feature.pin" class="btn-primary"}} {{d-button action="pin" icon="thumb-tack" label="topic.feature.pin" class="btn-primary"}}
</p> </p>
@@ -62,12 +72,22 @@
<p> <p>
{{i18n "topic.feature_topic.global_pin_note"}} {{i18n "topic.feature_topic.global_pin_note"}}
</p> </p>
<p class="with-validation"> {{#if site.isMobileDevice}}
{{i18n "topic.feature_topic.pin_globally"}} <p>
{{d-icon "clock-o"}} {{i18n "topic.feature_topic.pin_globally"}}
{{date-picker-future value=model.pinnedGloballyUntil}} </p>
{{popup-input-tip validation=pinGloballyValidation shownAt=pinGloballyTipShownAt}} <p class="with-validation">
</p> {{date-picker-future value=model.pinnedGloballyUntil}}
{{popup-input-tip validation=pinGloballyValidation shownAt=pinGloballyTipShownAt}}
</p>
{{else}}
<p class="with-validation">
{{i18n "topic.feature_topic.pin_globally"}}
{{d-icon "clock-o"}}
{{date-picker-future value=model.pinnedGloballyUntil}}
{{popup-input-tip validation=pinGloballyValidation shownAt=pinGloballyTipShownAt}}
</p>
{{/if}}
<p> <p>
{{d-button action="pinGlobally" icon="thumb-tack" label="topic.feature.pin_globally" class="btn-primary"}} {{d-button action="pinGlobally" icon="thumb-tack" label="topic.feature.pin_globally" class="btn-primary"}}
</p> </p>

4
app/assets/stylesheets/common/base/modal.scss
View File

@@ -114,6 +114,10 @@
height: 100%; height: 100%;
z-index: z("modal","content"); z-index: z("modal","content");
overflow: auto; overflow: auto;
.modal-body {
max-height: none !important;
}
} }
.modal-form { .modal-form {