ramon
/
skillbox
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects 1 Releases 1 Wiki Activity

Fix layout in IE 10+

This commit is contained in:
Ramon Wenger 2019-04-03 10:12:36 +02:00
parent 760e36a344
commit 7d3bcf0fbd
12 changed files with 146 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
client/src/App.vue
View File

@ -1,5 +1,5 @@
<template>
<div :class="{'no-scroll': showModal}">
<div :class="{'no-scroll': showModal}" class="app">
<component :is="showModal" v-if="showModal"></component>
<component :is="layout"></component>
</div>
@ -58,6 +58,11 @@
<style lang="scss">
@import "styles/main.scss";
.app {
/*for IE10+*/
display:flex;
}
.no-scroll {
overflow-y: hidden;
}

6
client/src/components/ColorChooser.vue
View File

@ -69,7 +69,11 @@
width: 46px;
height: 46px;
border-radius: 23px;
display: grid;
display: flex;
justify-content: center;
@supports (display: grid) {
display: grid
}
justify-items: center;
align-items: center;

16
client/src/components/Modal.vue
View File

@ -59,9 +59,13 @@
border-radius: 12px;
box-shadow: 0 2px 8px 0 rgba(0, 0, 0, 0.15);
border: 1px solid $color-lightgrey;
display: grid;
display: -ms-grid;
@supports (display: grid) {
display: grid;
}
grid-template-rows: auto 1fr 65px;
grid-template-areas: "header" "body" "footer";
-ms-grid-rows: auto 1fr 65px;
position: relative;
&--hide-header {
@ -81,6 +85,7 @@
width: 95vw;
height: auto;
grid-template-rows: 1fr;
-ms-grid-rows: 1fr;
grid-template-areas: "body";
overflow: hidden;
}
@ -107,7 +112,11 @@
}
&__backdrop {
display: grid;
display: flex;
justify-content: center;
@supports (display: grid) {
display: grid;
}
position: fixed;
top: 0;
left: 0;
@ -119,12 +128,14 @@
&__header {
grid-area: header;
-ms-grid-row: 1;
padding: 10px $modal-lateral-padding;
border-bottom: 1px solid $color-lightgrey;
}
&__body {
grid-area: body;
-ms-grid-row: 2;
padding: 10px $modal-lateral-padding;
overflow: auto;
box-sizing: border-box;
@ -150,6 +161,7 @@
&__footer {
grid-area: footer;
-ms-grid-row: 3;
border-top: 1px solid $color-lightgrey;
padding: 16px $modal-lateral-padding;
}

31
client/src/components/content-forms/ContentBlockElementChooserWidget.vue
View File

@ -66,8 +66,12 @@
@import "@/styles/_functions.scss";
.content-block-element-chooser-widget {
display: grid;
display: -ms-grid;
@supports (display: grid) {
display: grid;
}
grid-template-columns: repeat(6, 1fr);
-ms-grid-columns: 1fr 1fr 1fr 1fr 1fr 1fr;
grid-column-gap: 0px;
font-family: $sans-serif-font-family;
text-align: center;
@ -78,6 +82,31 @@
position: relative;
margin-bottom: 20px;
/*IE10+*/
& > :nth-child(1) {
-ms-grid-column: 1;
}
& > :nth-child(2) {
-ms-grid-column: 2;
}
& > :nth-child(3) {
-ms-grid-column: 3;
}
& > :nth-child(4) {
-ms-grid-column: 4;
}
& > :nth-child(5) {
-ms-grid-column: 5;
}
& > :nth-child(6) {
-ms-grid-column: 6;
}
&::before {
content: "";
position: absolute;

12
client/src/components/page-form/PageForm.vue
View File

@ -30,11 +30,19 @@
box-sizing: border-box;
background-color: $color-white;
border-radius: $default-border-radius;
display: grid;
display: flex;
flex-direction: column;
@supports (display: grid) {
display: grid;
}
grid-template-rows: 1fr 55px;
&__page {
display: grid;
display: flex;
justify-content: center;
@supports (display: grid) {
display: grid;
}
justify-items: center;
align-items: center;
height: 100%;

31
client/src/components/portfolio/ProjectWidget.vue
View File

@ -1,14 +1,14 @@
<template>
<div class="project-widget" :class="widgetClass">
<router-link :to="{name: 'project', params: {slug: slug}}" tag="div" class="project-widget__content">
<h3 class="project-widget__title">{{title}}</h3>
<h3 class="project-widget__title">{{title}}</h3>
<entry-count-widget entry-count="4"></entry-count-widget>
<owner-widget name="Hans Muster"></owner-widget>
</router-link>
<widget-footer
entity="Eintrag"
<widget-footer class="project-widget__footer"
entity="Eintrag"
></widget-footer>
</div>
</template>
@ -47,14 +47,35 @@
box-sizing: border-box;
display: -ms-grid;
margin-bottom: $large-spacing;
@supports (display: grid) {
display: grid;
margin-bottom: 0;
}
grid-template-rows: 150px 1fr;
-ms-grid-rows: 150px 48px;
-ms-grid-columns: 1fr;
&__content {
padding: 23px;
cursor: pointer;
-ms-grid-row: 1;
/*
* For IE10+
*/
display: -ms-grid;
-ms-grid-rows: 50px 30px 30px;
& > :nth-child(1) {
-ms-grid-row: 1;
}
& > :nth-child(2) {
-ms-grid-row: 2;
}
& > :nth-child(3) {
-ms-grid-row: 3;
}
}
&__title {
@ -62,6 +83,10 @@
font-weight: 600;
}
&__footer {
-ms-grid-row: 2;
}
@include skillbox-colors;
}
</style>

3
client/src/components/rooms/WidgetPopover.vue
View File

@ -25,7 +25,8 @@
position: absolute;
right: 0;
bottom: -110px;
display: grid;
display: flex;
flex-direction: column;
background-color: $color-white;
padding: 20px;
z-index: 10;

11
client/src/layouts/SimpleLayout.vue
View File

@ -13,14 +13,19 @@
.layout {
&--simple {
display: -ms-grid;
display: grid;
@supports (display: grid) {
display: grid;
}
padding: 20px;
width: 100%;
@include desktop {
grid-template-columns: 1fr 640px 1fr;
-ms-grid-columns: 1fr 640px 1fr;
& > :nth-child(2) {
grid-column: 2;
-ms-grid-column: 2;
}
}
@ -31,8 +36,12 @@
justify-self: end;
cursor: pointer;
display:flex;
justify-content:end;
@include desktop {
grid-column: 3;
-ms-grid-column: 3;
}
&__icon {

18
client/src/pages/portfolio.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="portfolio__page">
<div class="portfolio">
<add-project></add-project>
<add-project class="portfolio__add-project"></add-project>
<project-widget
v-for="project in projects"
@ -46,7 +46,8 @@
@import "@/styles/_variables.scss";
.portfolio {
display: -ms-grid;
display: flex;
flex-direction: column;
@supports (display: grid) {
display: grid;
}
@ -58,11 +59,22 @@
box-sizing: border-box;
&__page {
display: grid;
display: flex;
@supports (display: grid) {
display: grid;
}
align-content: center;
justify-content: center;
padding-top: $large-spacing;
}
/*IE10*/
&__add-project {
margin-bottom: $large-spacing;
@supports (display: grid) {
margin-bottom: 0;
}
}
}
</style>

10
client/src/pages/project.vue
View File

@ -107,7 +107,15 @@
&__content {
background-color: $color-grey--lighter;
display: grid;
display: flex;
flex-direction: column;
width: 840px;
align-content: center;
margin: 0 auto;
@supports (display: grid) {
display: grid;
width: auto;
}
grid-template-columns: 840px;
grid-row-gap: 30px;
justify-content: center;

1
client/src/pages/rooms.vue
View File

@ -65,6 +65,7 @@
.rooms-page {
display: flex;
flex-wrap: wrap;
align-content: start;
@supports (display: grid) {
display: grid;

20
client/src/styles/_article.scss
View File

@ -2,15 +2,24 @@
&__header {
grid-template-rows: 50px minmax(50px, max-content) auto;
-ms-grid-rows: 50px 50px auto;
grid-row-gap: 30px;
display: -ms-grid;
display: grid;
display: -ms-flex;
@supports (display: grid) {
display: grid;
}
}
&__meta {
border-bottom: 1px solid $color-lightgrey;
align-self: end;
padding: 20px 0;
width: 100%;
margin-bottom: $large-spacing;
@supports (display: grid) {
margin-bottom: 0;
}
}
&__title {
@ -24,8 +33,11 @@
}
&__content {
display: -ms-grid;
display: grid;
display: flex;
flex-direction: column;
@supports (display: grid) {
display: grid;
}
grid-row-gap: 40px;
padding-bottom: 40px;