diff --git a/client/src/components/HeaderBar.vue b/client/src/components/HeaderBar.vue index 71f5770f..4120f2cf 100644 --- a/client/src/components/HeaderBar.vue +++ b/client/src/components/HeaderBar.vue @@ -70,7 +70,7 @@ * For IE10+ */ -ms-grid-columns: 1fr 1fr 1fr; - -ms-grid-rows: 60px 60px; + -ms-grid-rows: 50px 50px; /* * For IE10+ diff --git a/client/src/components/rooms/RoomWidget.vue b/client/src/components/rooms/RoomWidget.vue index e0562355..6cd4d648 100644 --- a/client/src/components/rooms/RoomWidget.vue +++ b/client/src/components/rooms/RoomWidget.vue @@ -93,6 +93,7 @@ @supports (display: grid) { display: grid; } + height: 260px; grid-template-rows: 210px 1fr; /*overflow: hidden;*/ @include widget-shadow; @@ -116,6 +117,21 @@ padding: 22px; color: $color-darkgrey-1; cursor: pointer; + + /* + * For IE10+ + */ + display: -ms-grid; + -ms-grid-rows: 80px 30px 30px; + & > :nth-child(1) { + -ms-grid-row: 1; + } + & > :nth-child(2) { + -ms-grid-row: 2; + } + & > :nth-child(3) { + -ms-grid-row: 3; + } } &__title { diff --git a/client/src/layouts/BlankLayout.vue b/client/src/layouts/BlankLayout.vue index ad66f0c4..0c7e4df8 100644 --- a/client/src/layouts/BlankLayout.vue +++ b/client/src/layouts/BlankLayout.vue @@ -6,6 +6,10 @@ diff --git a/client/src/layouts/DefaultLayout.vue b/client/src/layouts/DefaultLayout.vue index 3ce6255e..d5a9b46f 100644 --- a/client/src/layouts/DefaultLayout.vue +++ b/client/src/layouts/DefaultLayout.vue @@ -3,9 +3,9 @@ - + - + @@ -39,7 +39,9 @@ .skillbox { margin: 0 auto; width: 100%; - display: grid; + @supports (display: grid) { + display: grid; + } grid-template-rows: auto 1fr; min-height: 100vh; grid-auto-rows: 1fr; @@ -49,21 +51,41 @@ &--show-filter { grid-template-rows: auto auto 1fr; + -ms-grid-rows: 50px 50px 30px 1fr; // 1 extra row for gap grid-template-areas: "h" "." "c"; } + /* + * For IE10+ + */ + + &--show-filter &__content { + -ms-grid-row: 4; + -ms-grid-column: 1; + } + + &--show-filter &__filter-bar { + -ms-grid-row: 2; + -ms-grid-column: 1; + } + /* * For IE10+ */ display: -ms-grid; - -ms-grid-rows: auto 32px 1fr; // 1 extra row for gap + -ms-grid-rows: 50px 30px 1fr; // 1 extra row for gap -ms-grid-columns: 1fr; @include skillbox-colors; &__header { grid-area: h; + -ms-grid-row: 1; + } + &__content { + -ms-grid-row: 3; + -ms-grid-column: 1; } &__footer { @@ -75,7 +97,11 @@ * For IE10+ */ & > :nth-child(2) { - -ms-grid-row: 3; + + } + + & > :nth-child(3) { + -ms-grid-row: 4; -ms-grid-column: 1; } } diff --git a/client/src/pages/rooms.vue b/client/src/pages/rooms.vue index 85a9ca26..f09537d3 100644 --- a/client/src/pages/rooms.vue +++ b/client/src/pages/rooms.vue @@ -63,7 +63,9 @@ @import "@/styles/_mixins.scss"; .rooms-page { - display: -ms-grid; + display: flex; + flex-wrap: wrap; + @supports (display: grid) { display: grid; } @@ -71,6 +73,7 @@ padding: 50px 15px; @include desktop { grid-template-columns: repeat(3, 1fr); + -ms-grid-columns: 1fr 30px 1fr 30px 1fr; padding: 50px 45px; } grid-column-gap: 30px; @@ -81,26 +84,14 @@ justify-self: center; box-sizing: border-box; - /* - * For IE10+ - */ - -ms-grid-columns: 1fr 1fr 1fr; - -ms-grid-rows: 260px; + & > div { + flex: 0 0 30%; + margin-bottom: $large-spacing; + margin-right: 1%; - /* - * SHAME SHAME SHAME - * this is very hacky, but we have a dynamic amount of elements. better to be safe than sorry - * SHAME SHAME SHAME - */ - @for $i from 1 to 101 { - & > :nth-child(#{$i}) { - @if ($i%3) == 0 { - -ms-grid-column: 3; - } @else { - -ms-grid-column: ($i%3); - } - - -ms-grid-row: floor(($i - 1)/3)+1; + @supports (display: grid) { + margin-bottom: inherit; + margin-right: inherit; } } diff --git a/client/src/pages/start.vue b/client/src/pages/start.vue index 79cabeed..8fe7d381 100644 --- a/client/src/pages/start.vue +++ b/client/src/pages/start.vue @@ -91,20 +91,26 @@ } -