Merge pull request #7939 from opf/fix/31744/overview-page--mobile

[31744] Fix: mobile grid
pull/7974/head
Henriette Dinger 5 years ago committed by GitHub
commit 5c1e3b012b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 11
      app/assets/stylesheets/content/_grid_mobile.sass
  2. 1
      app/assets/stylesheets/content/_index.sass
  3. 5
      app/assets/stylesheets/content/menus/_menu_blocks.sass
  4. 1
      app/assets/stylesheets/layout/_base.sass
  5. 12
      frontend/src/app/modules/grids/grid/grid.component.html
  6. 5
      frontend/src/app/modules/grids/grid/page/grid-page.component.sass

@ -0,0 +1,11 @@
@include breakpoint(680px down)
.grid--container
grid-template-columns: auto !important
grid-template-rows: auto !important
grid-gap: 15px
padding: 15px 2px
.grid--area
&.-widgeted
grid-column: 1/2 !important
grid-row: unset !important

@ -71,6 +71,7 @@
@import content/contextual
@import content/tooltip
@import content/grid
@import content/grid_mobile
@import content/resizer
@import content/version
@import content/project_status

@ -22,3 +22,8 @@
align-self: end
&:before
padding-left: 10px
@include breakpoint(680px down)
.menu-blocks--container
grid-template: unset
grid-gap: 15px

@ -59,7 +59,6 @@
&.nosidebar
margin-left: 0
padding: 20px 40px
&.nomenus
margin: 0

@ -24,7 +24,7 @@
<span *ngIf="drag.isDraggable"
class="grid--area-drag-handle
icon
icon-drag-handle"
icon-drag-handle hidden-for-mobile"
cdkDragHandle></span>
<ndc-dynamic [ndcDynamicComponent]="widgetComponent(area)"
@ -47,7 +47,7 @@
<!-- One grid area per cell (row x columns) -->
<div *ngFor="let area of layout.gridAreas; trackBy: identifyGridArea;"
class="grid--area"
class="grid--area hidden-for-mobile"
[ngClass] = "{'-drop-target': drag.currentlyDragging,
'-drop-only': drag.isDropOnlyArea(area),
'-resize-target': resize.isTarget(area),
@ -62,15 +62,14 @@
(mouseover)="layout.setMousedOverArea(area)"
[cdkDropListData]="area"
[cdkDropListConnectedTo]="layout.gridAreaIds">
<div class="grid--widget-add hidden-for-mobile"
*ngIf="layout.schema"
<div class="grid--widget-add"
[title]="add.addText"
(click)="add.widget(area)">
</div>
</div>
<div *ngFor="let gap of layout.gridGaps; trackBy: identifyGridArea;"
class="grid--area -gap"
class="grid--area -gap hidden-for-mobile"
[ngClass] = "{'-addable': add.isAddable(gap),
'-help-mode': layout.inHelpMode,
'-row': gap.isRow,
@ -81,8 +80,7 @@
[style.grid-column-end]="gap.gridEndColumn"
[id]="gap.guid"
(mouseover)="layout.setMousedOverArea(gap)">
<div class="grid--widget-add -gap hidden-for-mobile"
*ngIf="layout.schema"
<div class="grid--widget-add -gap"
[title]="add.addText"
(click)="add.widget(gap)">
</div>

@ -9,3 +9,8 @@
.toolbar-items
padding-right: 20px
@media only screen and (max-width: 679px)
.title-container
margin-left: 0
margin-bottom: 0

Loading…
Cancel
Save