Merge pull request #214 from bugfolder/main

Update borg theme to latest version, update PATCHES.md accordingly.
backdrop-ops · Nov 19, 2022 · b73aa4c · b73aa4c
2 parents 3fc2503 + 3509fab
commit b73aa4c
Show file tree

Hide file tree

Showing 13 changed files with 226 additions and 210 deletions.
diff --git a/PATCHES.md b/PATCHES.md
@@ -7,12 +7,6 @@ Core patches
 Contrib patches
 ===============
 
-borg - decrease header icon font size
-  https://github.com/backdrop-contrib/borg/issues/22
-  https://github.com/backdrop-contrib/borg/pull/23.patch
-
----
-
 api - Format @return tags nicely
   https://github.com/backdrop-ops/api.backdropcms.org/issues/64
   https://github.com/backdrop-contrib/api/pull/3.patch

diff --git a/www/themes/borg/borg.info b/www/themes/borg/borg.info
@@ -28,7 +28,7 @@ ckeditor_stylesheets[] = css/editor.css
 ; Custom javascript to be added:
 scripts[] = js/borg.js
 
-; Added by Backdrop CMS packaging script on 2021-07-21
+; Added by Backdrop CMS packaging script on 2022-03-16
 project = borg
-version = 1.x-1.1.16
-timestamp = 1626899709
+version = 1.x-1.1.18
+timestamp = 1647475205
diff --git a/www/themes/borg/css/base.css b/www/themes/borg/css/base.css
@@ -11,7 +11,7 @@ body {
   line-height: 1.25;
   margin: 0;
   padding: 0;
-  min-width: 300px;
+  min-width: 320px;
 }
 
 @media (max-width: 48em) {  /* 768px @ 16px font size  -- MD */

diff --git a/www/themes/borg/css/components-nodes.css b/www/themes/borg/css/components-nodes.css
@@ -115,6 +115,17 @@ label.github-clone-label {
     margin-left: 0;
   }
 }
+.node-type-project-module .block-field-node-field-download-count .field-item,
+.node-type-project-module .block-field-node-field-download-count .field-label,
+.node-type-project-module .block-project-usage-project-usage .usage-total,
+.node-type-project-module .block-project-usage-project-usage .usage-label {
+  display: inline-block;
+  float: none;
+}
+.node-type-project-module .block-field-node-field-download-count .field-label,
+.node-type-project-module .block-project-usage-project-usage .usage-label {
+  padding-left: 0.5em;
+}
 
 /*******************************************************************************
  * Project Placeholder

diff --git a/www/themes/borg/css/components-views.css b/www/themes/borg/css/components-views.css
@@ -292,10 +292,12 @@
 /*******************************************************************************
  * Showcase view
  ******************************************************************************/
-.view-showcase .col {
+.view-showcase .col,
+.view-showcase .views-row {
   padding-bottom: 15px;
 }
-.view-showcase .col-inner {
+.view-showcase .col-inner,
+.view-showcase .fields {
   background-color: #fff;
   border: 2px solid #EDEFF0;
   border-radius: 4px;
@@ -322,11 +324,25 @@
 }
 
 @media (min-width: 34em) { /* 544px @ 16px font size -- SM */
-  .view-showcase .col {
+  .view-showcase .col,
+  .view-showcase .views-row {
     padding-bottom: 30px;
   }
 }
 @media (min-width: 48em) {  /* 768px @ 16px font size  -- MD */
+  .view-showcase.view-display-id-page .view-content {
+    column-count: 2;
+    -moz-column-count: 2;
+    -webkit-column-count: 2;
+    column-gap: 1.875rem;
+    -moz-column-gap: 1.875rem;
+    -webkit-column-gap: 1.875rem;
+  }
+  .view-showcase.view-display-id-page .views-row {
+    break-inside: avoid;
+    page-break-inside: avoid;
+    -webkit-column-break-inside: avoid;
+  }
   .view-showcase .row {
     padding-top: 15px;
     padding-bottom: 15px;
@@ -342,6 +358,14 @@
   }
 }
 @media (min-width: 62em) { /* 992px @ 16px font size -- LG */
+  .view-showcase.view-display-id-page .view-content {
+    column-gap: 3.75rem;
+    -moz-column-gap: 3.75rem;
+    -webkit-column-gap: 3.75rem;
+  }
+  .view-showcase .views-row {
+    padding-bottom: 60px;
+  }
   .view-showcase .row {
     padding-top: 30px;
     padding-bottom: 30px;

diff --git a/www/themes/borg/css/components.css b/www/themes/borg/css/components.css
@@ -16,7 +16,7 @@ a.logo {
   float: left;
   width: 40px;
   box-sizing: border-box;
-  margin-left: 15px;
+  margin: 0 15px;
 }
 .site-slogan {
   display: none;
@@ -364,7 +364,6 @@ article footer .submitted {
   padding: 10px 0;
 }
 article footer .user-picture {
-  float: left;
   margin-right: 15px;
 }
 article footer .user-picture img img {
@@ -405,10 +404,16 @@ article footer .arrow-down:after {
   }
   article footer .submitted {
     padding: 0;
-    line-height: 40px;
   }
+  article footer.has-picture {
+    display: table;
+    min-height: 100px;
+  }
+  article footer.has-picture .user-picture,
   article footer.has-picture .submitted {
-    line-height: 100px;
+    display: table-cell;
+    vertical-align: middle;
+    min-height: 80px;
   }
   article footer .arrow-down {
     display: block;
@@ -419,6 +424,9 @@ article footer .arrow-down:after {
   article.view-mode-full footer {
     margin-bottom: 50px;
   }
+  article footer p.submitted {
+    font-size: 1.125rem; /* relative size: 18px; */
+  }
 }
 
 /*******************************************************************************
@@ -454,6 +462,7 @@ article.comment footer a.permalink {
 *******************************************************************************/
 article .content .field-name-field-tags {
   padding: 0;
+  margin-bottom: 0;
 }
 
 .field-name-field-tags {
@@ -625,6 +634,9 @@ a.feed-icon {
 .block-on-the-web-social-links a i {
   color: #007CBA;
 }
+.l-footer .block-on-the-web-social-links a i {
+  text-align: left;
+}
 .block-on-the-web-social-links a i:first-child {
   margin-left: 0;
 }
@@ -817,6 +829,10 @@ body.user-form .page-title {
 /*******************************************************************************
  * Login form
 *******************************************************************************/
+#user-login .help p {
+  font-size: 1.5rem; /* 24px */
+  text-align: center;
+}
 #user-login .form-item {
   padding: 15px 0;
   margin: 0;
@@ -830,24 +846,25 @@ body.user-form .page-title {
 #user-login .form-required {
   display: none;
 }
-#user-login .form-item input {
-  width: 100%;
-}
 #user-login small {
   margin: 0 10px;
   display: block;
   padding-top: 10px;
 }
 
-@media (min-width: 34em) { /* 544px */
+@media (min-width: 48em) {  /* 768px @ 16px font size  -- MD */
   #user-login {
-    max-width: 560px;
+    max-width: 600px;
     margin: 0 auto 10em auto;
     text-align: left;
   }
   #user-login .form-item {
+    padding: 20px 0;
     display: flex;
   }
+  #user-login .password-toggle {
+    top: -1.5em;
+  }
   #user-login .form-item label {
     text-align: right;
     width: 215px;
@@ -859,6 +876,7 @@ body.user-form .page-title {
   }
   #user-login .form-item input {
     width: 390px;
+    flex: 1;
   }
   #user-login small {
     display: inline;
@@ -892,22 +910,26 @@ body.user-form .page-title {
   max-width: 600px;
   margin: 0 auto;
 }
-#user-register-form .form-item {
-  padding: 15px 0;
-  display: flex;
+#user-register-form .help p {
+  font-size: 1.5rem; /* 24px */
 }
 #user-register-form fieldset .form-item {
   padding: 5px 0;
   margin-bottom: .5em;
 }
 #user-register-form .form-item label {
-  width: 180px;
   padding-right: 15px;
-  display: inline-block;
+  line-height: 2.2em;
+}
+#user-register-form .field-type-text-long label {
+  width: auto;
+}
+#user-register-form .form-type-checkbox label {
+  line-height: 1.25em;
 }
-#user-register-form .form-item input {
+#user-register-form .form-item input[type="text"],
+#user-register-form .form-item input[type="email"] {
   width: 100%;
-  flex: 1;
 }
 #user-register-form #edit-contact {
   margin: 30px 0;
