diff --git a/muk_web_theme/__manifest__.py b/muk_web_theme/__manifest__.py
index b833626..fad1b6e 100644
--- a/muk_web_theme/__manifest__.py
+++ b/muk_web_theme/__manifest__.py
@@ -1,63 +1,63 @@
-###################################################################################
-#
-# Copyright (c) 2017-2019 MuK IT GmbH.
-#
-# This file is part of MuK Backend Theme
-# (see https://mukit.at).
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program. If not, see .
-#
-###################################################################################
-{
- "name": "MuK Backend Theme",
- "summary": "Odoo Community Backend Theme",
- "version": "13.0.1.0.0",
- "category": "Themes/Backend",
- "license": "LGPL-3",
- "author": "MuK IT",
- "website": "http://www.mukit.at",
- 'live_test_url': 'https://mukit.at/r/SgN',
- "contributors": [
- "Mathias Markl ",
- "Benedikt Jilek ",
- ],
- "depends": [
- "muk_web_utils",
- ],
- "excludes": [
- "web_enterprise",
- ],
- "data": [
- "template/assets.xml",
- "template/web.xml",
- "views/res_users.xml",
- "views/res_config_settings_view.xml",
- "data/res_company.xml",
- ],
- "qweb": [
- "static/src/xml/*.xml",
- ],
- "images": [
- 'static/description/banner.png',
- 'static/description/theme_screenshot.png'
- ],
- "external_dependencies": {
- "python": [],
- "bin": [],
- },
- "application": False,
- "installable": True,
- "auto_install": False,
- "uninstall_hook": "_uninstall_reset_changes",
-}
+###################################################################################
+#
+# Copyright (c) 2017-2019 MuK IT GmbH.
+#
+# This file is part of MuK Backend Theme
+# (see https://mukit.at).
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program. If not, see .
+#
+###################################################################################
+{
+ "name": "MuK Backend Theme",
+ "summary": "Odoo Community Backend Theme",
+ "version": "13.0.1.0.1",
+ "category": "Themes/Backend",
+ "license": "LGPL-3",
+ "author": "MuK IT",
+ "website": "http://www.mukit.at",
+ 'live_test_url': 'https://mukit.at/r/SgN',
+ "contributors": [
+ "Mathias Markl ",
+ "Benedikt Jilek ",
+ ],
+ "depends": [
+ "muk_web_utils",
+ ],
+ "excludes": [
+ "web_enterprise",
+ ],
+ "data": [
+ "template/assets.xml",
+ "template/web.xml",
+ "views/res_users.xml",
+ "views/res_config_settings_view.xml",
+ "data/res_company.xml",
+ ],
+ "qweb": [
+ "static/src/xml/*.xml",
+ ],
+ "images": [
+ 'static/description/banner.png',
+ 'static/description/theme_screenshot.png'
+ ],
+ "external_dependencies": {
+ "python": [],
+ "bin": [],
+ },
+ "application": False,
+ "installable": True,
+ "auto_install": False,
+ "uninstall_hook": "_uninstall_reset_changes",
+}
diff --git a/muk_web_theme/static/src/scss/control_panel.scss b/muk_web_theme/static/src/scss/control_panel.scss
index f887634..5ecbb84 100644
--- a/muk_web_theme/static/src/scss/control_panel.scss
+++ b/muk_web_theme/static/src/scss/control_panel.scss
@@ -20,6 +20,7 @@
*
**********************************************************************************/
+
@include media-breakpoint-down(sm) {
.o_control_panel {
padding-left: $o-horizontal-padding /2;
@@ -38,21 +39,28 @@
text-overflow: ellipsis;
}
.o_cp_searchview {
- overflow: hidden;
- max-width: 20%;
- min-width: 20%;
- text-align: right;
- .o_searchview {
- border: none;
- padding: 3.5px 5px;
- .o_enable_searchview {
- margin-left: 0;
- box-shadow: none;
- &:before {
- padding-right: 5px;
- }
- }
- }
+ min-height: 35px;
+ &.o_searchview_quick {
+ width: 100%;
+ display: flex;
+ align-items: flex-start;
+ .o_searchview {
+ border: none;
+ display: flex;
+ flex: 1 1 auto;
+ align-items: center;
+ .o_searchview_input_container {
+ flex: 1 1 auto;
+ }
+ .o_enable_searchview {
+ margin-left: 0;
+ padding-left: 0;
+ &:before {
+ padding-right: 5px;
+ }
+ }
+ }
+ }
}
.o_cp_left {
flex-basis: 50%;
@@ -116,4 +124,4 @@
}
}
}
-}
\ No newline at end of file
+}
diff --git a/muk_web_theme/static/src/scss/form_view.scss b/muk_web_theme/static/src/scss/form_view.scss
index f991c77..89f03ec 100644
--- a/muk_web_theme/static/src/scss/form_view.scss
+++ b/muk_web_theme/static/src/scss/form_view.scss
@@ -1,189 +1,150 @@
-/**********************************************************************************
-*
-* Copyright (c) 2017-2019 MuK IT GmbH.
-*
-* This file is part of MuK Backend Theme
-* (see https://mukit.at).
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public License
-* along with this program. If not, see .
-*
-**********************************************************************************/
-
-.o_form_view {
- .o_form_sheet_bg {
- background: $o-webclient-background-color;
- border-bottom: 1px solid gray('300');
- > .o_form_sheet {
- @include mk-container-widths();
- background-color: $o-view-background-color;
- border: 1px solid gray('400');
- box-shadow: 0 5px 20px -15px black;
- max-width: calc(100% - #{$o-horizontal-padding*2});
- }
- .o_form_statusbar {
- position: sticky;
- z-index: 1;
- top: 0;
- }
- .oe_button_box {
- .btn.oe_stat_button > .o_button_icon {
- color: $o-brand-odoo;
- }
- .btn.oe_stat_button > .o_stat_info {
- padding-right: 3px;
- }
- &, & + .oe_avatar {
- + .oe_title {
- max-width: calc(100% - 420px);
- width: initial !important;
- }
- }
- }
- .oe_title {
- max-width: 100%;
- width: initial;
- span.o_field_widget {
- max-width: 100%;
- text-overflow: ellipsis;
- white-space: nowrap;
- overflow: hidden;
- width: initial;
- }
- }
- .o_notebook {
- .nav-tabs {
- overflow-x : auto;
- overflow-y: hidden;
- flex-flow: nowrap;
- .nav-item {
- white-space: nowrap;
- }
- }
- }
- }
- @include media-breakpoint-down(sm) {
- .o_form_sheet, .oe_chatter {
- min-width: 100% !important;
- max-width: 100% !important;
- margin-top: 15px !important;
- }
- .o_group {
- @for $i from 1 through $o-form-group-cols {
- .o_group_col_#{$i} {
- width: 100% !important;
- }
- }
- .o_field_widget.o_text_overflow {
- width: auto !important;
- }
- }
- .o_statusbar_buttons_dropdown {
- border: {
- bottom: 0;
- radius: 0;
- top: 0;
- }
- height: 100%;
- }
- .o_statusbar_buttons > .btn {
- border-radius: 0;
- border: 0;
- width: 100%;
- margin-bottom: 0.2rem;
- &:last-child {
- margin-bottom: 0;
- }
- }
- .o_statusbar_status {
- .o_arrow_button:first-child::before {
- content: none;
- display: none;
- }
- }
- .app_settings_block {
- .row {
- margin: 0;
- }
- }
- .o_notebook .nav-tabs {
- &::-webkit-scrollbar {
- display: none;
- }
- }
- .o_cp_buttons {
- width: 100%;
- div, .o-kanban-button-new {
- width: 100%;
- }
- }
- }
- @include media-breakpoint-down(xs) {
- .oe_button_box {
- float: none;
- display: block;
- border-radius: 0;
- text-align: right;
- margin-top: -17px;
- margin-bottom: $o-sheet-vpadding;
- margin-left: -$o-horizontal-padding;
- width: calc(100% + #{$o-horizontal-padding*2});
- > .btn.oe_stat_button {
- border: none;
- background: none;
- flex: 0 0 auto !important;
- width: percentage(1/3) !important;
- border-right: 1px solid $o-form-lightsecondary;
- }
- > .btn.o_button_more {
- flex: 1 1 auto !important;
- border-right: none;
- }
- > .o_dropdown_more {
- flex: 0 0 auto !important;
- width: percentage(1/3) !important;
- }
- &, & + .oe_avatar {
- + .oe_title {
- width: 100%;
- }
- }
- }
- .oe_title {
- width: 100% !important;
- max-width: 100% !important;
- }
- }
-}
-
-.mk_chatter_position_sided {
- @include media-breakpoint-up(xxl, $o-extra-grid-breakpoints) {
- .o_form_view:not(.o_form_nosheet) {
- display: flex;
- flex-flow: row nowrap;
- height: 100%;
- .o_form_sheet_bg {
- min-width: $mk-form-min-width;
- flex: 1 1 auto;
- overflow: auto;
- }
- > .o_chatter {
- flex: 1 1 auto;
- overflow: auto;
- min-width: $mk-chatter-min-width;
- max-width: $mk-chatter-max-width;
- border-left: 1px solid gray('400');
- }
- }
- }
+/**********************************************************************************
+*
+* Copyright (c) 2017-2019 MuK IT GmbH.
+*
+* This file is part of MuK Backend Theme
+* (see https://mukit.at).
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program. If not, see .
+*
+**********************************************************************************/
+
+.o_form_view {
+ .o_form_sheet_bg {
+ background: $o-webclient-background-color;
+ border-bottom: 1px solid gray('300');
+ > .o_form_sheet {
+ @include mk-container-widths();
+ background-color: $o-view-background-color;
+ border: 1px solid gray('400');
+ box-shadow: 0 5px 20px -15px black;
+ max-width: calc(100% - #{$o-horizontal-padding*2});
+ }
+ .o_form_statusbar {
+ position: sticky;
+ z-index: 1;
+ top: 0;
+ }
+ .oe_button_box {
+ .btn.oe_stat_button > .o_button_icon {
+ color: $o-brand-odoo;
+ }
+ }
+ .oe_title {
+ max-width: 100%;
+ width: initial;
+ span.o_field_widget {
+ max-width: 100%;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ overflow: hidden;
+ width: initial;
+ }
+ }
+ .o_notebook {
+ .nav-tabs {
+ overflow-x : auto;
+ overflow-y: hidden;
+ flex-flow: nowrap;
+ .nav-item {
+ white-space: nowrap;
+ }
+ }
+ }
+ }
+ @include media-breakpoint-down(sm) {
+ .o_form_sheet, .oe_chatter {
+ min-width: 100% !important;
+ max-width: 100% !important;
+ margin-top: 15px !important;
+ }
+ .o_group {
+ @for $i from 1 through $o-form-group-cols {
+ .o_group_col_#{$i} {
+ width: 100% !important;
+ }
+ }
+ .o_field_widget.o_text_overflow {
+ width: auto !important;
+ }
+ }
+ .o_statusbar_buttons_dropdown {
+ border: {
+ bottom: 0;
+ radius: 0;
+ top: 0;
+ }
+ height: 100%;
+ }
+ .o_statusbar_buttons > .btn {
+ border-radius: 0;
+ border: 0;
+ width: 100%;
+ margin-bottom: 0.2rem;
+ &:last-child {
+ margin-bottom: 0;
+ }
+ }
+ .o_statusbar_status {
+ .o_arrow_button:first-child::before {
+ content: none;
+ display: none;
+ }
+ }
+ .app_settings_block {
+ .row {
+ margin: 0;
+ }
+ }
+ .o_notebook .nav-tabs {
+ &::-webkit-scrollbar {
+ display: none;
+ }
+ }
+ .o_cp_buttons {
+ width: 100%;
+ div, .o-kanban-button-new {
+ width: 100%;
+ }
+ }
+ }
+ @include media-breakpoint-down(xs) {
+ .oe_title {
+ width: 100% !important;
+ max-width: 100% !important;
+ }
+ }
+}
+
+.mk_chatter_position_sided {
+ @include media-breakpoint-up(xxl, $o-extra-grid-breakpoints) {
+ .o_form_view:not(.o_form_nosheet) {
+ display: flex;
+ flex-flow: row nowrap;
+ height: 100%;
+ .o_form_sheet_bg {
+ min-width: $mk-form-min-width;
+ flex: 1 1 auto;
+ overflow: auto;
+ }
+ > .o_chatter {
+ flex: 1 1 auto;
+ overflow: auto;
+ min-width: $mk-chatter-min-width;
+ max-width: $mk-chatter-max-width;
+ border-left: 1px solid gray('400');
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/muk_web_theme/static/src/scss/search_view.scss b/muk_web_theme/static/src/scss/search_view.scss
index bbd5b1f..cd5d89d 100644
--- a/muk_web_theme/static/src/scss/search_view.scss
+++ b/muk_web_theme/static/src/scss/search_view.scss
@@ -20,22 +20,29 @@
*
**********************************************************************************/
+.o_searchview {
+ padding: 0;
+ border: none;
+ width: 100%;
+ margin-bottom: 5px;
+ button {
+ background-color: $white;
+ border-color: $border-color;
+ color: $gray-600;
+ border: none;
+ }
+ .o_enable_searchview {
+ float: right;
+ }
+ .o_searchview_input_container {
+ border-bottom: 1px solid $o-brand-secondary;
+ }
+}
+
.o_modal_header {
.o_searchview, .o_pager {
display: inline-block;
}
- .o_searchview {
- padding: 0;
- border: none;
- width: 100%;
- margin-bottom: 5px;
- border-bottom: 1px solid $o-brand-secondary;
- button {
- background-color: $white;
- border-color: $border-color;
- color: $gray-600;
- }
- }
}
@include media-breakpoint-between(sm, lg, $o-extra-grid-breakpoints) {
@@ -44,4 +51,4 @@
display: none;
}
}
-}
\ No newline at end of file
+}