Skip to content
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

Modal preview image gets cropped on small screens #499

Merged
merged 9 commits into from
Oct 16, 2023
Merged

Modal preview image gets cropped on small screens #499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b2f44ee
Fix main sidebar z-index
volterra79 Oct 11, 2023
4d6ee9d
Fix issue on relation tab when a qgis project has form with a tab con…
volterra79 Oct 11, 2023
a167da2
Remove close element tag
volterra79 Oct 11, 2023
52274e6
Use ZINDEX constant to manage sidebar-aside-toggle button element and…
volterra79 Oct 11, 2023
199a660
Remove useless scope style
volterra79 Oct 12, 2023
aae9490
Change less css property to work with sidebar-aside-toggle as sibling…
volterra79 Oct 12, 2023
fd5ee52
Merge branch 'dev' into issue_497
volterra79 Oct 12, 2023
0317335
comments
Raruto Oct 12, 2023
e7b9c51
Update Sidebar.vue
Raruto Oct 12, 2023
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
17 changes: 10 additions & 7 deletions src/assets/style/less/admin-lte2-less/sidebar.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,8 @@
// ``` .left-side has been deprecated as of 2.0.0 in favor of .main-sidebar ```

.main-sidebar,
.sidebar-aside-toggle,
.left-side {
position: absolute;
top: 0;
left: 0;
padding-top: 50px;
min-height: 100%;
width: @sidebar-width;
z-index: 810;
//Using disposable variable to join statements with a comma
@transition-rule: @transition-speed @transition-fn,
width @transition-speed @transition-fn;
Expand All @@ -36,6 +30,15 @@
}
}

.left-side {
position: absolute;
top: 0;
left: 0;
padding-top: 50px;
min-height: 100%;
z-index: 810;
}

.sidebar {
padding-bottom: 0px;
}
Expand Down
17 changes: 10 additions & 7 deletions src/assets/style/less/g3w-sidebar.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,24 @@
@sidebar-width: 350px;
@control-sidebar-width: 450px;

a.sidebar-aside-toggle {
@media (max-width: @screen-xs-max) {
display: none !important;
}
}

.main-sidebar{
&.iframe{
padding-top:0 !important;
a.sidebar-aside-toggle {
top: 0! important;
}
}
a.sidebar-aside-toggle {
@media (max-width: @screen-xs-max) {
display: none !important;
}
}

&.mobile {
width: @sidebar-width-small;
}
//z-index: 1 !important;
z-index: 1 !important;
}

