[TikiWiki-commits] [Git][tikiwiki/tiki][master] [FIX] cypht: some color fixes for tiki themes

Victor Emanouilov pushed to branch master at Tiki Wiki CMS Groupware / Tiki


Commits:
0eb37b6b by Benoit Roy at 2025-10-23T11:34:11+00:00
[FIX] cypht: some color fixes for tiki themes
---
* [FIX] cypht: more color fixes

* [FIX] cypht: some color fixes for tiki themes

See merge request tikiwiki/tiki!8789

- - - - -


4 changed files:

- lib/cypht/modules/tiki/calendar_modules.php
- lib/cypht/modules/tiki/functions.php
- lib/cypht/modules/tiki/general_modules.php
- themes/base_files/scss/_cypht-tiki.scss


Changes:

=====================================
lib/cypht/modules/tiki/calendar_modules.php
=====================================
@@ -460,7 +460,7 @@ class Hm_Output_add_rsvp_actions extends Hm_Output_Module
                         }
                     }
                 }
-                $res .= '<div class="row g-0 py-0 py-sm-1 small_header d-flex"><div class="col-md-2"><button class="btn btn-light rsvp-button" data-value="' . $partstat . '" data-comment="' . $comment . '">' . tr('RSVP') . '</button></div><div class="col-md-10 col-12"></div></div>';
+                $res .= '<div class="row g-0 py-0 py-sm-1 small_header d-flex"><div class="col-md-2"><button class="btn btn-sm btn-light rsvp-button" data-value="' . $partstat . '" data-comment="' . $comment . '">' . tr('RSVP') . '</button></div><div class="col-md-10 col-12"></div></div>';
             }
             if ($prefs['feature_calendar'] == 'y' && $method == 'REPLY') {
                 $existing = TikiLib::lib('calendar')->find_by_uid(null, $event['uid']);


=====================================
lib/cypht/modules/tiki/functions.php
=====================================
@@ -387,10 +387,10 @@ if (! hm_exists('tiki_move_to_tracker_dropdown')) {
         }
         $res = "<div class=\"" . ($class != 'move_to_trackers' ? 'dropdown ' : '') . "d-inline-block\">";
         if ($class != 'move_to_trackers') {
-            $res .= "<a class=\"hlink text-decoration-none btn btn-sm btn-outline-secondary ms-2 dropdown-toggle" . (! $message_view ? ' btn btn-sm btn-light border text-black-50' : '') . "\" id=\"{$class}\" href=\"#\" data-bs-toggle='dropdown' aria-haspopup='true' aria-expanded='true' data-bs-auto-close='outside'>" . $mod->trans($title) . "</a>";
+            $res .= "<a class=\"hlink text-decoration-none btn btn-sm btn-outline-secondary dropdown-toggle " . (! $message_view ? ' btn btn-sm btn-light border text-black-50' : '') . "\" id=\"{$class}\" href=\"#\" data-bs-toggle='dropdown' aria-haspopup='true' aria-expanded='true' data-bs-auto-close='outside'>" . $mod->trans($title) . "</a>";
             $res .= "<div class='" . $class . " dropdown-menu' aria-labelledby='$class'><div class='move_to_title'>" . $mod->trans($dropdown_title) . "</div>" . implode("<br>\n", $field_list) . "</div>";
         } else {
-            $res .= "<a class=\"hlink text-decoration-none btn btn-sm btn-outline-secondary ms-2" . (! $message_view ? ' btn btn-sm btn-light border text-black-50' : '') . "\" id=\"{$class}\" href=\"#\" >" . $mod->trans($dropdown_title) . "</a>";
+            $res .= "<a class=\"hlink text-decoration-none btn btn-sm btn-outline-secondary " . (! $message_view ? ' btn btn-sm btn-light border text-black-50' : '') . "\" id=\"{$class}\" href=\"#\" >" . $mod->trans($dropdown_title) . "</a>";
         }
         $res .= "</div>";
 


=====================================
lib/cypht/modules/tiki/general_modules.php
=====================================
@@ -377,7 +377,7 @@ class Hm_Output_filter_message_headers_mpdf extends Hm_Output_Module
     {
         $headers = $this->get('msg_headers');
         if (is_string($headers) && TikiLib::lib('tiki')->get_preference('print_pdf_from_url') == "mpdf") {
-            $pdf_link = ' <a class="hlink text-decoration-none btn btn-sm btn-outline-secondary ms-1" id="print_pdf" href="#"> ' . $this->trans('PDF') . ' </a>';
+            $pdf_link = ' <a class="hlink text-decoration-none btn btn-sm btn-outline-secondary me-1" id="print_pdf" href="#"> ' . $this->trans('PDF') . ' </a>';
             $headers = append_to_msg_headers($headers, $pdf_link);
             $this->out('msg_headers', $headers, false);
         }


=====================================
themes/base_files/scss/_cypht-tiki.scss
=====================================
@@ -103,7 +103,7 @@
         background-color: transparent;
     }
     a:not(.btn):hover {
-        text-decoration: $link-hover-decoration !important;
+        text-decoration: var(--bs-link-decoration);
     }
     .content_title {
         overflow: visible; min-height: 50px; max-height: 400px; padding: 15px;
@@ -115,10 +115,13 @@
             color: var(--bs-body-color) !important;
             &:hover {
                 color: var(--bs-link-hover-color) !important;
-                text-decoration: $link-hover-decoration;
+                text-decoration: var(--bs-link-decoration);
             }
         }
     }
