Skip to content

[FIXED #106111368] Pulldown menus should be folded inside flex div in mobile #81

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tomatell wants to merge 1 commit into
base: szh-fork
Choose a base branch
from
Open

[FIXED #106111368] Pulldown menus should be folded inside flex div in mobile #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/client/partials/x-registry-search.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,24 @@
<form novalidate class="flex-form">
<fieldset class="flex-form-fieldset-search-box">
<span class="x-fieldset-title">{{'generic.search.searching' | translate}} ({{schema.transCode || schema.title | translate}})</span>
<div class="flex-form-row" ng-repeat="crit in searchCrits">
<div class="flex-form-search-box-headers" ng-repeat="crit in searchCrits">
<div class="flex-form-col-left">
<select ng-options="d.name group by [d.group] for d in schemaFields" ng-model="crit.field" ng-change=""></select>
</div>
<div class="flex-form-col-left">
<select ng-options="o.text for o in allOps" ng-model="crit.op"></select>
</div>
<div class="flex-form-col-middle"
xpsui-by-schema-field-edit xpsui-schema="{{crit.field.path ? 'schema.' + objectPathToSchemaPath(crit.field.path) : null}}"
xpsui-model="crit.val" ng-keypress="filterKeyPressed($event)"></div>
<div class="flex-form-col-middle">
<div xpsui-by-schema-field-edit xpsui-schema="{{crit.field.path ? 'schema.' + objectPathToSchemaPath(crit.field.path) : null}}"
xpsui-model="crit.val" ng-keypress="filterKeyPressed($event)">
</div>
<div class="flex-form-col-right">
<button ng-click="removeCrit($index)" type="button" class="btn-clear"><i class="icon-remove"></i> {{'generic.search.remove' | translate}}</button>
</div>
</div>
</div>


<div class="flex-form-row" style="">
<div class="flex-form-col-middle">
<button ng-click="addNewCrit()" type="button" class="btn-secondary"><i class="icon-add"></i> {{'generic.search.add' | translate}}</button>
Expand Down
269 changes: 10 additions & 259 deletions src/client/scss/x/_flex-form.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,68 +1,6 @@
@media screen and (max-width: 1960px){
.flex-form-fieldset-search-box {
display: flex;
display: -webkit-box;
display: -webkit-flex;
flex-direction: row;
-webkit-flex-direction: row;
flex-wrap: wrap;
-webkit-flex-wrap: wrap;
justify-content: space-around;
//max-width: 1960px;
width: auto;
position: relative;
flex-basis: 1960px;
.flex-form-row {
display: flex;
display: -webkit-box;
display: -webkit-flex;
flex-direction: row;
-webkit-flex-direction: row;
padding-bottom: 3px;
}

.flex-form-col-left {
flex-direction: column;
-webkit-flex-direction: column;
flex: 0 0 auto;
-webkit-flex: 0 0 auto;
padding-right: 3px;
}

.flex-form-col-middle {
flex-direction: column;
-webkit-flex-direction: column;
flex: 1 0 auto;
-webkit-flex: 1 0 auto;
}

.flex-form-col-right {
flex-direction: column;
-webkit-flex-direction: column;
flex: 0 0 auto;
-webkit-flex: 0 0 auto;
}

.flex-form-col-content-end {
flex-direction: column;
-webkit-flex-direction: column;
flex: 0 0 auto;
-webkit-flex: 0 0 auto;
align-content: flex-end;
}

select {
font-size: 1em;
line-height: 1.25em;
width: 200px;
height: 32px;
background-color: #fafafa;
}
}
}

@media screen and (max-width: 1267px){
.flex-form-fieldset-search-box {
.flex-form-search-box-headers {
display: flex;
display: -webkit-box;
display: -webkit-flex;
Expand All @@ -71,168 +9,44 @@
flex-wrap: wrap;
-webkit-flex-wrap: wrap;
justify-content: space-around;
//max-width: 1267px;
width: auto;
position: relative;
flex-basis: 1267px;

.flex-form-row {
display: flex;
display: -webkit-box;
display: -webkit-flex;
flex-direction: row;
-webkit-flex-direction: row;
padding-bottom: 3px;
}

.flex-form-col-left {
flex-direction: column;
-webkit-flex-direction: column;
flex: 0 0 auto;
-webkit-flex: 0 0 auto;
padding-right: 3px;
}

.flex-form-col-middle {
flex-direction: column;
-webkit-flex-direction: column;
flex: 1 0 auto;
-webkit-flex: 1 0 auto;
}

.flex-form-col-right {
flex-direction: column;
-webkit-flex-direction: column;
flex: 0 0 auto;
-webkit-flex: 0 0 auto;
}

.flex-form-col-content-end {
flex-direction: column;
-webkit-flex-direction: column;
flex: 0 0 auto;
-webkit-flex: 0 0 auto;
align-content: flex-end;
}
background-color: #ffffff;
padding-bottom: 5px;

select {
font-size: 1em;
line-height: 1.25em;
width:200px;
height: 32px;
background-color: #fafafa;
}
}
}

@media screen and (max-width: 960px){
.flex-form-fieldset-search-box {
display: flex;
display: -webkit-box;
display: -webkit-flex;
flex-direction: row;
-webkit-flex-direction: row;
flex-wrap: wrap;
-webkit-flex-wrap: wrap;
justify-content: space-around;
//max-width: 960px;
width: auto;
position: relative;
flex-basis: 960px;

.flex-form-row {
display: flex;
display: -webkit-box;
display: -webkit-flex;
flex-direction: row;
-webkit-flex-direction: row;
padding-bottom: 3px;
padding-bottom: 5px;
}

.flex-form-col-left {
flex-direction: column;
-webkit-flex-direction: column;
flex: 0 0 auto;
-webkit-flex: 0 0 auto;
padding-right: 3px;
padding-right: 5px;
padding-bottom: 5px;
}

.flex-form-col-middle {
flex-direction: column;
-webkit-flex-direction: column;
flex: 1 0 auto;
-webkit-flex: 1 0 auto;
padding-right: 5px;
padding-bottom: 5px;
}

.flex-form-col-right {
flex-direction: column;
-webkit-flex-direction: column;
flex: 0 0 auto;
-webkit-flex: 0 0 auto;
}

.flex-form-col-content-end {
flex-direction: column;
-webkit-flex-direction: column;
flex: 0 0 auto;
-webkit-flex: 0 0 auto;
align-content: flex-end;
}

select {
font-size: 1em;
line-height: 1.25em;
width: 200px;
height: 32px;
background-color: #fafafa;
}
}
}

@media screen and (max-width: 500px){
.flex-form-fieldset-search-box {
display: flex;
display: -webkit-box;
display: -webkit-flex;
flex-direction: row;
-webkit-flex-direction: row;
flex-wrap: wrap;
-webkit-flex-wrap: wrap;
justify-content: space-around;
//max-width: 500px;
width: auto;
position: relative;
flex-basis: 40px;

.flex-form-row {
display: flex;
display: -webkit-box;
display: -webkit-flex;
flex-direction: row;
-webkit-flex-direction: row;
padding-bottom: 3px;
}

.flex-form-col-left {
flex-direction: column;
-webkit-flex-direction: column;
flex: 0 0 auto;
-webkit-flex: 0 0 auto;
padding-right: 3px;
}

.flex-form-col-middle {
flex-direction: column;
-webkit-flex-direction: column;
flex: 1 0 auto;
-webkit-flex: 1 0 auto;
}

.flex-form-col-right {
flex-direction: column;
-webkit-flex-direction: column;
flex: 0 0 auto;
-webkit-flex: 0 0 auto;
padding-bottom: 5px;
}

.flex-form-col-content-end {
Expand All @@ -246,76 +60,13 @@
select {
font-size: 1em;
line-height: 1.25em;
width: 50px;
width: 200px;
height: 32px;
background-color: #fafafa;
}
}
}

@media screen and (max-width: 320px){
.flex-form-fieldset-search-box {
display: flex;
display: -webkit-box;
display: -webkit-flex;
flex-direction: row;
-webkit-flex-direction: row;
flex-wrap: wrap;
-webkit-flex-wrap: wrap;
justify-content: space-around;
//max-width: 500px;
width: auto;
position: relative;
flex-basis: 320px;

.flex-form-row {
display: flex;
display: -webkit-box;
display: -webkit-flex;
flex-direction: row;
-webkit-flex-direction: row;
padding-bottom: 3px;
}

.flex-form-col-left {
flex-direction: column;
-webkit-flex-direction: column;
flex: 0 0 auto;
-webkit-flex: 0 0 auto;
padding-right: 3px;
}

.flex-form-col-middle {
flex-direction: column;
-webkit-flex-direction: column;
flex: 1 0 auto;
-webkit-flex: 1 0 auto;
}

.flex-form-col-right {
flex-direction: column;
-webkit-flex-direction: column;
flex: 0 0 auto;
-webkit-flex: 0 0 auto;
}

.flex-form-col-content-end {
flex-direction: column;
-webkit-flex-direction: column;
flex: 0 0 auto;
-webkit-flex: 0 0 auto;
align-content: flex-end;
}

select {
font-size: 1em;
line-height: 1.25em;
width: 50px;;
height: 32px;
background-color: #fafafa;
}
}
}

.flex-form-fieldset {
.flex-form-headers {
Expand Down
2 changes: 1 addition & 1 deletion src/server/portal/page-controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1653,4 +1653,4 @@ module.exports = {
throw new Error('page-controller module not initialized');
}
}
};
};