Merge pull request #40 from MITLibraries/omnibus

matt-bernhardt · web-flow · commit bd6d4683f2ab · 2024-03-19T15:37:43.000-04:00
Omnibus styling and markup changes
diff --git a/asset/css/base.css b/asset/css/base.css
diff --git a/asset/scss/_banner.scss b/asset/scss/_banner.scss
@@ -15,7 +15,7 @@
         padding: 0;
 
         .page-header-home {
-            padding: 1rem;
+            padding: 2rem;
             padding-bottom: 0;
 
             a {
diff --git a/asset/scss/content/_resource-list.scss b/asset/scss/content/_resource-list.scss
@@ -94,6 +94,7 @@ ul.resource-list.list {
 
             img {
                 float: right;
+                margin: 0 0 0 1rem;
                 max-width: 10rem;
             }
 
diff --git a/asset/scss/content/block-layout/_all.scss b/asset/scss/content/block-layout/_all.scss
@@ -5,3 +5,4 @@
 @import "media-embed";
 @import "resource";
 @import "timeline";
+@import "wysiwyg";
diff --git a/asset/scss/content/block-layout/_item-with-metadata.scss b/asset/scss/content/block-layout/_item-with-metadata.scss
@@ -23,6 +23,15 @@
 
                 dd {
                     grid-column: 2;
+
+                    img {
+                        display: block;
+                        margin-bottom: 1rem;
+                    }
+
+                    img + span.resource-name {
+                        display: block;
+                    }
                 }
             }
         }
diff --git a/asset/scss/content/block-layout/_resource.scss b/asset/scss/content/block-layout/_resource.scss
@@ -21,6 +21,10 @@ body div.resource {
     .caption {
         padding: 0 1rem 1rem;
         text-align: left;
+
+        a {
+            display: inline;
+        }
     }
 
     .caption + .caption {
diff --git a/asset/scss/content/block-layout/_wysiwyg.scss b/asset/scss/content/block-layout/_wysiwyg.scss
@@ -0,0 +1,3 @@
+.center {
+    text-align: center;
+}
diff --git a/view/common/navigation-default.phtml b/view/common/navigation-default.phtml
@@ -1,3 +1,5 @@
 <div id="navbar-container">
-    <?php echo $site->publicNav()->menu(); ?>
+    <nav aria-label="<?php echo $this->escapeHtml($site->title()); ?>">
+        <?php echo $site->publicNav()->menu(); ?>
+    </nav>
 </div>
diff --git a/view/common/navigation-vertical.phtml b/view/common/navigation-vertical.phtml
@@ -1,3 +1,5 @@
 <div id="navbar-container" class="col1q">
-    <?php echo $site->publicNav()->menu(); ?>
+    <nav aria-label="<?php echo $this->escapeHtml($site->title()); ?>">
+        <?php echo $site->publicNav()->menu(); ?>
+    </nav>
 </div>

Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,7 @@ ul.resource-list.list {`
`94`	`94`
`95`	`95`	`img {`
`96`	`96`	`float: right;`
	`97`	`+ margin: 0 0 0 1rem;`
`97`	`98`	`max-width: 10rem;`
`98`	`99`	`}`
`99`	`100`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,15 @@`
`23`	`23`
`24`	`24`	`dd {`
`25`	`25`	`grid-column: 2;`
	`26`	`+`
	`27`	`+ img {`
	`28`	`+ display: block;`
	`29`	`+ margin-bottom: 1rem;`
	`30`	`+ }`
	`31`	`+`
	`32`	`+ img + span.resource-name {`
	`33`	`+ display: block;`
	`34`	`+ }`
`26`	`35`	`}`
`27`	`36`	`}`
`28`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+.center {`
	`2`	`+ text-align: center;`
	`3`	`+}`