[TikiWiki-commits] [Git][tikiwiki/tiki][29.x] [FIX][UI] Make link-hover variable consistent in FiveAlive and FiveAlive-lite...

Gary Cunningham-Lee pushed to branch 29.x at Tiki Wiki CMS Groupware / Tiki


Commits:
b8553e4c by Gary Cunningham-Lee at 2025-11-06T17:43:58+09:00
[FIX][UI] Make link-hover variable consistent in FiveAlive and FiveAlive-lite...
---
* [FIX][UI] Make link-hover variable consistent in FiveAlive and FiveAlive-lite...
---
* [FIX][UI] Make link-hover variable consistent in FiveAlive and FiveAlive-lite child themes. Thanks, Marc. Todo: Make these child theme files identical except for color values.

See merge request tikiwiki/tiki!8973


(cherry picked from commit 0a2b31a601fe653d65319ae5acfc087c24e2b1af)

df37351e [FIX][UI] Make link-hover variable consistent in FiveAlive and FiveAlive-lite...

Co-authored-by: Gary Cunningham-Lee <gary_c-39LOpZwlz1/[email protected]>

See merge request tikiwiki/tiki!8974

- - - - -


16 changed files:

- themes/fivealive-lite/options/akebi/scss/_variables.scss
- themes/fivealive-lite/options/grape/scss/_variables.scss
- themes/fivealive-lite/options/kiwi/scss/_variables.scss
- themes/fivealive-lite/options/lemon/scss/_variables.scss
- themes/fivealive-lite/options/orange/scss/_variables.scss
- themes/fivealive-lite/options/plum/scss/_variables.scss
- themes/fivealive-lite/options/raspberry/scss/_variables.scss
- themes/fivealive-lite/options/watermelon/scss/_variables.scss
- themes/fivealive/options/akebi/scss/_variables.scss
- themes/fivealive/options/grape/scss/_variables.scss
- themes/fivealive/options/kiwi/scss/_variables.scss
- themes/fivealive/options/lemon/scss/_variables.scss
- themes/fivealive/options/orange/scss/_variables.scss
- themes/fivealive/options/plum/scss/_variables.scss
- themes/fivealive/options/raspberry/scss/_variables.scss
- themes/fivealive/options/watermelon/scss/_variables.scss


Changes:

=====================================
themes/fivealive-lite/options/akebi/scss/_variables.scss
=====================================
@@ -43,10 +43,11 @@ $body-color: $black; // $gray-800;  // default From FiveAlive
 $tiki-footer-border-color: $primary;
 
 // Links
-$link-color: #11606E; //#138296;  From FiveAlive
-$link-hover-color:            darken($link-color, 15%);
-$link-hover-decoration:       none;
-$link-shade-percentage:                   20%;  // default
+$link-color:                #11606E; //#138296;  From FiveAlive
+$link-shade-percentage:     20%; // default
+$link-hover-color:          shift-color($link-color, $link-shade-percentage); // default
+$link-hover-decoration:     none;
+$btn-link-disabled-color:   $gray-600;  // default
 
 // Components
 //$component-active-color:       #ddb9af; // $white;  // default


=====================================
themes/fivealive-lite/options/grape/scss/_variables.scss
=====================================
@@ -43,9 +43,11 @@ $body-color: #212529;
 $tiki-footer-border-color: $primary;
 
 // Links
-$link-color: #a02871;
-$link-hover-color: #a02871;
-$link-shade-percentage:                   20%;  // default
+$link-color:                #a02871;
+$link-shade-percentage:     20%; // default
+$link-hover-color:          shift-color($link-color, $link-shade-percentage); // default
+$link-hover-decoration:     none;
+$btn-link-disabled-color:   $gray-600;  // default
 
 // Components
 $component-active-bg: #bc2f84;


=====================================
themes/fivealive-lite/options/kiwi/scss/_variables.scss
=====================================
@@ -49,12 +49,11 @@ $body-color: #212529;
 $tiki-footer-border-color: $primary;
 
 // Links
-$link-color: #52702E; // #638637;
-$link-hover-color: #a59705;
-$link-hover-color:               darken($link-color, 15%);
-$link-hover-decoration:       none;
-$link-shade-percentage:                   20%;  // default
-$btn-link-disabled-color:     $gray-600;  // default
+$link-color:                #52702E; // #638637;
+$link-shade-percentage:     20%; // default
+$link-hover-color:          shift-color($link-color, $link-shade-percentage); // default
+$link-hover-decoration:     none;
+$btn-link-disabled-color:   $gray-600;  // default
 
 // Components
 $component-active-bg: $secondary;


