Skip to content

erp5-Boxiang
erp5-Boxiang
Commit 710bab7c authored by Romain Courteaud's avatar Romain Courteaud
Browse files
Options

[erp5_web_renderjs_ui] Display desktop mode on chromebook when maximized

parent a620ef82
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 38 deletions
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_nojqm_css.css
View file @ 710bab7c
...@@ -251,7 +251,7 @@ a:focus { ...@@ -251,7 +251,7 @@ a:focus {
outline-offset: -2px; outline-offset: -2px;
outline: 2px solid #3388cc; outline: 2px solid #3388cc;
} }
@media not screen and (max-width: 90em) { @media not screen and (max-width: 85em) {
a[accesskey]:after { a[accesskey]:after {
content: " [" attr(accesskey) "] "; content: " [" attr(accesskey) "] ";
} }
...@@ -346,7 +346,7 @@ textarea { ...@@ -346,7 +346,7 @@ textarea {
height: 20em; height: 20em;
} }
} }
@media only screen and (min-width: 45em) and (max-width: 90em), not screen and (max-width: 90em) { @media only screen and (min-width: 45em) and (max-width: 85em), not screen and (max-width: 85em) {
textarea { textarea {
min-height: 10em; min-height: 10em;
} }
...@@ -437,12 +437,12 @@ div[data-gadget-scope='panel'] { ...@@ -437,12 +437,12 @@ div[data-gadget-scope='panel'] {
display: block; display: block;
z-index: 2000; z-index: 2000;
} }
@media not screen and (min-width: 45em), only screen and (min-width: 45em) and (max-width: 90em) { @media not screen and (min-width: 45em), only screen and (min-width: 45em) and (max-width: 85em) {
div[data-gadget-scope='panel'] { div[data-gadget-scope='panel'] {
box-shadow: 5px 0 5px rgba(0, 0, 0, 0.15); box-shadow: 5px 0 5px rgba(0, 0, 0, 0.15);
} }
} }
@media not screen and (min-width: 45em), only screen and (min-width: 45em) and (max-width: 90em) { @media not screen and (min-width: 45em), only screen and (min-width: 45em) and (max-width: 85em) {
div[data-gadget-scope='panel'] { div[data-gadget-scope='panel'] {
left: -186pt; left: -186pt;
transition: transform 200ms ease-out; transition: transform 200ms ease-out;
...@@ -478,7 +478,7 @@ div[data-gadget-scope='panel'] div[data-role="header"] a::before { ...@@ -478,7 +478,7 @@ div[data-gadget-scope='panel'] div[data-role="header"] a::before {
text-indent: 0; text-indent: 0;
margin-left: 12pt; margin-left: 12pt;
} }
@media not screen and (max-width: 90em) { @media not screen and (max-width: 85em) {
div[data-gadget-scope='panel'] div[data-role="header"] button[data-i18n="Close"], div[data-gadget-scope='panel'] div[data-role="header"] button[data-i18n="Close"],
div[data-gadget-scope='panel'] div[data-role="header"] a[data-i18n="Close"] { div[data-gadget-scope='panel'] div[data-role="header"] a[data-i18n="Close"] {
display: none; display: none;
...@@ -568,7 +568,7 @@ div[data-gadget-scope='editor_panel'] { ...@@ -568,7 +568,7 @@ div[data-gadget-scope='editor_panel'] {
display: block; display: block;
z-index: 3000; z-index: 3000;
} }
@media not screen and (max-width: 90em) { @media not screen and (max-width: 85em) {
div[data-gadget-scope='editor_panel'] { div[data-gadget-scope='editor_panel'] {
left: -186pt; left: -186pt;
transition: transform 200ms ease-out; transition: transform 200ms ease-out;
...@@ -579,7 +579,7 @@ div[data-gadget-scope='editor_panel'] { ...@@ -579,7 +579,7 @@ div[data-gadget-scope='editor_panel'] {
transform: translate3d(186pt, 0, 0); transform: translate3d(186pt, 0, 0);
} }
} }
@media not screen and (min-width: 45em), only screen and (min-width: 45em) and (max-width: 90em) { @media not screen and (min-width: 45em), only screen and (min-width: 45em) and (max-width: 85em) {
div[data-gadget-scope='editor_panel'] { div[data-gadget-scope='editor_panel'] {
right: -186pt; right: -186pt;
transition: transform 200ms ease-out; transition: transform 200ms ease-out;
...@@ -671,7 +671,7 @@ div[data-gadget-scope='header'] .ui-header { ...@@ -671,7 +671,7 @@ div[data-gadget-scope='header'] .ui-header {
color: #FFFFFF; color: #FFFFFF;
background-color: #0E81C2; background-color: #0E81C2;
} }
@media not screen and (max-width: 90em) { @media not screen and (max-width: 85em) {
div[data-gadget-scope='header'] .ui-header { div[data-gadget-scope='header'] .ui-header {
margin-left: 180pt; margin-left: 180pt;
} }
...@@ -693,13 +693,13 @@ div[data-gadget-scope='header'] .ui-header .ui-controlgroup-controls a { ...@@ -693,13 +693,13 @@ div[data-gadget-scope='header'] .ui-header .ui-controlgroup-controls a {
transition: background-color 0.2s ease-out; transition: background-color 0.2s ease-out;
line-height: 30pt; line-height: 30pt;
} }
@media not screen and (max-width: 90em) { @media not screen and (max-width: 85em) {
div[data-gadget-scope='header'] .ui-header .ui-controlgroup-controls button, div[data-gadget-scope='header'] .ui-header .ui-controlgroup-controls button,
div[data-gadget-scope='header'] .ui-header .ui-controlgroup-controls a { div[data-gadget-scope='header'] .ui-header .ui-controlgroup-controls a {
background-color: #0E81C2; background-color: #0E81C2;
} }
} }
@media not screen and (min-width: 45em), only screen and (min-width: 45em) and (max-width: 90em) { @media not screen and (min-width: 45em), only screen and (min-width: 45em) and (max-width: 85em) {
div[data-gadget-scope='header'] .ui-header .ui-controlgroup-controls button, div[data-gadget-scope='header'] .ui-header .ui-controlgroup-controls button,
div[data-gadget-scope='header'] .ui-header .ui-controlgroup-controls a { div[data-gadget-scope='header'] .ui-header .ui-controlgroup-controls a {
background-color: #085078; background-color: #085078;
...@@ -711,7 +711,7 @@ div[data-gadget-scope='header'] .ui-header .ui-controlgroup-controls button:acti ...@@ -711,7 +711,7 @@ div[data-gadget-scope='header'] .ui-header .ui-controlgroup-controls button:acti
div[data-gadget-scope='header'] .ui-header .ui-controlgroup-controls a:active { div[data-gadget-scope='header'] .ui-header .ui-controlgroup-controls a:active {
background-color: #0e90d8; background-color: #0e90d8;
} }
@media only screen and (min-width: 45em) and (max-width: 90em) { @media only screen and (min-width: 45em) and (max-width: 85em) {
div[data-gadget-scope='header'] .ui-header .ui-controlgroup-controls button, div[data-gadget-scope='header'] .ui-header .ui-controlgroup-controls button,
div[data-gadget-scope='header'] .ui-header .ui-controlgroup-controls a { div[data-gadget-scope='header'] .ui-header .ui-controlgroup-controls a {
width: 8em; width: 8em;
...@@ -726,7 +726,7 @@ div[data-gadget-scope='header'] .ui-header .ui-controlgroup-controls a:active { ...@@ -726,7 +726,7 @@ div[data-gadget-scope='header'] .ui-header .ui-controlgroup-controls a:active {
white-space: nowrap; white-space: nowrap;
} }
} }
@media only screen and (min-width: 45em) and (max-width: 90em), not screen and (max-width: 90em) { @media only screen and (min-width: 45em) and (max-width: 85em), not screen and (max-width: 85em) {
div[data-gadget-scope='header'] .ui-header .ui-controlgroup-controls button::before, div[data-gadget-scope='header'] .ui-header .ui-controlgroup-controls button::before,
div[data-gadget-scope='header'] .ui-header .ui-controlgroup-controls a::before { div[data-gadget-scope='header'] .ui-header .ui-controlgroup-controls a::before {
width: 1em; width: 1em;
...@@ -742,7 +742,7 @@ div[data-gadget-scope='header'] .ui-header .ui-controlgroup-controls a:active { ...@@ -742,7 +742,7 @@ div[data-gadget-scope='header'] .ui-header .ui-controlgroup-controls a:active {
margin-left: 12pt; margin-left: 12pt;
} }
} }
@media not screen and (max-width: 90em) { @media not screen and (max-width: 85em) {
div[data-gadget-scope='header'] .ui-header .ui-controlgroup-controls button[name="panel"], div[data-gadget-scope='header'] .ui-header .ui-controlgroup-controls button[name="panel"],
div[data-gadget-scope='header'] .ui-header .ui-controlgroup-controls a[name="panel"] { div[data-gadget-scope='header'] .ui-header .ui-controlgroup-controls a[name="panel"] {
display: none; display: none;
...@@ -752,13 +752,13 @@ div[data-gadget-scope='header'] .ui-header > .ui-btn-left button, ...@@ -752,13 +752,13 @@ div[data-gadget-scope='header'] .ui-header > .ui-btn-left button,
div[data-gadget-scope='header'] .ui-header > .ui-btn-left a { div[data-gadget-scope='header'] .ui-header > .ui-btn-left a {
border-right: 1px solid rgba(255, 255, 255, 0.55); border-right: 1px solid rgba(255, 255, 255, 0.55);
} }
@media not screen and (min-width: 45em), only screen and (min-width: 45em) and (max-width: 90em) { @media not screen and (min-width: 45em), only screen and (min-width: 45em) and (max-width: 85em) {
div[data-gadget-scope='header'] .ui-header > .ui-btn-right button, div[data-gadget-scope='header'] .ui-header > .ui-btn-right button,
div[data-gadget-scope='header'] .ui-header > .ui-btn-right a { div[data-gadget-scope='header'] .ui-header > .ui-btn-right a {
border-left: 1px solid rgba(255, 255, 255, 0.55); border-left: 1px solid rgba(255, 255, 255, 0.55);
} }
} }
@media not screen and (max-width: 90em) { @media not screen and (max-width: 85em) {
div[data-gadget-scope='header'] .ui-header > .ui-btn-right button, div[data-gadget-scope='header'] .ui-header > .ui-btn-right button,
div[data-gadget-scope='header'] .ui-header > .ui-btn-right a { div[data-gadget-scope='header'] .ui-header > .ui-btn-right a {
padding-left: 24pt; padding-left: 24pt;
...@@ -775,7 +775,7 @@ div[data-gadget-scope='header'] .ui-header h1 { ...@@ -775,7 +775,7 @@ div[data-gadget-scope='header'] .ui-header h1 {
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
@media not screen and (max-width: 90em) { @media not screen and (max-width: 85em) {
div[data-gadget-scope='header'] .ui-header h1 { div[data-gadget-scope='header'] .ui-header h1 {
flex: 1 100%; flex: 1 100%;
} }
...@@ -788,7 +788,7 @@ div[data-gadget-scope='header'] .ui-header h1 > span { ...@@ -788,7 +788,7 @@ div[data-gadget-scope='header'] .ui-header h1 > span {
padding-left: 30pt; padding-left: 30pt;
} }
} }
@media not screen and (max-width: 90em) { @media not screen and (max-width: 85em) {
div[data-gadget-scope='header'] .ui-header h1 > span { div[data-gadget-scope='header'] .ui-header h1 > span {
padding-left: 24pt; padding-left: 24pt;
} }
...@@ -803,12 +803,12 @@ div[data-gadget-scope='header'] .ui-header h1 a::before { ...@@ -803,12 +803,12 @@ div[data-gadget-scope='header'] .ui-header h1 a::before {
display: inline-block; display: inline-block;
width: 42pt; width: 42pt;
} }
@media only screen and (min-width: 45em) and (max-width: 90em), not screen and (min-width: 45em) { @media only screen and (min-width: 45em) and (max-width: 85em), not screen and (min-width: 45em) {
div[data-gadget-scope='header'] .ui-header h1 a::before { div[data-gadget-scope='header'] .ui-header h1 a::before {
text-align: center; text-align: center;
} }
} }
@media not screen and (max-width: 90em) { @media not screen and (max-width: 85em) {
div[data-gadget-scope='header'] .ui-header h1 a::before { div[data-gadget-scope='header'] .ui-header h1 a::before {
padding-left: 24pt; padding-left: 24pt;
} }
...@@ -818,13 +818,13 @@ div[data-gadget-scope='header'] .ui-header h1 a::before { ...@@ -818,13 +818,13 @@ div[data-gadget-scope='header'] .ui-header h1 a::before {
width: 30pt; width: 30pt;
} }
} }
@media not screen and (max-width: 90em) { @media not screen and (max-width: 85em) {
div[data-gadget-scope='header'] .ui-header .ui-subheader { div[data-gadget-scope='header'] .ui-header .ui-subheader {
text-align: left; text-align: left;
flex: 1; flex: 1;
} }
} }
@media not screen and (min-width: 45em), only screen and (min-width: 45em) and (max-width: 90em) { @media not screen and (min-width: 45em), only screen and (min-width: 45em) and (max-width: 85em) {
div[data-gadget-scope='header'] .ui-header .ui-subheader { div[data-gadget-scope='header'] .ui-header .ui-subheader {
flex: 1 100%; flex: 1 100%;
} }
...@@ -832,7 +832,7 @@ div[data-gadget-scope='header'] .ui-header h1 a::before { ...@@ -832,7 +832,7 @@ div[data-gadget-scope='header'] .ui-header h1 a::before {
div[data-gadget-scope='header'] .ui-header ul { div[data-gadget-scope='header'] .ui-header ul {
display: flex; display: flex;
} }
@media only screen and (min-width: 45em) and (max-width: 90em), not screen and (min-width: 45em) { @media only screen and (min-width: 45em) and (max-width: 85em), not screen and (min-width: 45em) {
div[data-gadget-scope='header'] .ui-header ul li { div[data-gadget-scope='header'] .ui-header ul li {
flex: 1; flex: 1;
border-left: 1px solid rgba(0, 0, 0, 0.55); border-left: 1px solid rgba(0, 0, 0, 0.55);
...@@ -844,7 +844,7 @@ div[data-gadget-scope='header'] .ui-header ul { ...@@ -844,7 +844,7 @@ div[data-gadget-scope='header'] .ui-header ul {
display: block; display: block;
} }
} }
@media only screen and (min-width: 45em) and (max-width: 90em) { @media only screen and (min-width: 45em) and (max-width: 85em) {
div[data-gadget-scope='header'] .ui-header ul li a { div[data-gadget-scope='header'] .ui-header ul li a {
padding-top: 3pt; padding-top: 3pt;
padding-bottom: 3pt; padding-bottom: 3pt;
...@@ -873,7 +873,7 @@ div[data-gadget-scope='header'] .ui-header ul { ...@@ -873,7 +873,7 @@ div[data-gadget-scope='header'] .ui-header ul {
width: 100%; width: 100%;
} }
} }
@media not screen and (max-width: 90em) { @media not screen and (max-width: 85em) {
div[data-gadget-scope='header'] .ui-header ul li a { div[data-gadget-scope='header'] .ui-header ul li a {
display: block; display: block;
padding-left: 24pt; padding-left: 24pt;
...@@ -927,12 +927,12 @@ div[data-gadget-scope='header'] .ui-header ul { ...@@ -927,12 +927,12 @@ div[data-gadget-scope='header'] .ui-header ul {
.gadget-content input[type='submit']:active { .gadget-content input[type='submit']:active {
background-color: #ffa366; background-color: #ffa366;
} }
@media not screen and (max-width: 90em) { @media not screen and (max-width: 85em) {
.gadget-content { .gadget-content {
margin-left: 180pt; margin-left: 180pt;
} }
} }
@media only screen and (min-width: 45em) and (max-width: 90em) { @media only screen and (min-width: 45em) and (max-width: 85em) {
.gadget-content { .gadget-content {
padding-top: 7em; padding-top: 7em;
} }
...@@ -1004,7 +1004,7 @@ div[data-gadget-scope='header'] .ui-header ul { ...@@ -1004,7 +1004,7 @@ div[data-gadget-scope='header'] .ui-header ul {
position: absolute; position: absolute;
right: 6pt; right: 6pt;
} }
@media only screen and (min-width: 45em) and (max-width: 90em), not screen and (max-width: 90em) { @media only screen and (min-width: 45em) and (max-width: 85em), not screen and (max-width: 85em) {
.gadget-content .left, .gadget-content .left,
.gadget-content .right { .gadget-content .right {
vertical-align: top; vertical-align: top;
...@@ -1015,7 +1015,7 @@ div[data-gadget-scope='header'] .ui-header ul { ...@@ -1015,7 +1015,7 @@ div[data-gadget-scope='header'] .ui-header ul {
padding-left: 24pt; padding-left: 24pt;
} }
} }
@media only screen and (min-width: 45em) and (max-width: 90em), not screen and (max-width: 90em) { @media only screen and (min-width: 45em) and (max-width: 85em), not screen and (max-width: 85em) {
.gadget-content .ui-field-contain { .gadget-content .ui-field-contain {
display: flex; display: flex;
} }
...@@ -1026,7 +1026,7 @@ div[data-gadget-scope='header'] .ui-header ul { ...@@ -1026,7 +1026,7 @@ div[data-gadget-scope='header'] .ui-header ul {
flex: 3; flex: 3;
} }
} }
@media only screen and (min-width: 45em) and (max-width: 90em), not screen and (max-width: 90em) { @media only screen and (min-width: 45em) and (max-width: 85em), not screen and (max-width: 85em) {
.gadget-content .center .ui-field-contain label + div { .gadget-content .center .ui-field-contain label + div {
flex: 7; flex: 7;
} }
...@@ -1037,7 +1037,7 @@ div[data-gadget-scope='header'] .ui-header ul { ...@@ -1037,7 +1037,7 @@ div[data-gadget-scope='header'] .ui-header ul {
.gadget-content form label span span { .gadget-content form label span span {
animation: fadein 0.2s ease-out; animation: fadein 0.2s ease-out;
} }
@media not screen and (max-width: 90em), only screen and (min-width: 45em) and (max-width: 90em) { @media not screen and (max-width: 85em), only screen and (min-width: 45em) and (max-width: 85em) {
.gadget-content form label span span { .gadget-content form label span span {
background-color: #FF6600; background-color: #FF6600;
color: #f8fff3; color: #f8fff3;
...@@ -1223,7 +1223,7 @@ div[data-gadget-scope='erp5_searchfield'] button { ...@@ -1223,7 +1223,7 @@ div[data-gadget-scope='erp5_searchfield'] button {
.document_table table tbody tr:active { .document_table table tbody tr:active {
background-color: #e0e0e0; background-color: #e0e0e0;
} }
@media not screen and (max-width: 90em), only screen and (min-width: 45em) and (max-width: 90em) { @media not screen and (max-width: 85em), only screen and (min-width: 45em) and (max-width: 85em) {
.document_table table tbody a { .document_table table tbody a {
display: block; display: block;
padding: 3pt; padding: 3pt;
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_nojqm_css.xml
View file @ 710bab7c
...@@ -242,7 +242,7 @@ ...@@ -242,7 +242,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>958.18776.46267.41045</string> </value> <value> <string>958.19701.31404.5597</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -260,7 +260,7 @@ ...@@ -260,7 +260,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1490632830.94</float> <float>1490687640.52</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_js.js
View file @ 710bab7c
...@@ -223,7 +223,7 @@ ...@@ -223,7 +223,7 @@
event, event,
context = this; context = this;
function extractSizeAndDispatch() { function extractSizeAndDispatch() {
if (window.matchMedia("(min-width: 90em)").matches) { if (window.matchMedia("(min-width: 85em)").matches) {
return context.changeState({ return context.changeState({
desktop: true desktop: true
}); });
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_js.xml
View file @ 710bab7c
...@@ -230,7 +230,7 @@ ...@@ -230,7 +230,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>957.46809.34243.17971</string> </value> <value> <string>958.19723.40120.16469</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -248,7 +248,7 @@ ...@@ -248,7 +248,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1488381715.57</float> <float>1490688736.61</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui/erp5css.less.txt
View file @ 710bab7c
...@@ -48,8 +48,8 @@ ...@@ -48,8 +48,8 @@
// @panelwidth: 15em; // @panelwidth: 15em;
@smartphone: ~"not screen and (min-width: 45em)"; @smartphone: ~"not screen and (min-width: 45em)";
@tablet: ~"only screen and (min-width: 45em) and (max-width: 90em)"; @tablet: ~"only screen and (min-width: 45em) and (max-width: 85em)";
@desktop: ~"not screen and (max-width: 90em)"; @desktop: ~"not screen and (max-width: 85em)";
/********************************************** /**********************************************
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7