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

UX: fix date time modal on mobile (#24531) 

* UX: fix date time modal
This commit is contained in:
chapoi 2023-11-24 11:28:46 +02:00 committed by GitHub
parent 09c446c1ae
commit 0b352ce7fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 178 additions and 237 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

156
app/assets/stylesheets/common/modal/modal-overrides.scss
View File

@ -342,3 +342,159 @@
}
}
}
.d-modal.discourse-local-dates-create-modal {
.advanced-mode-btn {
margin-left: auto;
}
.date-time-configuration {
display: flex;
.fake-input {
display: none;
}
.timezone-input {
width: 100%;
.select-kit-header {
.d-icon {
margin-right: 1em;
}
.caret-icon {
margin-right: 0;
}
}
}
.date-time-control {
position: relative;
display: flex;
border: 1px solid var(--primary-low);
&.is-filled,
&.is-selected {
.date-time {
color: var(--primary);
background: var(--secondary);
}
.d-icon {
color: var(--primary-high);
}
}
&.from {
border-radius: 5px 5px 0 0;
.date-time {
border-radius: 5px 5px 0 0;
}
&.is-selected {
border-color: var(--tertiary);
}
}
&.to {
border-radius: 0 0 5px 5px;
margin-bottom: 1em;
.date-time {
border-radius: 0 0 5px 5px;
padding-right: 3em;
}
&.is-selected {
border-color: var(--tertiary);
}
}
.date-time {
color: var(--primary-medium);
background: var(--primary-very-low);
padding: 1em 0.5em 1em 2em;
border: 0;
outline: none;
flex: 1;
@include ellipsis;
width: 100%;
justify-content: flex-start;
&:focus {
background-color: var(--tertiary-50);
}
}
.d-icon {
position: absolute;
margin-top: auto;
margin-bottom: auto;
left: 0.5em;
top: 0;
bottom: 0;
color: var(--primary-medium);
}
.delete-to-date {
position: absolute;
margin-top: auto;
margin-bottom: auto;
right: 0;
width: 30px;
top: 0;
bottom: 0;
color: var(--primary-high);
border-radius: 0 0 5px 0;
}
}
.inputs-panel {
flex: 1;
}
}
.preview {
text-align: center;
margin-bottom: 0.5em;
padding: 0.5em;
b {
margin-right: 0.5em;
margin-left: 0.5em;
}
b + p {
margin: 0;
display: inline-block;
}
}
.validation-error {
margin-bottom: 0.5em;
}
.format {
.format-input {
width: 280px;
}
}
.formats {
list-style: none;
padding: 0;
margin: 0;
.format {
.previewed-format {
color: var(--primary-medium);
}
}
}
.control-group.recurrence,
.control-group.format,
.control-group.timezones {
margin-top: 1em;
}
}

1
app/assets/stylesheets/mobile/_index.scss
View File

@ -20,6 +20,7 @@
@import "menu-panel";
@import "login-modal";
@import "modal";
@import "modal-overrides";
@import "new-user";
@import "onebox";
@import "personal-message";

20
app/assets/stylesheets/mobile/modal-overrides.scss Normal file
View File

@ -0,0 +1,20 @@
.d-modal.discourse-local-dates-create-modal {
.date-time-configuration {
flex-direction: column;
gap: 0.5em;
}
.calendar-date-time-input {
width: 100%;
margin: 0 0 1rem 0;
}
.picker-panel {
//mysteriously needed to prevent it from overlapping the timezone-input
position: relative;
z-index: 0;
}
.pika-single {
justify-content: center;
}
}

2
plugins/discourse-local-dates/assets/javascripts/discourse/components/modal/local-dates-create.hbs
View File

@ -1,7 +1,7 @@
<DModal
@title={{i18n "discourse_local_dates.title"}}
@closeModal={{@closeModal}}
class="discourse-local-dates-create-modal"
class="discourse-local-dates-create-modal -large"
>
<:body>
<div class="form">