=====================================
themes/fivealive-lite/options/lemon/scss/_variables.scss
=====================================
@@ -36,9 +36,11 @@ $body-color: #212529;
 $tiki-footer-border-color: $primary;
 
 // Links
-$link-color: #007508; //#BB5525; //#c75a28;
-$link-hover-color:               shift-color($link-color, $link-shade-percentage); // darken($link-color, 15%);
-$link-shade-percentage:                   20%;  // default
+$link-color:                #007508; //#BB5525; //#c75a28;
+$link-shade-percentage:     20%; // default
+$link-hover-color:          shift-color($link-color, $link-shade-percentage); // default
+$link-hover-decoration:     none;
+$btn-link-disabled-color:   $gray-600;  // default
 
 // Components
 $component-active-color: #2D7709; // $dark;


=====================================
themes/fivealive-lite/options/orange/scss/_variables.scss
=====================================
@@ -36,8 +36,11 @@ $body-color: #212529;
 $tiki-footer-border-color: $primary;
 
 // Links
-$link-color: #c74b23;
-$link-shade-percentage:                   20%;  // default
+$link-color:                #c74b23;
+ $link-shade-percentage:     20%; // default
+ $link-hover-color:          shift-color($link-color, $link-shade-percentage); // default
+ $link-hover-decoration:     none;
+ $btn-link-disabled-color:   $gray-600;  // default
 
 // Components
 // Typography


=====================================
themes/fivealive-lite/options/plum/scss/_variables.scss
=====================================
@@ -40,9 +40,11 @@ $body-color: #212529;
 $tiki-footer-border-color: $primary;
 
 // Links
-$link-color: #7a04b5;
-$link-hover-color: #7a04b5;
-$link-shade-percentage:                   20%;  // default
+$link-color:                #7a04b5;
+$link-shade-percentage:     20%; // default
+$link-hover-color:          shift-color($link-color, $link-shade-percentage); // default
+$link-hover-decoration:     none;
+$btn-link-disabled-color:   $gray-600;  // default
 
 // Components
 // Typography


=====================================
themes/fivealive-lite/options/raspberry/scss/_variables.scss
=====================================
@@ -37,12 +37,11 @@ $body-color: #212529;
 $tiki-footer-border-color: $primary;
 
 // Links
-$link-color:                   #b51360;
-//$link-hover-color:               darken($link-color, 15%);
-$link-hover-decoration:       none;
-$link-shade-percentage:                   20%;  // default
-
-$btn-link-disabled-color:     $gray-600;  // default
+$link-color:                #b51360;
+$link-shade-percentage:     20%; // default
+$link-hover-color:          shift-color($link-color, $link-shade-percentage); // default
+$link-hover-decoration:     none;
+$btn-link-disabled-color:   $gray-600;  // default
 
 // Components
 // Typography


=====================================
themes/fivealive-lite/options/watermelon/scss/_variables.scss
=====================================
@@ -37,12 +37,11 @@ $body-color: #212529;
 $tiki-footer-border-color: $primary;
 
 // Links
-$link-color: #E11436;
-$link-hover-color:               darken($link-color, 15%);
-$link-hover-decoration:       none;
-$link-shade-percentage:                   20%;  // default
-
-$btn-link-disabled-color:     $gray-600;  // default
+$link-color:                #E11436;
+$link-shade-percentage:     20%; // default
+$link-hover-color:          shift-color($link-color, $link-shade-percentage); // default
+$link-hover-decoration:     none;
+$btn-link-disabled-color:   $gray-600;  // default
 
 // Components
 // Typography


=====================================
themes/fivealive/options/akebi/scss/_variables.scss
=====================================
@@ -51,8 +51,11 @@ $prefix: bs-;
 $body-color: $black;
 
 // Links
-$link-color: #11606E;
-$link-shade-percentage:                   20%;  // default
+$link-color:                #11606E; //#138296;  From FiveAlive
+$link-shade-percentage:     20%; // default
+$link-hover-color:          shift-color($link-color, $link-shade-percentage); // default
+$link-hover-decoration:     none;
+$btn-link-disabled-color:   $gray-600;  // default
 
 // Components
 //$component-active-color:       #ddb9af; // $white;  // default


=====================================
themes/fivealive/options/grape/scss/_variables.scss
=====================================
@@ -51,9 +51,11 @@ $prefix: bs-;
 $body-color: $black;
 
 // Links
