Skip to content
Snippets Groups Projects
Unverified Commit 4c5a3cea authored by jojohoch's avatar jojohoch Committed by GitHub
Browse files

Merge pull request #487 from iqb-berlin/refactor/remove_flex_layout

Refactor/remove flex layout module in player
parents ba9c2ed8 f6ac55b9
No related branches found
No related tags found
No related merge requests found
Pipeline #46508 passed
<div class="keyboard-container"
(mousedown)="$event.preventDefault(); $event.stopPropagation()">
<div *ngIf="showFrenchCharacters"
fxLayout="row wrap"
fxLayoutAlign="space-between center"
class="specialCharacters">
class="specialCharacters fx-space-between-center-wrap">
<aspect-keyboard-key *ngFor="let key of frenchRow; let i = index"
class="key"
[key]="key"
......
......@@ -10,6 +10,15 @@
background-color: grey;
}
.fx-space-between-center-wrap {
box-sizing: border-box;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
flex-wrap: wrap;
}
.key {
margin: 4px;
min-height: 50px;
......
<div class="pages-container"
cdkScrollable
[fxLayout]="layoutAlignment">
[class.fx-column-start-stretch]="layoutAlignment === 'column'"
[class.fx-row-start-stretch]="layoutAlignment === 'row'">
<ng-container *ngTemplateOutlet="alwaysVisiblePagePosition === 'top' || alwaysVisiblePagePosition === 'left' ?
alwaysVisiblePageView :
scrollPagesView"></ng-container>
......
......@@ -2,6 +2,22 @@
scroll-snap-align: start;
}
.fx-column-start-stretch {
box-sizing: border-box;
display: flex;
flex-direction: column;
justify-content: start;
align-items: stretch;
}
.fx-row-start-stretch {
box-sizing: border-box;
display: flex;
flex-direction: row;
justify-content: start;
align-items: stretch;
}
.concat-scroll-snap {
scroll-snap-type: y mandatory;
scroll-padding: 0;
......
......@@ -13,7 +13,7 @@ import { NativeEventService } from '../../../services/native-event.service';
@Component({
selector: 'aspect-pages-layout',
templateUrl: './pages-layout.component.html',
styleUrls: ['./pages-layout.component.css']
styleUrls: ['./pages-layout.component.scss']
})
export class PagesLayoutComponent implements OnInit, AfterViewInit, OnDestroy {
......
<ng-content></ng-content>
<div fxLayout="column" fxLayoutAlign="center center"
class="scroll-button-container">
<div class="fx-column-center-center scroll-button-container">
<button *ngIf="isVisible.value"
mat-fab
class="scroll-button"
......
......@@ -16,3 +16,11 @@
pointer-events: none;
z-index: 100;
}
.fx-column-center-center {
box-sizing: border-box;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment