Move block alignment styles back to default page css.

omeka · Jan 25, 2024 · 86bed05 · 86bed05
1 parent f763a85
commit 86bed05
Show file tree

Hide file tree

Showing 4 changed files with 116 additions and 114 deletions.
diff --git a/application/asset/css/page-blocks.css b/application/asset/css/page-blocks.css
diff --git a/application/asset/css/page-grid.css b/application/asset/css/page-grid.css
diff --git a/application/asset/sass/page-blocks.scss b/application/asset/sass/page-blocks.scss
@@ -1,5 +1,117 @@
 @import "base";
 
+
+.block-layout-background-position-y-top {
+    background-position-y: top;
+}
+
+.block-layout-background-position-y-center {
+    background-position-y: center;
+}
+
+.block-layout-background-position-y-bottom {
+    background-position-y: bottom;
+}
+
+.block-layout-background-position-x-left {
+    background-position-x: left;
+}
+
+.block-layout-background-position-x-center {
+    background-position-x: center;
+}
+
+.block-layout-background-position-x-right {
+    background-position-x: right;
+}
+
+.page-layout-normal .block-layout-alignment-right,
+.page-layout-normal .block-layout-alignment-left {
+    overflow: hidden;
+    max-width: 33.33%;
+}
+
+.block-layout-alignment-left .item.resource,
+.block-layout-alignment-right .item.resource {
+    margin: 0 0 1rem 0;
+
+    &:first-of-type {
+        padding-top: calc(1rem - 1px);
+        margin-top: 0;
+    }
+
+    &:last-of-type {
+        padding-bottom: -1px;
+    }
+
+    .media-render a {
+        display: block;
+    }
+
+    audio,
+    canvas,
+    video,
+    progress,
+    img {
+        max-width: 100%;
+        vertical-align: bottom;
+        margin-bottom: .5rem;
+    }
+}
+
+.block-layout-alignment-left {
+    float: left;
+    clear: left;
+    margin: 0 1rem 1rem 0;
+}
+
+.block-layout-alignment-right {
+    float: right;
+    clear: right;
+    margin: 0 0 1rem 1rem;
+}
+
+.block-layout-alignment-center {
+    display: flex;
+    justify-content: center;
+    flex-wrap: wrap;
+    text-align: center;
+
+    .item {
+        width: 100%;
+    }
+}
+
+.block-layout-alignment-left .item.resource > a:first-child,
+.block-layout-alignment-right .item.resource > a:first-child {
+    vertical-align: top;
+}
+
+
+
+.block-layout-alignment-left .item.resource > h3,
+.block-layout-alignment-right .item.resource > h3 {
+    margin: 0;
+}
+
+.block-layout-alignment-left .item.resource + p,
+.block-layout-alignment-right .item.resource + p {
+    margin-top: 0;
+}
+
+.block-layout-background-size-cover,
+.block-layout-background-size-contain {
+    background-repeat: no-repeat;
+}
+
+.block-layout-background-size-cover {
+    background-size: cover;
+}
+
+.block-layout-background-size-contain {
+    background-size: contain;
+}
+
 .item-showcase {
     margin: 1rem 0;
     border-top: 1px solid $border-gray;
@@ -193,4 +305,5 @@
 .page-date-time .value {
     display: inline-block;
     margin: 0;
-}
+}
+
diff --git a/application/asset/sass/page-grid.scss b/application/asset/sass/page-grid.scss
@@ -11,114 +11,3 @@
         display: block;
     }
 }
-
-.block-layout-background-position-y-top {
-    background-position-y: top;
-}
-
-.block-layout-background-position-y-center {
-    background-position-y: center;
-}
-
-.block-layout-background-position-y-bottom {
-    background-position-y: bottom;
-}
-
-.block-layout-background-position-x-left {
-    background-position-x: left;
-}
-
-.block-layout-background-position-x-center {
-    background-position-x: center;
-}
-
-.block-layout-background-position-x-right {
-    background-position-x: right;
-}
-
-.page-layout-normal .block-layout-alignment-right,
-.page-layout-normal .block-layout-alignment-left {
-    overflow: hidden;
-    max-width: 33.33%;
-}
-
-.block-layout-alignment-left .item.resource,
-.block-layout-alignment-right .item.resource {
-    margin: 0 0 1rem 0;
-
-    &:first-of-type {
-        padding-top: calc(1rem - 1px);
-        margin-top: 0;
-    }
-
-    &:last-of-type {
-        padding-bottom: -1px;
-    }
-
-    .media-render a {
-        display: block;
-    }
-
-    audio,
-    canvas,
-    video,
-    progress,
-    img {
-        max-width: 100%;
-        vertical-align: bottom;
-        margin-bottom: .5rem;
-    }
-}
-
-.block-layout-alignment-left {
-    float: left;
-    clear: left;
-    margin: 0 1rem 1rem 0;
-}
-
-.block-layout-alignment-right {
-    float: right;
-    clear: right;
-    margin: 0 0 1rem 1rem;
-}
-
-.block-layout-alignment-center {
-    display: flex;
-    justify-content: center;
-    flex-wrap: wrap;
-    text-align: center;
-
-    .item {
-        width: 100%;
-    }
-}
-
-.block-layout-alignment-left .item.resource > a:first-child,
-.block-layout-alignment-right .item.resource > a:first-child {
-    vertical-align: top;
-}
-
-
-
-.block-layout-alignment-left .item.resource > h3,
-.block-layout-alignment-right .item.resource > h3 {
-    margin: 0;
-}
-
-.block-layout-alignment-left .item.resource + p,
-.block-layout-alignment-right .item.resource + p {
-    margin-top: 0;
-}
-
-.block-layout-background-size-cover,
-.block-layout-background-size-contain {
-    background-repeat: no-repeat;
-}
-
-.block-layout-background-size-cover {
-    background-size: cover;
-}
-
-.block-layout-background-size-contain {
-    background-size: contain;
-}