-$link-color: #a02871;
-$link-hover-color: #a02871;
-$link-shade-percentage:                   20%;  // default
+$link-color:                #a02871;
+$link-shade-percentage:     20%; // default
+$link-hover-color:          shift-color($link-color, $link-shade-percentage); // default
+$link-hover-decoration:     none;
+$btn-link-disabled-color:   $gray-600;  // default
 
 // Components
 $component-active-bg: #BC2F84FF;


=====================================
themes/fivealive/options/kiwi/scss/_variables.scss
=====================================
@@ -52,9 +52,11 @@ $body-bg:                   $white;  // default
 $body-color: #212529;
 
 // Links
-$link-color: #52702E; // #638637;
-$link-hover-color: #a59705;
-$link-shade-percentage:                   20%;  // default
+$link-color:                #52702E; // #638637;
+$link-shade-percentage:     20%; // default
+$link-hover-color:          shift-color($link-color, $link-shade-percentage); // default
+$link-hover-decoration:     none;
+$btn-link-disabled-color:   $gray-600;  // default
 
 // Components
 $component-active-bg: $secondary;


=====================================
themes/fivealive/options/lemon/scss/_variables.scss
=====================================
@@ -49,9 +49,11 @@ $headings-color: $body-color;
 $body-color: $gray-800;  // default
 
 // Links
-$link-color: #BB5525; //#c75a28;
-$link-hover-color:               darken($link-color, 15%);
-$link-shade-percentage:                   20%;  // default
+$link-color:                #BB5525; //#c75a28;
+$link-shade-percentage:     20%; // default
+$link-hover-color:          shift-color($link-color, $link-shade-percentage); // default
+$link-hover-decoration:     none;
+$btn-link-disabled-color:   $gray-600;  // default
 
 // Components
 $component-active-color: #2D7709; // $dark;


=====================================
themes/fivealive/options/orange/scss/_variables.scss
=====================================
@@ -41,8 +41,11 @@ $prefix: bs-;
 $body-color: $gray-800;  // default
 
 // Links
-$link-color: #c74b23;
-$link-shade-percentage:                   20%;  // default
+$link-color:                #c74b23;
+$link-shade-percentage:     20%; // default
+$link-hover-color:          shift-color($link-color, $link-shade-percentage); // default
+$link-hover-decoration:     none;
+$btn-link-disabled-color:   $gray-600;  // default
 
 // Navs
 $nav-tabs-link-color: #000;


=====================================
themes/fivealive/options/plum/scss/_variables.scss
=====================================
@@ -44,9 +44,11 @@ $prefix: bs-;
 $body-color: $gray-800;  // default
 
 // Links
-$link-color: #7a04b5;
-$link-hover-color: #7a04b5;
-$link-shade-percentage:                   20%;  // default
+$link-color:                #7a04b5;
+$link-shade-percentage:     20%; // default
+$link-hover-color:          shift-color($link-color, $link-shade-percentage); // default
+$link-hover-decoration:     none;
+$btn-link-disabled-color:   $gray-600;  // default
 
 // Navs
 $nav-tabs-link-color: #000;


=====================================
themes/fivealive/options/raspberry/scss/_variables.scss
=====================================
@@ -42,9 +42,11 @@ $prefix: bs-;
 $body-color: $gray-800;  // default
 
 // Links
-$link-color:                   #b51360;
-$link-hover-color:               darken($link-color, 15%);
-$link-hover-decoration:       none;
+$link-color:                #b51360;
+$link-shade-percentage:     20%; // default
+$link-hover-color:          shift-color($link-color, $link-shade-percentage); // default
+$link-hover-decoration:     none;
+$btn-link-disabled-color:   $gray-600;  // default
 
 // Navs
 $nav-tabs-link-color: #000;


=====================================
themes/fivealive/options/watermelon/scss/_variables.scss
=====================================
@@ -40,12 +40,11 @@ $prefix: bs-;
 $body-color: $gray-800;  // default
 
 // Links
-$link-color: #E11436;
-$link-hover-color:               darken($link-color, 15%);
-$link-hover-decoration:       none;
-$link-shade-percentage:                   20%;  // default
-
-$btn-link-disabled-color:     $gray-600;  // default
+$link-color:                #E11436;
+$link-shade-percentage:     20%; // default
+$link-hover-color:          shift-color($link-color, $link-shade-percentage); // default
+$link-hover-decoration:     none;
+$btn-link-disabled-color:   $gray-600;  // default
 
 // Navs
 $nav-tabs-link-color: #000;



View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/b8553e4cd2e8290d2e8f4f963e2fa873270bdad6

-- 
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/b8553e4cd2e8290d2e8f4f963e2fa873270bdad6
You're receiving this email because of your account on gitlab.com.

_______________________________________________
TikiWiki-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs