From 467a948d09863e64d7aa201eb19c2b1caccfcb58 Mon Sep 17 00:00:00 2001 From: Edwin Betancourt Date: Mon, 17 May 2021 21:25:27 -0400 Subject: [PATCH] feat: Remove common styles and duplicate css rules (#852) * feat: Remove common styles and duplicate css rules * change standard licese Co-authored-by: EdwinBetanc0urt --- .../ContextMenu/contextMenuDesktop.vue | 56 +------------- .../ContextMenu/contextMenuMobile.vue | 55 +------------- .../ContextMenu/contextMenuStyleScoped.scss | 75 +++++++++++++++++++ src/styles/ADempiere/index.scss | 17 +++++ src/styles/ADempiere/view.scss | 55 +++++++++++++- src/styles/index.scss | 1 + src/views/ADempiere/Browser/index.vue | 37 +-------- src/views/ADempiere/Form/index.vue | 33 +------- src/views/ADempiere/Process/index.vue | 35 +-------- src/views/ADempiere/ProcessActivity/index.vue | 38 +--------- .../ADempiere/ProcessActivity/modeDesktop.vue | 39 +--------- .../ADempiere/ProcessActivity/modeMobile.vue | 39 +--------- .../ProcessActivity/processActivityStyle.scss | 48 ++++++++++++ src/views/ADempiere/ReportViewer/index.vue | 16 +--- src/views/ADempiere/Test/index.vue | 41 +--------- src/views/ADempiere/Unsupported/index.vue | 33 +++++++- src/views/ADempiere/Window/index.vue | 4 +- .../ADempiere/Window/windowStyleScoped.scss | 24 ++++-- 18 files changed, 269 insertions(+), 377 deletions(-) create mode 100644 src/components/ADempiere/ContextMenu/contextMenuStyleScoped.scss create mode 100644 src/styles/ADempiere/index.scss create mode 100644 src/views/ADempiere/ProcessActivity/processActivityStyle.scss diff --git a/src/components/ADempiere/ContextMenu/contextMenuDesktop.vue b/src/components/ADempiere/ContextMenu/contextMenuDesktop.vue index 5ebb52be..434c6c86 100644 --- a/src/components/ADempiere/ContextMenu/contextMenuDesktop.vue +++ b/src/components/ADempiere/ContextMenu/contextMenuDesktop.vue @@ -354,6 +354,7 @@ export default { } } + - - diff --git a/src/components/ADempiere/ContextMenu/contextMenuMobile.vue b/src/components/ADempiere/ContextMenu/contextMenuMobile.vue index cb42e890..76e34e65 100644 --- a/src/components/ADempiere/ContextMenu/contextMenuMobile.vue +++ b/src/components/ADempiere/ContextMenu/contextMenuMobile.vue @@ -319,6 +319,7 @@ export default { } } + - diff --git a/src/components/ADempiere/ContextMenu/contextMenuStyleScoped.scss b/src/components/ADempiere/ContextMenu/contextMenuStyleScoped.scss new file mode 100644 index 00000000..109d4404 --- /dev/null +++ b/src/components/ADempiere/ContextMenu/contextMenuStyleScoped.scss @@ -0,0 +1,75 @@ +// ADempiere-Vue (Frontend) for ADempiere ERP & CRM Smart Business Solution +// Copyright (C) 2017-Present E.R.P. Consultores y Asociados, C.A. +// Contributor(s): Edwin Betancourt EdwinBetanc0urt@outlook.com www.erpya.com +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +.el-dropdown-menu { + position: absolute; + top: 0; + left: 0; + z-index: 10; + padding: 10px 0; + margin: 0px 0; + background-color: #FFFFFF; + border: 1px solid #e6ebf5; + border-radius: 4px; + -webkit-box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1); + box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1); + max-width: 220px; +} + +.el-tree-node__children { + overflow: hidden; + background-color: transparent; + max-width: 99%; + overflow: auto; +} +.el-dropdown .el-button-group { + display: flex; +} + + + +.el-dropdown-menu--mini .el-dropdown-menu__item { + line-height: 14px; + padding: 0px 15px; + font-size: 10px; +} +.el-dropdown-menu__item--divided { + position: relative; + /* margin-top: 6px; */ + border-top: 1px solid #e6ebf5; +} + +.svg-icon { + width: 1em; + height: 2em; + vertical-align: -0.15em; + fill: currentColor; + overflow: hidden; +} +.label { + font-size: 14px; + margin-top: 0% !important; + margin-left: 0px; + text-align: initial; +} +.description { + margin: 0px; + font-size: 12px; + text-align: initial; +} +.contents { + display: inline-flex; +} diff --git a/src/styles/ADempiere/index.scss b/src/styles/ADempiere/index.scss new file mode 100644 index 00000000..2d20d815 --- /dev/null +++ b/src/styles/ADempiere/index.scss @@ -0,0 +1,17 @@ +// ADempiere-Vue (Frontend) for ADempiere ERP & CRM Smart Business Solution +// Copyright (C) 2017-Present E.R.P. Consultores y Asociados, C.A. +// Contributor(s): Edwin Betancourt EdwinBetanc0urt@outlook.com www.erpya.com +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +@import './view.scss'; diff --git a/src/styles/ADempiere/view.scss b/src/styles/ADempiere/view.scss index 7fb2175a..9c8e73d8 100644 --- a/src/styles/ADempiere/view.scss +++ b/src/styles/ADempiere/view.scss @@ -1,17 +1,68 @@ +// ADempiere-Vue (Frontend) for ADempiere ERP & CRM Smart Business Solution +// Copyright (C) 2017-Present E.R.P. Consultores y Asociados, C.A. +// Contributor(s): Edwin Betancourt EdwinBetanc0urt@outlook.com www.erpya.com +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +// content of the main views .view-base { + // TODO: Add display stop for views without fields (like cache reset process) height: 100%; min-height: calc(100vh - 84px); } - +// content of main views when loading .view-loading { padding: 100px 100px; height: 100%; } +// title of the main views .custom-title { color: #000000; text-size-adjust: 20px; font-size: 100%; - font-weight: 605!important; + font-weight: 605 !important; +} +// title of the main views in mobile +.custom-title-mobile { + text-align: center; + color: #000000; + text-size-adjust: 20px; + font-size: 100%; + font-weight: 605!important; + /* left: 50%; */ +} + +// smart browser help in title popover +.content-help { + width: 100%; + height: 200%; + padding-left: 39px !important; +} +// mobile smart browser help in title popover +.content-help-mobile { + width: 50%; + height: 50%; + padding-left: 15px !important; +} + +.content-collapse { + padding-left: 20 px !important; + padding-top: 50 px !important; +} + +// title content +.warn-content { + margin: 0px 0px !important; + padding-top: 0px !important; } diff --git a/src/styles/index.scss b/src/styles/index.scss index 96095ef6..f25943cc 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -4,6 +4,7 @@ @import './element-ui.scss'; @import './sidebar.scss'; @import './btn.scss'; +@import './ADempiere/index.scss'; body { height: 100%; diff --git a/src/views/ADempiere/Browser/index.vue b/src/views/ADempiere/Browser/index.vue index 3c40f708..eed5a95e 100644 --- a/src/views/ADempiere/Browser/index.vue +++ b/src/views/ADempiere/Browser/index.vue @@ -1,7 +1,7 @@ diff --git a/src/views/ADempiere/Window/index.vue b/src/views/ADempiere/Window/index.vue index f8ba513a..3b09878d 100644 --- a/src/views/ADempiere/Window/index.vue +++ b/src/views/ADempiere/Window/index.vue @@ -1,7 +1,7 @@