diff --git a/client/src/app-components/people-list.scss b/client/src/app-components/people-list.scss index f476eb20..d1eeabdc 100644 --- a/client/src/app-components/people-list.scss +++ b/client/src/app-components/people-list.scss @@ -61,4 +61,28 @@ &__pagination { } -} \ No newline at end of file + + @media screen and (max-width: 415px) { + .people-list { + &__item { + height: unset; + padding: unset; + display: flex; + flex-direction: column; + justify-content: center; + align-items: flex-end; + + &-profile-pic-wrapper { + top: 15px; + left: 15px; + } + + &-block { + width: unset; + display: unset; + padding: 15px 10px 0 0; + } + } + } + } +} diff --git a/client/src/app-components/ticket-viewer.js b/client/src/app-components/ticket-viewer.js index 5772d688..ee809c80 100644 --- a/client/src/app-components/ticket-viewer.js +++ b/client/src/app-components/ticket-viewer.js @@ -108,7 +108,7 @@ class TicketViewer extends React.Component { const {ticketNumber, title, author, editedTitle, language} = ticket; return( -
+
#{ticketNumber} {title} @@ -136,7 +136,7 @@ class TicketViewer extends React.Component { renderEditableTitle(){ return( -
+
this.setState({newTitle: e.target.value })} />
@@ -164,49 +164,58 @@ class TicketViewer extends React.Component { return (
-
-
{i18n('DEPARTMENT')}
-
{i18n('AUTHOR')}
-
{i18n('TAGS')}
-
-
-
- +
+
+
{i18n('DEPARTMENT')}
+
+ +
-
{ticket.author.name}
-
- +
+
{i18n('AUTHOR')}
+
{ticket.author.name}
+
+
+
{i18n('TAGS')}
+
+ +
-
-
{i18n('PRIORITY')}
-
{i18n('OWNER')}
-
{i18n('STATUS')}
-
-
-
- + +
+
+
{i18n('PRIORITY')}
+
+ +
-
- {this.renderAssignStaffList()} +
+
{i18n('OWNER')}
+
+ {this.renderAssignStaffList()} +
-
- {ticket.closed ? - : i18n('OPENED')} +
+
{i18n('STATUS')}
+
+ {ticket.closed ? + : i18n('OPENED')} +
@@ -223,33 +232,41 @@ class TicketViewer extends React.Component { return (
-
-
{i18n('DEPARTMENT')}
-
{i18n('AUTHOR')}
-
{i18n('TAGS')}
-
-
-
{ticket.department.name}
-
{ticket.author.name}
-
{ticket.tags.length ? ticket.tags.map((tagName,index) => { - let tag = _.find(this.props.tags, {name:tagName}); - return - }) : i18n('NONE')}
-
-
-
{i18n('PRIORITY')}
-
{i18n('OWNER')}
-
{i18n('STATUS')}
-
-
-
- {i18n(priorities[this.props.ticket.priority || 'low'])} +
+
+
{i18n('DEPARTMENT')}
+
{ticket.department.name}
-
- {this.renderOwnerNode()} +
+
{i18n('AUTHOR')}
+
{ticket.author.name}
-
- {i18n((this.props.ticket.closed) ? 'CLOSED' : 'OPENED')} +
+
{i18n('TAGS')}
+
{ticket.tags.length ? ticket.tags.map((tagName,index) => { + let tag = _.find(this.props.tags, {name:tagName}); + return + }) : i18n('NONE')}
+
+
+
+
+
{i18n('PRIORITY')}
+
+ {i18n(priorities[this.props.ticket.priority || 'low'])} +
+
+
+
{i18n('OWNER')}
+
+ {this.renderOwnerNode()} +
+
+
+
{i18n('STATUS')}
+
+ {i18n((this.props.ticket.closed) ? 'CLOSED' : 'OPENED')} +
diff --git a/client/src/app-components/ticket-viewer.scss b/client/src/app-components/ticket-viewer.scss index 87b2f6fe..9a2662f1 100644 --- a/client/src/app-components/ticket-viewer.scss +++ b/client/src/app-components/ticket-viewer.scss @@ -12,7 +12,7 @@ display: flex; align-items:center; justify-content:center; - position: relative; + &:hover { .ticket-viewer__edit-title-icon { color: $grey; @@ -23,13 +23,13 @@ &__edited-title-text { font-style: italic; font-size: 14px; - margin-left: 10px; + margin: 0 10px; } &__edit-title-icon { - position: absolute; color: #414A59; right: 12px; + margin: 0 10px; &:hover { cursor:pointer; } @@ -49,27 +49,52 @@ &__number { color: white; - margin-right: 10px; + margin-right: 30px; font-size: 14px; } &__title { - display: inline-block; + max-width: 375px; } &__flag { - margin-left: 10px; + margin-left: 30px; } - &__info-row-header { + &__info { + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: flex-start; background-color: $light-grey; - font-weight: bold; - } + padding: 0 15px; - &__info-row-values { - background-color: $light-grey; - color: $secondary-blue; - padding-bottom: 10px; + &-container { + display: flex; + flex-direction: column; + justify-content: space-around; + align-items: center; + min-width: 150px; + max-width: 250px; + } + + &-container-editable { + display: flex; + flex-direction: column; + justify-content: space-around; + align-items: center; + min-width: 300px; + } + + &-header { + font-weight: bold; + } + + &-value { + color: $secondary-blue; + padding-bottom: 10px; + + } } &__editable-dropdown { @@ -136,4 +161,39 @@ &__delete-button { margin-left: 10px; } + + @media screen and (max-width: 1151px) { + .ticket-viewer__info { + &-container { + width: 200px; + min-width: unset; + max-width: unset; + } + + &-container-editable { + min-width: 250px; + max-width: 300px; + } + } + } + + @media screen and (max-width: 992px) { + .ticket-viewer__info { + flex-direction: column; + justify-content: space-between; + align-items: center; + } + } + + @media screen and (max-width: 571px) { + .ticket-viewer { + &__number, &__edit-title-icon { + margin: 0 5px; + } + + &__flag { + padding: 0 10px; + } + } + } } diff --git a/client/src/app/admin/panel/admin-panel-layout.js b/client/src/app/admin/panel/admin-panel-layout.js index dbb70d16..f92004f1 100644 --- a/client/src/app/admin/panel/admin-panel-layout.js +++ b/client/src/app/admin/panel/admin-panel-layout.js @@ -29,7 +29,7 @@ class AdminPanel extends React.Component {
- + {this.props.children}
diff --git a/client/src/app/admin/panel/admin-panel-layout.scss b/client/src/app/admin/panel/admin-panel-layout.scss index 42a68014..7c2d5d66 100644 --- a/client/src/app/admin/panel/admin-panel-layout.scss +++ b/client/src/app/admin/panel/admin-panel-layout.scss @@ -4,4 +4,10 @@ &__header { margin-bottom: 20px; } + + @media screen and (max-width: 415px) { + .admin-panel-layout__content__widget { + padding: 20px 5px; + } + } } \ No newline at end of file diff --git a/client/src/app/admin/panel/articles/admin-panel-list-articles.scss b/client/src/app/admin/panel/articles/admin-panel-list-articles.scss index 1807e990..5005226c 100644 --- a/client/src/app/admin/panel/articles/admin-panel-list-articles.scss +++ b/client/src/app/admin/panel/articles/admin-panel-list-articles.scss @@ -3,4 +3,11 @@ &__list { padding: 0 50px; } -} \ No newline at end of file + + @media screen and (max-width: 415px) { + .admin-panel-list-articles__list { + padding: 0; + } + } + +} diff --git a/client/src/app/admin/panel/settings/admin-panel-advanced-settings.js b/client/src/app/admin/panel/settings/admin-panel-advanced-settings.js index 7e65e631..4f2ff813 100644 --- a/client/src/app/admin/panel/settings/admin-panel-advanced-settings.js +++ b/client/src/app/admin/panel/settings/admin-panel-advanced-settings.js @@ -94,7 +94,7 @@ class AdminPanelAdvancedSettings extends React.Component {
-
+
{(this.state.selectedAPIKey === -1) ? this.renderNoKey() : this.renderKey()}
@@ -123,7 +123,7 @@ class AdminPanelAdvancedSettings extends React.Component { let currentAPIKey = this.state.APIKeys[this.state.selectedAPIKey]; return ( -
+
{i18n('NAME_OF_KEY')}
{currentAPIKey.name}
{i18n('KEY')}
diff --git a/client/src/app/admin/panel/settings/admin-panel-advanced-settings.scss b/client/src/app/admin/panel/settings/admin-panel-advanced-settings.scss index 81082aea..b6e14a6d 100644 --- a/client/src/app/admin/panel/settings/admin-panel-advanced-settings.scss +++ b/client/src/app/admin/panel/settings/admin-panel-advanced-settings.scss @@ -27,7 +27,7 @@ text-align: left; } - &-info { + &__container-info { text-align: left; } @@ -58,4 +58,32 @@ &__message { margin-bottom: 20px; } + + @media screen and (max-width: 415px) { + .admin-panel-advanced-settings { + &__api-keys { + + &-button { + margin-bottom: 30px; + width: 150px; + } + + &__container { + padding: 30px 0; + + &-info { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + } + } + + &-subtitle { + margin: 10px 0 0 0; + } + } + } + } + } diff --git a/client/src/app/admin/panel/settings/admin-panel-email-settings.scss b/client/src/app/admin/panel/settings/admin-panel-email-settings.scss index 4f440674..68c64a48 100644 --- a/client/src/app/admin/panel/settings/admin-panel-email-settings.scss +++ b/client/src/app/admin/panel/settings/admin-panel-email-settings.scss @@ -1,6 +1,14 @@ @import "../../../../scss/vars"; .admin-panel-email-settings { + &__loading { + min-height: 361px; + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + background-color: $grey; + } &__text-area { width: 100%; diff --git a/client/src/app/admin/panel/settings/admin-panel-system-preferences.js b/client/src/app/admin/panel/settings/admin-panel-system-preferences.js index dae21f3b..d0a4cf5d 100755 --- a/client/src/app/admin/panel/settings/admin-panel-system-preferences.js +++ b/client/src/app/admin/panel/settings/admin-panel-system-preferences.js @@ -52,9 +52,9 @@ class AdminPanelSystemPreferences extends React.Component {
-
- - +
+ +
@@ -99,12 +99,12 @@ class AdminPanelSystemPreferences extends React.Component {
-
+
- {i18n('UPDATE_SETTINGS')} + {i18n('UPDATE_SETTINGS')}
- +
diff --git a/client/src/app/admin/panel/settings/admin-panel-system-preferences.scss b/client/src/app/admin/panel/settings/admin-panel-system-preferences.scss index 9ee30de5..b527992b 100644 --- a/client/src/app/admin/panel/settings/admin-panel-system-preferences.scss +++ b/client/src/app/admin/panel/settings/admin-panel-system-preferences.scss @@ -51,4 +51,30 @@ &__message { margin-top: 20px; } -} \ No newline at end of file + + @media screen and (max-width: 376px) { + .admin-panel-system-preferences { + &__form-fields { + padding: 0; + + &__input, &__select { + padding: 0 15px; + } + } + } + } + + @media screen and (max-width: 415px) { + .admin-panel-system-preferences { + &__container__button { + margin: 10px; + } + + &__languages { + &-allowed, &-supported { + display: unset; + } + } + } + } +} diff --git a/client/src/app/admin/panel/staff/admin-panel-departments.js b/client/src/app/admin/panel/staff/admin-panel-departments.js index 5082d3b1..7b8ee5fb 100644 --- a/client/src/app/admin/panel/staff/admin-panel-departments.js +++ b/client/src/app/admin/panel/staff/admin-panel-departments.js @@ -70,11 +70,11 @@ class AdminPanelDepartments extends React.Component {
{(errorMessage) ? {i18n(errorMessage)} : null}
-
- +
+
- +
); } - + renderDefaultDepartmentForm() { const { defaultDepartmentError, @@ -120,9 +120,7 @@ class AdminPanelDepartments extends React.Component { decorator={DepartmentDropdown} fieldProps={{ departments: getPublicDepartmentList() , size: 'medium' }} /> -
- -
+
{this.setState({form, edited: true})}, onValidateErrors: (errors) => {this.setState({errors})}, onSubmit: this.onFormSubmit.bind(this), - loading: formLoading + loading: formLoading, + className: 'admin-panel-departments__form' }; } diff --git a/client/src/app/admin/panel/staff/admin-panel-departments.scss b/client/src/app/admin/panel/staff/admin-panel-departments.scss index ab9b7906..94ccb5d3 100644 --- a/client/src/app/admin/panel/staff/admin-panel-departments.scss +++ b/client/src/app/admin/panel/staff/admin-panel-departments.scss @@ -7,17 +7,28 @@ } &__update-name-button { - float: left; min-width: 156px; } - &__name { - display:inline-block;margin-right: 101px; + &__container{ + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; + width: 460px; + + &__info-tooltip { + margin-left: 2px; + } } - &__private-option { - display:inline-block; - margin-left: 10px; + + &__form { + display: flex; + flex-direction: column; + justify-content: space-around; + align-items: flex-start; } + &__default-departments-container { &__form { text-align: left; @@ -28,16 +39,6 @@ justify-content: space-around; align-items: flex-start; padding-bottom: 10px; - - &__lock-option { - display: flex; - flex-direction: row; - align-items: center; - - &__info-tooltip { - padding-left: 5px; - } - } } &__button { min-width: 156px; @@ -81,7 +82,37 @@ text-transform: lowercase; margin-left: 3px; } - &__info-tooltip { - margin-left: 2px; + + @media screen and (max-width: 415px) { + .admin-panel-departments { + &__container{ + display: unset; + width: 100%; + + &__name { + margin: 30px; + } + + &__private-option { + margin: 10px; + } + } + + &__update-name-button { + float: unset; + margin: 15px; + } + + &__default-departments-container__form__fields { + + &__checkbox { + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; + } + } + } } + } diff --git a/client/src/app/admin/panel/staff/admin-panel-staff-members.scss b/client/src/app/admin/panel/staff/admin-panel-staff-members.scss index 974d2183..c1885429 100644 --- a/client/src/app/admin/panel/staff/admin-panel-staff-members.scss +++ b/client/src/app/admin/panel/staff/admin-panel-staff-members.scss @@ -26,4 +26,21 @@ &__private { margin-left: 5px; } + + @media screen and (max-width: 415px) { + .admin-panel-staff-members { + &__drowpdown { + float: unset; + } + + &__button { + float: unset; + margin: 15px; + } + + &__wrapper { + height: unset; + } + } + } } diff --git a/client/src/app/admin/panel/tickets/admin-panel-view-ticket.scss b/client/src/app/admin/panel/tickets/admin-panel-view-ticket.scss index bdb36b07..99b178d5 100644 --- a/client/src/app/admin/panel/tickets/admin-panel-view-ticket.scss +++ b/client/src/app/admin/panel/tickets/admin-panel-view-ticket.scss @@ -15,4 +15,13 @@ &__ticket-view { margin: 20px 30px; } -} \ No newline at end of file + + @media screen and (max-width: 415px) { + margin: 0; + + .admin-panel-view-ticket__ticket-view { + margin: 20px 0; + } + } + +} diff --git a/client/src/app/admin/panel/users/admin-panel-ban-users.js b/client/src/app/admin/panel/users/admin-panel-ban-users.js index b4b215bc..0339131b 100644 --- a/client/src/app/admin/panel/users/admin-panel-ban-users.js +++ b/client/src/app/admin/panel/users/admin-panel-ban-users.js @@ -50,7 +50,7 @@ class AdminPanelBanUsers extends React.Component { - {i18n('BAN_EMAIL')} + {i18n('BAN_EMAIL')} {this.renderMessage()}
@@ -156,4 +156,4 @@ class AdminPanelBanUsers extends React.Component { } } -export default AdminPanelBanUsers; \ No newline at end of file +export default AdminPanelBanUsers; diff --git a/client/src/app/admin/panel/users/admin-panel-ban-users.scss b/client/src/app/admin/panel/users/admin-panel-ban-users.scss index 379b437c..865dd413 100644 --- a/client/src/app/admin/panel/users/admin-panel-ban-users.scss +++ b/client/src/app/admin/panel/users/admin-panel-ban-users.scss @@ -33,4 +33,33 @@ &__form-message { margin-top: 20px; } -} \ No newline at end of file + + @media screen and (max-width: 415px) { + .admin-panel-ban-users { + &__input { + display: unset; + } + + &__submit-button { + margin: 20px 0; + } + + &__ban-email { + margin-top: 40px; + } + + &__email-row { + text-align: unset; + padding: 0; + display: flex; + flex-direction: column; + align-items: center; + } + + &__un-ban-button { + float: unset; + margin: 15px 0; + } + } + } +} diff --git a/client/src/app/app.scss b/client/src/app/app.scss index c25ac3f2..047276a1 100644 --- a/client/src/app/app.scss +++ b/client/src/app/app.scss @@ -12,16 +12,13 @@ &-header { border-radius: 0; - height: 40px; &__login-links { - padding-top: 8px; - padding-left: 22px; + } &__languages { - top: 10px; - left: -20px; + } } diff --git a/client/src/app/main/main-check-ticket-page.scss b/client/src/app/main/main-check-ticket-page.scss index 935387f8..c379063c 100644 --- a/client/src/app/main/main-check-ticket-page.scss +++ b/client/src/app/main/main-check-ticket-page.scss @@ -21,4 +21,22 @@ height: 78px; width: 304px; } -} \ No newline at end of file + + @media screen and (max-width: 415px) { + .main-check-ticket-page { + &__inputs { + display: unset; + } + + &__input { + width: 300px; + margin: 0; + display: unset; + } + + &__form { + width: 280px; + } + } + } +} diff --git a/client/src/app/main/main-layout-footer.scss b/client/src/app/main/main-layout-footer.scss index 2c7d1cc4..ec298f83 100644 --- a/client/src/app/main/main-layout-footer.scss +++ b/client/src/app/main/main-layout-footer.scss @@ -3,7 +3,7 @@ .main-layout-footer { background-color: $primary-blue; text-align: center; - height: 32px; + min-height: 32px; width: 100%; &__powered, @@ -37,4 +37,16 @@ padding-left: 20px; } } -} \ No newline at end of file + + @media screen and (max-width: 415px) { + &_admin-panel { + .main-layout-footer { + &__powered, + &__extra-link { + float: unset; + padding: 5px; + } + } + } + } +} diff --git a/client/src/app/main/main-layout-header.js b/client/src/app/main/main-layout-header.js index 6cad5ac2..e6cdc039 100644 --- a/client/src/app/main/main-layout-header.js +++ b/client/src/app/main/main-layout-header.js @@ -37,18 +37,19 @@ class MainLayoutHeader extends React.Component { result = (
{(config['registration'] * 1) ? - : null} {!config['mandatory-login'] ? - : null} diff --git a/client/src/app/main/main-layout-header.scss b/client/src/app/main/main-layout-header.scss index 037ef32b..0410d752 100644 --- a/client/src/app/main/main-layout-header.scss +++ b/client/src/app/main/main-layout-header.scss @@ -17,33 +17,21 @@ border-top-left-radius: 4px; color: white; display: inline-block; - height: 32px; - padding: 5px 20px 0 10px; + min-height: 32px; + width: 100%; + padding: 5px 170px 5px 10px; + + &__button { + margin: 5px; + } + } &__languages { - display: inline-block; - position: relative; - top: 5px; + right: 5px; + position: absolute; + bottom: 0; margin: 0 6px; } - @media screen and (max-width: 500px) { - .main-layout-header__languages { - float: none; - } - } - - @media (max-width: 363px) { - .main-layout-header__login-links{ - padding: 8px 0 0 0; - } - } - - @media (max-width: 350px) { - .main-layout-header__languages { - margin: 0 3px; - left: unset; - } - } -} \ No newline at end of file +}