#g3w-sidebar.sidebar {
Expand Down Expand Up @@ -166,8 +168,9 @@
.main-sidebar,
.main-sidebar-mobile,
.left-side {
width: @sidebar-width;
@media (max-width: @screen-xs-max) {
width: @sidebar-width-mobile;
width: @sidebar-width-mobile;
}
@media (max-width: @screen-xs-max) {
.translate(-@sidebar-width-mobile, 0);
Expand Down
2 changes: 1 addition & 1 deletion src/components/FieldImage.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<field :state="state">
<div slot="field" style="text-align: left">
<img v-for="(value, index) in values" class="img-responsive" style="max-height:50px" @click="showGallery(index)" :src="getSrc(value)"/>
<g3w-images-gallery :id="galleryId" :active="active" :images="getGalleryImages()"></g3w-images-gallery>
<g3w-images-gallery :id="galleryId" :active="active" :images="getGalleryImages()"/>
</div>
</field>
</template>
Expand Down
2 changes: 1 addition & 1 deletion src/components/GlobalImage.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<img class="img-thumbnail" @click="showGallery(index)" :src="getSrc(value)"/>
</div>
</div>
<g3w-images-gallery :id="galleryId" :active="active" :images="getGalleryImages()"></g3w-images-gallery>
<g3w-images-gallery :id="galleryId" :active="active" :images="getGalleryImages()"/>
</div>
</template>

Expand Down
6 changes: 3 additions & 3 deletions src/components/GlobalTabsNode.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,10 @@
}
},
methods: {
loadingRelation(relation){
loadingRelation(relation) {
const layer = ProjectsRegistry.getCurrentProject().getLayerById(this.layerid);
const relation_project = layer.getRelationById(relation.name);
return relation_project.state;
// FIXME: prevent a fatal error when creating a relation Tab (even if the project has no relations)
return layer.getRelationById(relation.name) || ({ state: {loading: false} }).state;
},
isRelationDisabled(relation){
return this.getRelationName(relation.name) === undefined || (this.contenttype === 'editing' && this.isRelationChildLayerNotEditable(relation));
Expand Down
2 changes: 1 addition & 1 deletion src/components/QueryResults.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
</tr>
<tr v-show="!collapsedFeatureBox(layer,feature) || hasOneLayerAndOneFeature(layer)" :id="`${layer.id}_${index}`" class="featurebox-body">
<td :colspan="getColSpan(layer)">
<tabs :fields="getQueryFields(layer, feature)" :layerid="layer.id" :feature="feature" :tabs="getLayerFormStructure(layer)"></tabs>
<tabs :fields="getQueryFields(layer, feature)" :layerid="layer.id" :feature="feature" :tabs="getLayerFormStructure(layer)"/>
</td>
</tr>
<tr v-for="({component}) in getLayerCustomComponents(layer.id, 'feature', 'after')">
Expand Down
2 changes: 1 addition & 1 deletion src/components/Relations.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</div>
</div>
<div class="query-relations-content" style="display: grid; grid-template-columns: repeat(2, auto); grid-column-gap: 5px; grid-row-gap: 5px;">
<div @click="showRelation(relation)" v-for="relation in relations" class="skin-border-color relation-grid-item">
<div @click.stop="showRelation(relation)" v-for="relation in relations" class="skin-border-color relation-grid-item">
<span style="font-weight: bold; padding: 5px;" class="skin-color g3w-long-text">{{ relation.name }}</span>
</div>
</div>
Expand Down
157 changes: 80 additions & 77 deletions src/components/Sidebar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,102 +4,102 @@
-->

<template>
<aside
class = "main-sidebar"
:class = "{ iframe: iframe}"
>

<!-- TOGGLE BUTTON (desktop only) -->
<a
href = "#"
class = "sidebar-aside-toggle"
:class = "{ 'g3w-disabled': disabled }"
data-toggle = "offcanvas" role="button">
<i :class="g3wtemplate.getFontClass('bars')"></i>
</a>

<!-- SIDEBAR CONTENT (additional styles can be found in g3w-sidebar.less) -->
<div
id = "g3w-sidebar"
class = "sidebar"
:class = "{ 'g3w-disabled': disabled }"
>

<div id="disable-sidebar"></div>

<aside>
<div
v-show = "panelsinstack"
class = "g3w-sidebarpanel"
class = "main-sidebar"
:class = "{ iframe: iframe}"
>
<!-- SIDEBAR CONTENT (additional styles can be found in g3w-sidebar.less) -->
<div
id = "g3w-sidebarpanel-header-placeholder"
style = "
overflow: hidden;
line-height: 14px;
font-size:1.5em
"
id = "g3w-sidebar"
class = "sidebar"
:class = "{ 'g3w-disabled': disabled }"
>
<div id="disable-sidebar"></div>

<div
style = "display: flex;"
:style = "{ justifyContent: state.gui.title ? 'space-between' : 'flex-end' }"
v-show = "panelsinstack"
class = "g3w-sidebarpanel"
>

<h4
v-if = "title"
style = "display: inline-block; font-weight: bold"
v-t = "title"
></h4>

<div>
<span
v-if = "panels.length > 1"
@click = "closePanel"
data-placement = "left"
data-toggle = "tooltip"
v-t-tooltip.create = "'back'"
class = "skin-tooltip-left g3w-span-button close-pane-button fa-stack"
>
<i :class="g3wtemplate.getFontClass('circle')" class="fa-stack-1x panel-button"></i>
<i :class="g3wtemplate.getFontClass('arrow-left')" class="fa-stack-1x panel-icon"></i>
</span>
<span
@click = "closeAllPanels"
data-placement = "left"
data-toggle = "tooltip"
v-t-tooltip.create = "'close'"
class = "skin-tooltip-left g3w-span-button close-pane-button fa-stack"
<div
id = "g3w-sidebarpanel-header-placeholder"
style = "overflow: hidden; line-height: 14px;font-size:1.5em"
>
<i :class="g3wtemplate.getFontClass('circle')" class="fa-stack-1x panel-button"></i>
<i :class="g3wtemplate.getFontClass('close')" class="fa-stack-1x panel-icon"></i>
</span>
<div
style = "display: flex;"
:style = "{ justifyContent: state.gui.title ? 'space-between' : 'flex-end' }"
>

<h4
v-if = "title"
style = "display: inline-block; font-weight: bold"
v-t = "title"
></h4>

<div>
<span
v-if = "panels.length > 1"
@click = "closePanel"
data-placement = "left"
data-toggle = "tooltip"
v-t-tooltip.create = "'back'"
class = "skin-tooltip-left g3w-span-button close-pane-button fa-stack"
>
<i :class="g3wtemplate.getFontClass('circle')" class="fa-stack-1x panel-button"></i>
<i :class="g3wtemplate.getFontClass('arrow-left')" class="fa-stack-1x panel-icon"></i>
</span>
<span
@click = "closeAllPanels"
data-placement = "left"
data-toggle = "tooltip"
v-t-tooltip.create = "'close'"
class = "skin-tooltip-left g3w-span-button close-pane-button fa-stack"
>
<i :class="g3wtemplate.getFontClass('circle')" class="fa-stack-1x panel-button"></i>
<i :class="g3wtemplate.getFontClass('close')" class="fa-stack-1x panel-icon"></i>
</span>
</div>

</div>
</div>

<div
id = "g3w-sidebarpanel-placeholder"
class = "g3w-sidebarpanel-placeholder"
></div>
</div>
</div>
<div
id = "g3w-sidebarpanel-placeholder"
class = "g3w-sidebarpanel-placeholder"
></div>
</div>

<div id="g3w-sidebarcomponents-content" >
<ul
id = "g3w-sidebarcomponents"
v-show = "showmainpanel"
class = "sidebar-menu"
:class = "{ 'g3w-disabled': state.disabled }"
></ul>
</div>
<div id="g3w-sidebarcomponents-content" >
<ul
id = "g3w-sidebarcomponents"
v-show = "showmainpanel"
class = "sidebar-menu"
:class = "{ 'g3w-disabled': state.disabled }"
></ul>
</div>

</div>
</div>

</aside>
</div>
<!-- TOGGLE BUTTON (desktop only) -->
<a
href = "#"
class = "sidebar-aside-toggle"
:class = "{ 'g3w-disabled': disabled }"
:style = "{zIndex: zIndex}"
data-toggle = "offcanvas" role="button">
<i :class="g3wtemplate.getFontClass('bars')"></i>
</a>

</aside>
</template>

<script>
import ApplicationState from 'store/application-state';
import { SidebarEventBus as VM } from 'app/eventbus';
import sidebarService from 'services/sidebar';
import { ZINDEXES } from 'app/constant';


const { t } = require('core/i18n/i18n.service');

Expand All @@ -115,6 +115,9 @@
bPageMode: false,
header: t('main navigation'),
state: sidebarService.state,
/** @since v3.9.0 */
zIndex: ZINDEXES.usermessage.tool + 2,

}
},

Expand Down