From dbfbd0cf80472bd20f8b00b408ce12da70267d23 Mon Sep 17 00:00:00 2001 From: ivan Date: Mon, 13 Feb 2017 15:45:43 -0300 Subject: [PATCH] Ivan - WIP [skip ci] --- client/src/app/App.js | 3 +- .../admin-panel-system-preferences.js | 2 +- client/src/app/app.scss | 46 +++++++++++++++++++ client/src/data/fixtures/system-fixtures.js | 8 +--- 4 files changed, 51 insertions(+), 8 deletions(-) diff --git a/client/src/app/App.js b/client/src/app/App.js index 6d327fa8..2f855f21 100644 --- a/client/src/app/App.js +++ b/client/src/app/App.js @@ -45,7 +45,8 @@ class App extends React.Component { getClass() { let classes = { 'application': true, - 'application_modal-opened': (this.props.modal.opened) + 'application_modal-opened': (this.props.modal.opened), + 'application_full-width': (this.props.config.layout === 'full-width' && !_.includes(this.props.location.pathname, '/admin')) }; return classNames(classes); 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 21c7d44b..59b2ab3a 100644 --- a/client/src/app/admin/panel/settings/admin-panel-system-preferences.js +++ b/client/src/app/admin/panel/settings/admin-panel-system-preferences.js @@ -213,7 +213,7 @@ class AdminPanelSystemPreferences extends React.Component { 'reCaptchaPrivate': result.data.reCaptchaPrivate, 'url': result.data['url'], 'title': result.data['title'], - 'layout': result.data['layout'] == 'Full width' ? 1 : 0, + 'layout': result.data['layout'] == 'full-width' ? 1 : 0, 'time-zone': result.data['time-zone'], 'no-reply-email': result.data['no-reply-email'], 'smtp-host': result.data['smtp-host'], diff --git a/client/src/app/app.scss b/client/src/app/app.scss index cc6679c9..d7914ff5 100644 --- a/client/src/app/app.scss +++ b/client/src/app/app.scss @@ -2,4 +2,50 @@ .application { padding: $half-space; + + &_full-width { + padding: 0; + + .main-layout { + width: 100%; + max-width: none; + + &-header { + border-radius: 0; + height: 40px; + + &__login-links { + padding-top: 8px; + padding-left: 22px; + } + + &__languages { + top: 10px; + left: -20px; + } + } + + &-footer { + height: 40px; + //position: fixed; + //bottom: 0; + + &--powered { + padding-top: 9px; + } + } + } + + .main-home-page { + width: 1100px; + margin: 0 auto; + } + + .main-signup-page { + + .signup-widget__captcha { + margin-left: 290px; + } + } + } } \ No newline at end of file diff --git a/client/src/data/fixtures/system-fixtures.js b/client/src/data/fixtures/system-fixtures.js index 379af5d4..f2745afc 100644 --- a/client/src/data/fixtures/system-fixtures.js +++ b/client/src/data/fixtures/system-fixtures.js @@ -12,16 +12,14 @@ module.exports = [ 'reCaptchaPrivate': 'LALA', 'url': 'http://www.opensupports.com/support', 'title': 'OpenSupports Support Center', - 'layout': 'Boxed', + 'layout': 'full-width', 'time-zone': 3, 'no-reply-email': 'shitr@post.com', 'smtp-host': 'localhost', 'smtp-port': '7070', 'smtp-user': 'Wesa', 'maintenance-mode': false, - 'user-system-enabled': true, 'allow-attachments': true, - 'registration': true, 'max-size': 500, 'departments': [ {id: 1, name: 'Sales Support', owners: 2}, @@ -41,11 +39,9 @@ module.exports = [ data: { 'language': 'en', 'title': '', - 'layout': 'Boxed', + 'layout': 'full-width', 'reCaptchaKey': '6LfM5CYTAAAAAGLz6ctpf-hchX2_l0Ge-Bn-n8wS', 'maintenance-mode': false, - 'user-system-enabled': true, - 'registration': true, 'departments': [ {id: 1, name: 'Sales Support', owners: 2}, {id: 2, name: 'Technical Issues', owners: 5},