236
plugins/discourse-local-dates/assets/stylesheets/common/discourse-local-dates.scss
View File

@ -47,239 +47,3 @@
cursor: pointer;
margin-top: 0.5em;
}
.discourse-local-dates-create-modal .modal-footer {
display: flex;
align-items: center;
justify-content: flex-start;
&:before,
&:after {
content: none;
}
.advanced-mode-btn {
margin-left: auto;
}
}
.discourse-local-dates-create-modal {
box-sizing: border-box;
min-height: 320px;
display: flex;
flex-direction: row;
padding: 0.5em;
overflow: auto;
.form {
flex: 1 0 0px;
label {
font-weight: 700;
}
.date-time-configuration {
display: flex;
.fake-input {
display: none;
}
.timezone-input {
width: 100%;
&.is-expanded {
.select-kit-header {
border: 1px solid var(--primary-medium);
}
}
.select-kit-header {
padding: 0.5em 0.5em;
border: 1px solid var(--primary-low);
.d-icon {
margin-right: 1em;
}
.caret-icon {
margin-right: 0;
}
}
}
.date-time-control {
position: relative;
display: flex;
border: 1px solid var(--primary-low);
&.is-filled,
&.is-selected {
.date-time {
color: var(--primary);
background: var(--secondary);
}
.d-icon {
color: var(--primary-high);
}
}
&.from {
border-radius: 5px 5px 0 0;
.date-time {
border-radius: 5px 5px 0 0;
}
&.is-selected {
border-color: var(--tertiary);
}
}
&.to {
border-radius: 0 0 5px 5px;
margin-bottom: 1em;
.date-time {
border-radius: 0 0 5px 5px;
padding-right: 3em;
}
&.is-selected {
border-color: var(--tertiary);
}
}
.date-time {
color: var(--primary-medium);
background: var(--primary-very-low);
padding: 1em 0.5em 1em 2em;
border: 0;
outline: none;
flex: 1;
@include ellipsis;
width: 100%;
justify-content: flex-start;
&:focus {
background-color: var(--tertiary-50);
}
}
.d-icon {
position: absolute;
margin-top: auto;
margin-bottom: auto;
left: 0.5em;
top: 0;
bottom: 0;
color: var(--primary-medium);
}
.delete-to-date {
position: absolute;
margin-top: auto;
margin-bottom: auto;
right: 0;
width: 30px;
top: 0;
bottom: 0;
color: var(--primary-high);
border-radius: 0 0 5px 0;
}
}
.inputs-panel {
flex: 1;
}
}
.preview {
text-align: center;
margin-top: 0;
margin-bottom: 0.5em;
display: flex;
align-items: center;
padding: 0.5em;
flex-wrap: wrap;
b {
margin-right: 0.5em;
margin-left: 0.5em;
}
b + p {
margin: 0;
display: inline-block;
}
}
.recurrence {
.recurrence-input {
width: 350px;
}
}
}
.validation-error {
margin-bottom: 0.5em;
}
.format {
.format-input {
width: 280px;
}
}
.formats {
list-style: none;
padding: 0;
margin: 0;
.format {
.previewed-format {
color: var(--primary-medium);
}
}
}
.control-group.recurrence,
.control-group.format,
.control-group.timezones {
margin-top: 1em;
}
.timezones-input {
width: 350px;
}
}
html:not(.mobile-view) {
.discourse-local-dates-create-modal .modal-body {
width: 40em; // using ems to scale with user font size
max-width: 100vw; // avoids overflow if someone has extreme font-sizes impacting width
max-height: 400px !important;
}
}
html.mobile-view {
.discourse-local-dates-create-modal .modal-body {
max-height: 400px !important;
.date-time-configuration {
flex-direction: column;
}
.calendar-date-time-input {
width: 100%;
margin: 0 0 1em 0;
.pika-single {
justify-content: center;
}
.time-picker {
padding-top: 6px;
}
}
}
}