Merge branch 'dev' into doi-to-id-refactor

demiankatz · Dec 16, 2024 · 7d78911 · 7d78911
2 parents de703b0 + a91c46b
commit 7d78911
Show file tree

Hide file tree

Showing 10 changed files with 63 additions and 10 deletions.
diff --git a/themes/bootprint3/css/compiled.css b/themes/bootprint3/css/compiled.css
diff --git a/themes/bootstrap3/css/compiled.css b/themes/bootstrap3/css/compiled.css
diff --git a/themes/bootstrap3/less/components/lightbox.less b/themes/bootstrap3/less/components/lightbox.less
@@ -5,6 +5,10 @@
   margin-inline: auto;
   margin-block: 1rem;
   padding-inline: 1rem;
+
+  #lightbox-title {
+    margin-right: 1.5rem;
+  }
 }
 @media (min-width: 768px) {
   #modal .modal-dialog {
@@ -17,6 +21,10 @@
 /* <#LESS */
     min-width: 600px;
     padding: 0;
+
+    #lightbox-title {
+      margin-right: inherit;
+    }
   }
 }
 
@@ -32,6 +40,10 @@
     left: 0;
     right: auto;
   }
+
+  &:hover {
+    outline: dotted 1px @text-color;
+  }
 }
 #modal .close svg {
   width: 1em;
@@ -52,10 +64,12 @@
       left: -1.75em;
       right: auto;
     }
+    &:hover {
+      background-color: #000;
+    }
   }
 }
 
-#modal .modal-content > .close:hover { background-color: #000; }
 #modal .modal-body h1,
 #modal .modal-body h2 {
   margin-top: 0.3rem;

diff --git a/themes/bootstrap3/scss/components/lightbox.scss b/themes/bootstrap3/scss/components/lightbox.scss
@@ -5,6 +5,10 @@
   margin-inline: auto;
   margin-block: 1rem;
   padding-inline: 1rem;
+
+  #lightbox-title {
+    margin-right: 1.5rem;
+  }
 }
 @media (min-width: 768px) {
   #modal .modal-dialog {
@@ -17,6 +21,10 @@
 <#LESS */
     min-width: 600px;
     padding: 0;
+
+    #lightbox-title {
+      margin-right: inherit;
+    }
   }
 }
 
@@ -32,6 +40,10 @@
     left: 0;
     right: auto;
   }
+
+  &:hover {
+    outline: dotted 1px $text-color;
+  }
 }
 #modal .close svg {
   width: 1em;
@@ -52,10 +64,12 @@
       left: -1.75em;
       right: auto;
     }
+    &:hover {
+      background-color: #000;
+    }
   }
 }
 
-#modal .modal-content > .close:hover { background-color: #000; }
 #modal .modal-body h1,
 #modal .modal-body h2 {
   margin-top: 0.3rem;

diff --git a/themes/bootstrap5/css/compiled.css b/themes/bootstrap5/css/compiled.css
diff --git a/themes/bootstrap5/scss/bs3-compat.scss b/themes/bootstrap5/scss/bs3-compat.scss
@@ -344,8 +344,19 @@ h6, .h6 {
   display: none !important;
 }
 
-#modal .modal-content > .close {
+#modal .modal-dialog .modal-content > .close {
   border: 0;
+
+  @media (max-width: 767px) {
+    font-size: 1.5rem;
+    background-color: var(--#{$prefix}modal-bg);
+    top: 0.5rem;
+    right: 0.5rem;
+
+    body.rtl & {
+      left: 0.5rem;
+    }
+  }
 }
 
 .fade.show {

diff --git a/themes/bootstrap5/scss/components/lightbox.scss b/themes/bootstrap5/scss/components/lightbox.scss
@@ -5,6 +5,10 @@
   margin-inline: auto;
   margin-block: 1rem;
   padding-inline: 1rem;
+
+  #lightbox-title {
+    margin-right: 1.5rem;
+  }
 }
 @media (min-width: 768px) {
   #modal .modal-dialog {
@@ -17,6 +21,10 @@
 <#LESS */
     min-width: 600px;
     padding: 0;
+
+    #lightbox-title {
+      margin-right: inherit;
+    }
   }
 }
 
@@ -32,6 +40,10 @@
     left: 0;
     right: auto;
   }
+
+  &:hover {
+    outline: dotted 1px $text-color;
+  }
 }
 #modal .close svg {
   width: 1em;
@@ -52,10 +64,12 @@
       left: -1.75em;
       right: auto;
     }
+    &:hover {
+      background-color: #000;
+    }
   }
 }
 
-#modal .modal-content > .close:hover { background-color: #000; }
 #modal .modal-body h1,
 #modal .modal-body h2 {
   margin-top: 0.3rem;

diff --git a/themes/local_theme_example/css/compiled.css b/themes/local_theme_example/css/compiled.css
diff --git a/themes/sandal/css/compiled.css b/themes/sandal/css/compiled.css
diff --git a/themes/sandal5/css/compiled.css b/themes/sandal5/css/compiled.css