Commit 3d8792f3 authored by Jérome Perrin's avatar Jérome Perrin

Revert "web_renderjs_ui: make bottom editor not too big in dialog mode"

This reverts commit 11b815bc.

This approach was not enough to solve on all dialogs the problem that
button is not always on the screen and it can still be confusing.

!800 (comment 69514)
parent 11b815bc
...@@ -1187,9 +1187,6 @@ div[data-gadget-scope='header'] .ui-header ul { ...@@ -1187,9 +1187,6 @@ div[data-gadget-scope='header'] .ui-header ul {
.gadget-content .bottom div[data-gadget-url$="gadget_erp5_field_listbox.html"] iframe { .gadget-content .bottom div[data-gadget-url$="gadget_erp5_field_listbox.html"] iframe {
height: 30vh; height: 30vh;
} }
.gadget-content .form_dialog .bottom iframe {
height: 20em;
}
.gadget-content form .ui-field-contain { .gadget-content form .ui-field-contain {
position: relative; position: relative;
} }
...@@ -1764,7 +1761,7 @@ div[data-gadget-scope='maximize'] button:active { ...@@ -1764,7 +1761,7 @@ div[data-gadget-scope='maximize'] button:active {
height: calc(100vh - 30pt ); height: calc(100vh - 30pt );
} }
.editor-maximize div[data-gadget-scope='editor'] iframe { .editor-maximize div[data-gadget-scope='editor'] iframe {
height: 100% !important; height: 100%;
} }
/********************************************** /**********************************************
* Front page * Front page
......
...@@ -260,8 +260,8 @@ ...@@ -260,8 +260,8 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1542086791.36</float> <float>1533747628.29</float>
<string>GMT+9</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
</object> </object>
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
</section> </section>
<!-- XXX action, method, fieldset --> <!-- XXX action, method, fieldset -->
<form class="form_dialog"> <form>
<div data-gadget-url="gadget_erp5_form.html" <div data-gadget-url="gadget_erp5_form.html"
data-gadget-scope="erp5_form" data-gadget-scope="erp5_form"
data-gadget-sandbox="public"> data-gadget-sandbox="public">
......
...@@ -252,8 +252,8 @@ ...@@ -252,8 +252,8 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1542080124.77</float> <float>1537196435.99</float>
<string>GMT+9</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
</object> </object>
......
...@@ -1386,16 +1386,6 @@ div[data-gadget-scope='header'] .ui-header { ...@@ -1386,16 +1386,6 @@ div[data-gadget-scope='header'] .ui-header {
} }
} }
} }
// In form_dialog, we don't want editors to be too big, because there
// is a dialog_button_container below, which we want to be in viewport
.form_dialog {
.bottom {
iframe {
height: 20em;
}
}
}
/* /*
@media @smartphone { @media @smartphone {
...@@ -2012,9 +2002,7 @@ div[data-gadget-scope='maximize'] button { ...@@ -2012,9 +2002,7 @@ div[data-gadget-scope='maximize'] button {
width: 100vw; width: 100vw;
height: ~"calc(100vh - "@headerheight~")"; height: ~"calc(100vh - "@headerheight~")";
iframe { iframe {
// this is !important because we want it to have priority over height: 100%;
// the rule for form_dialog bottom iframe rule
height: 100% !important;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment