You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by hn...@apache.org on 2025/12/15 20:03:46 UTC

(myfaces-tobago) 01/03: refactor(link): CSS

This is an automated email from the ASF dual-hosted git repository.

hnoeth pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git

commit 7d659a09e68ac91ba0d408e092c3ae0d981dc704
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Sun Dec 14 15:34:37 2025 +0100

    refactor(link): CSS
---
 tobago-theme/src/main/scss/_tobago.scss | 49 ++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 26 deletions(-)

diff --git a/tobago-theme/src/main/scss/_tobago.scss b/tobago-theme/src/main/scss/_tobago.scss
index 67eac487b3..5704daf95c 100644
--- a/tobago-theme/src/main/scss/_tobago.scss
+++ b/tobago-theme/src/main/scss/_tobago.scss
@@ -934,17 +934,7 @@ .autocomplete-result-list {
   }
 }
 
-/* label ----------------------------------------------------------- */
-
-tobago-links {
-  .nav .nav-item .nav-link {
-    padding: var(--#{$prefix}nav-link-padding-y) var(--#{$prefix}nav-link-padding-x);
-  }
-}
-
-/* link ----------------------------------------------------------- */
-
-.tobago-link {
+@mixin tobagoLink() {
   @include imageTextSpacing();
   @include markupHideToggleIcon();
   white-space: nowrap;
@@ -960,26 +950,25 @@ .tobago-link {
   }
 }
 
-a.tobago-link.dropdown-item {
-  img, span {
-    display: inline-block; /* fix for IE11 - :active selector doesn't work for nested elements */
-    pointer-events: none;
+a.tobago-link {
+  @include tobagoLink();
+
+  &.dropdown-item {
+    img, span {
+      display: inline-block; /* fix for IE11 - :active selector doesn't work for nested elements */
+      pointer-events: none;
+    }
   }
 }
 
 button.tobago-link {
-  text-align: left;
-}
+  @include tobagoLink();
 
-h1, h2, h3, h4, h5, h6 {
-  button.tobago-link {
-    font-size: inherit;
-    font-weight: inherit;
-  }
-}
+  font-size: inherit;
+  font-weight: inherit;
+  text-align: left;
 
-button {
-  &.tobago-link.btn {
+  &.btn {
     @include buttonLinkDisabledCursor();
 
     padding: 0;
@@ -997,15 +986,23 @@ button {
     }
   }
 
-  &.tobago-link.dropdown-item {
+  &.dropdown-item {
     @include buttonLinkDisabledCursor();
   }
+}
 
+button {
   &.nav-link { /* bootstrap don't know button.nav-link*/
     padding: .55em var(--#{$prefix}nav-link-padding-x) .45em;
   }
 }
 
+tobago-links {
+  .nav .nav-item .nav-link {
+    padding: var(--#{$prefix}nav-link-padding-y) var(--#{$prefix}nav-link-padding-x);
+  }
+}
+
 .tobago-messages-container {
   @function exclamation-circle-icon($color) {
     @return url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 12 12' width='12' height='12' fill='none' stroke='#{$color}'><circle cx='6' cy='6' r='4.5'/><path stroke-linejoin='round' d='M5.8 3.6h.4L6 6.5z'/><circle cx='6' cy='8.2' r='.6' fill='#{$color}' stroke='none'/></svg>");