@@ -939,14 +961,30 @@ body.user-form .page-title {
   color: #666;
 }
 
-@media (max-width: 580px) {
+@media (min-width: 48em) {  /* 768px @ 16px font size  -- MD */
   #user-register-form .form-item {
-    display: block;
+    display: flex;
     padding: 10px 0;
     margin: 0;
   }
-  #user-register-form .form-item label {
+  #user-register-form .field-type-text-long .form-item,
+  #user-register-form .form-type-checkbox .form-item {
+    /* undo flex */
     display: block;
+    padding-bottom: 0;
+  }
+  #user-register-form .form-item label {
+    width: 150px;
+  }
+  #user-register-form .form-type-checkbox label {
+    width: auto;
+  }
+  #user-register-form .form-item input[type="text"],
+  #user-register-form .form-item input[type="email"] {
+    flex: 1;
+  }
+  #user-register-form #edit-contact .form-item input {
+    flex: none;
   }
 }
 

diff --git a/www/themes/borg/css/node-project.css b/www/themes/borg/css/node-project.css
@@ -233,13 +233,19 @@ article.node-project-release.view-mode-project-search article.view-mode-teaser {
 .node-project .view-project-release-download-table th,
 .node-project .view-project-release-download-table td {
   padding: 5px .8em .0 0;
+}
+.node-project .view-project-release-download-table th {
   vertical-align: bottom;
 }
+.node-project .view-project-release-download-table td {
+  vertical-align: top;
+}
 .node-project .view-project-release-download-table .recommended td:first-child a {
   display: inline-block;
   margin: 0 .2em 0 0;
 }
-.node-project .view-project-release-download-table .recommended td:first-child a:after {
+.node-project .view-project-release-download-table .recommended td:first-child a:after,
+.node-project .view-project-release-download-table .supported td:first-child a:after {
   content: "\f0ab";
   font-family: 'FontAwesome';
   display: inline-block;

diff --git a/www/themes/borg/css/page-front.css b/www/themes/borg/css/page-front.css
@@ -98,16 +98,16 @@ body.front .l-content {
 }
 
 body.front .page-title {
-  font-size: 400%;
-  padding-bottom: 18px;
+  font-size: 250%;
   margin-bottom: 30px;
 }
-
-body.front .node-page h1,
-body.front .node-page h2,
-body.front .node-page h3 {
-  text-align: center;
+@media (min-width: 48em) {  /* 768px @ 16px font size  -- MD */
+  body.front .page-title {
+    font-size: 400%;
+    padding-bottom: 18px;
+  }
 }
+
 body.front .node-page ul {
   -webkit-column-count: 2;
   -moz-column-count: 2;
@@ -119,7 +119,6 @@ body.front .node-page ul {
 @media (min-width: 48em) {  /* 768px @ 16px font size  -- MD */
   body.front .node-page {
     margin: 0 auto 80px auto;
-    text-align: center;
     padding-right: 15px;
   }
 }