pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[REF] web, website: share modal.less file

Browse Source 
Following https://github.com/odoo/odoo/commit/5658e337c3e0385d3d116e34404ef4086b3e94f0:
The modal.less file is now in the common assets so that the
dialogs' style is shared instead of duplicated.
This commit is contained in:
qsm-odoo
2017-08-22 13:02:12 +02:00
parent 69d9058cd2
commit f997c128c7
3 changed files with 4 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web/static/src/less/modal.less
+2 -2
View File
@@ -1,4 +1,4 @@
.modal {
.modal.o_technical_modal {
.modal-content {
border-radius: 0;
@@ -89,7 +89,7 @@
@zindex-modal-background: @zindex-modal;
// Temporary fix for modals which are not instantiated thanks to the Dialog
// JS classes (deprecated case).
// JS classes (deprecated case) + Frontend.
:not(body) > .modal {
z-index: @zindex-modal-background + 1;
}
addons/web/views/webclient_templates.xml
+2 -2
View File
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<template id="web.less_helpers">
<link rel="stylesheet" type="text/less" href="/web/static/lib/bootstrap/less/variables.less"/>
<link rel="stylesheet" type="text/less" href="/web/static/lib/bootstrap/less/mixins/vendor-prefixes.less"/>
<link rel="stylesheet" type="text/less" href="/web/static/lib/bootstrap/less/mixins/buttons.less"/>
<link rel="stylesheet" type="text/less" href="/web/static/lib/bootstrap/less/mixins/clearfix.less"/>
<link rel="stylesheet" type="text/less" href="/web/static/lib/bootstrap/less/mixins/size.less"/>
<link rel="stylesheet" type="text/less" href="/web/static/src/less/variables.less"/>
@@ -23,6 +23,7 @@
<link rel="stylesheet" type="text/less" href="/web/static/src/less/fonts.less"/>
<link rel="stylesheet" type="text/less" href="/web/static/src/less/navbar.less"/>
<link rel="stylesheet" type="text/less" href="/web/static/src/less/mimetypes.less"/>
<link rel="stylesheet" type="text/less" href="/web/static/src/less/modal.less"/>
<link rel="stylesheet" type="text/less" href="/web/static/src/less/animation.less"/>
<link rel="stylesheet" type="text/less" href="/web/static/src/less/rainbow.less"/>
<link rel="stylesheet" type="text/less" href="/web/static/src/less/datepicker.less"/>
@@ -125,7 +126,6 @@
<link rel="stylesheet" type="text/less" href="/web/static/src/less/web_calendar.less"/>
<link rel="stylesheet" type="text/less" href="/web/static/src/less/search_view.less"/>
<link rel="stylesheet" type="text/less" href="/web/static/src/less/search_view_extra.less"/>
<link rel="stylesheet" type="text/less" href="/web/static/src/less/modal.less"/>
<link rel="stylesheet" type="text/less" href="/web/static/src/less/data_export.less"/>
<script type="text/javascript" src="/web/static/lib/jquery.scrollTo/jquery.scrollTo.js"></script>
addons/website/static/src/less/website.ui.components.less
-39
View File
@@ -48,45 +48,6 @@ body .modal {
.o-w-close-icon(12px);
margin-right: -2px;
}
.modal-content {
.modal-header .o_subtitle {
margin-left: 10px;
}
.modal-body {
.o_modal_header {
.o-webclient-padding(@top: 10px, @bottom: 10px);
.clearfix();
}
}
.modal-footer {
.btn {
text-transform: uppercase;
}
}
}
@media (min-width: @screen-sm-min) {
.modal-dialog {
height: 100%;
padding: 30px 0;
margin: 0 auto;
.modal-content {
max-height: 100%;
.o-flex-display();
.o-flex-flow(column, nowrap);
.modal-header, .modal-footer {
.o-flex(0, 0, auto);
}
.modal-body {
overflow: auto;
}
}
}
}
}
// MOBILE PREVIEW