+    .folders .selected_menu a {
+        &, &:hover, i.bi { color: var(--bs-primary-text-emphasis) !important; }
+    }
 
     .folder_list, .content_cell, .compose_page, .message_list, .msg_text, .selected_part,
     .server_content, .profile_content, .user_settings,
@@ -129,7 +132,14 @@
     }
 
     .mailbox_list_title { display: inline-block; }
-    .move_to_location
+    .move_to_location {
+        background-color: var(--bs-dropdown-bg);
+        a i.bi { color: var(--bs-dropdown-color) !important; }
+    }
+    .move_to_title {
+        background-color: var(--bs-dropdown-bg);
+        border-color: var(--bs-dropdown-border-color);
+    }
 
     .msg_text_inner {
         width: 100%;
@@ -156,6 +166,10 @@
     .msg_text table { width: 100% !important; }
     .msg_text .content table { table-layout: fixed; }
     .msg_text #contact_info { white-space: unset; }
+    .msg_text {
+        .js-header_subject { color: var(--bs-body-color); font-size: 1.4rem; }
+        .header_event_addtocal el-select { width: auto; }
+    }
 
     .src_name, .content_title, .list_controls {
         background-color: inherit !important;
@@ -207,7 +221,7 @@
 
     .message_list .combined_sort, .message_list .combined_sort + el-select { display: inline-block; margin-left: 10px; width: 150px; }
 
-    .folders li, .inner_list li {
+    .inner_list li {
         word-break: break-all;
         white-space: unset;
     }
@@ -313,16 +327,6 @@
         .long_header .col-md-2 {
         font-weight: bold;
         }
-
-        .msg_actions a {
-        padding: 0.5rem;
-        border-radius: 0.25rem;
-        background-color: #f8f9fa;
-        text-decoration: none;
-        color: #495057;
-        font-size: 0.6rem;
-        margin-right: 0;
-        }
     }
 
     .collapsed ul {
@@ -356,18 +360,20 @@
         flex-wrap: wrap;
         gap: 0.1rem !important;
     }
-    .search_terms, .search_form select {
+    .search_form select {
         width: auto !important;
     }
 
     .nux_welcome { margin-bottom: 15px; }
+    .block_sender_link.btn-outline-danger {
+        color: var(--bs-btn-color);
+        &:hover, &:active { color: var(--bs-btn-hover-color); text-decoration: none; }
+    }
+    #show_message_source { margin-right: 0.5rem; }
+    .msg_actions .d-inline-block > .hlink { margin-bottom: 0.5rem; }
 }
 
 .mobile.tiki-cypht, .mobile.tiki-webmail {
-    .msg_controls {
-        background: inherit !important;
-    }
-
     .folder_list {
         background-color: $popover-bg;
         color: $popover-body-color;
@@ -402,18 +408,7 @@
             position: fixed;
             z-index: 9999;
         }
-        .menu-toggle {
-            right: 0;
-            left: 0;
-            width: 100%;
-            z-index: 1000;
-            text-align: left;
-            top: 0;
-            padding: 10px 0 10px 20px;
-            background: #fff;
-            box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
-            backdrop-filter: blur(10px);
-        }
+        .menu-toggle { background-color: var(--bs-body-bg); }
         nav .menu-toggle:not(.close-toggle) {
             right: 20px;
             left: unset;
@@ -451,11 +446,8 @@
         }
 
         .list_controls i.bi-filter-circle {
-            position: absolute;
-            right: 15px;
-            top: 10px;
-            font-size: 125%;
-            z-index: 100;
+            position: absolute; top: 11px; right: 15px; z-index: 100;
+            color: var(--bs-body-color);
         }
         .imap_filter_form { margin-left: 10px; margin-right: 10px; }
         .imap_sort, .imap_sort + el-select, .imap_filter + el-select {
@@ -558,7 +550,10 @@
         .msg_text { max-width: 100% !important; word-break: break-word; }
         .msg_text_inner { width: 100%; padding: 15px !important; }
         .msg_parts { table-layout: auto; }
-        .msg_controls { position: fixed; right: 1rem !important; top: 0.3rem; z-index: 1000; height: auto; padding-top: 0; }
+        .msg_controls {
+            top: 0.3rem; height: auto; padding-left: 0; z-index: 1200;
+            background-color: var(--bs-body-bg);
+        }
         #list_controls_menu { background-color: var(--bs-body-bg); }
         #list_controls_menu.show { justify-content: right; align-items: center; margin-top: 1rem; }
         .msg_text table { word-break: normal; }
@@ -600,7 +595,7 @@
     #topbar_modules { display: none !important; }
     #row-middle { margin-left: -15px; margin-right: -15px; border: none; }
     #col1 { padding: 0; border: none; }
-    #col2, #col3 { margin-left: 15px; margin-right: 15px; }
+    #col2, #col3 { margin-left: 0; margin-right: 0; }
 }
 
 .tiki-webmail {
@@ -617,10 +612,10 @@ html body.tiki.tiki-webmail #middle.container.container-std.middle {
     min-width: 95% !important;
 }
 
-//
-// tablet and phone specific
-//
-@media screen and (min-width: 1200px) {
+
+// responsive specific stuff
+// desktop (1199.98px)
+@include media-breakpoint-down(xl) {
     .tiki-webmail {
         .container {
             max-width: 1420px;
@@ -628,15 +623,19 @@ html body.tiki.tiki-webmail #middle.container.container-std.middle {
     }
 }
 
-@media (max-width: 768px) {
+// landscape phones (767.98px)
+@include media-breakpoint-down(md) {
     html body.tiki.tiki-webmail #middle.container.container-std.middle {
         width: 100% !important;
         max-width: 100% !important;
         min-width: 100% !important;
     }
+    .mobile .inline-cypht .list_controls i.bi-filter-circle { top: 2px; right: 0; }
+    .mobile #list_controls_menu.show { top: 25px; right: 0; }
 }
 
-@media (max-width: 575px) {
+// portrait phones (575.98px)
+@include media-breakpoint-down(sm) {
     .mobile .inline-cypht {
         .targets_section, .other_section,
         .time_section, .source_section, .terms_section {



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

-- 
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/0eb37b6b3d60fef2943daf9d71cfc3fe5f38f263
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