Changeset 3418165

Timestamp:

12/12/2025 11:20:21 AM (39 hours ago)

Author:

bastho

Message:

Uses CSS vars in mermaid

Location:

mindcat/trunk

Files:

• build/mindmap/mindmap-rtl.css (modified) (1 diff)
• build/mindmap/mindmap.asset.php (modified) (1 diff)
• build/mindmap/mindmap.css (modified) (1 diff)
• inc/class-mindcat.php (modified) (1 diff)
• inc/views/mermaid.php (modified) (3 diffs)
• vendor/composer/installed.php (modified) (2 diffs)

mindcat/trunk/build/mindmap/mindmap-rtl.css

@@ -1 @@
-.mindcat{clear:both;font-size:1.5em;margin:2em 0;min-height:300px;position:relative;width:100%}.mindcat ul{bottom:0;display:block;height:100%;list-style:none;margin:0;padding:0;position:absolute;left:0;width:100%}.mindcat ul ul{height:0;width:0}.mindcat li{border-right:1px dotted #bbb;height:1px;right:0;position:absolute;top:0;transform-origin:100% 0;-moz-transform-origin:100% 0;-webkit-transform-origin:100% 0;width:1px;z-index:1}.mindcat li a{background:#ccc;border-radius:3px;bottom:0;color:#333;display:block;font-size:1em;height:auto;right:0;padding:.3em 2em;position:absolute;text-align:center;text-decoration:none;white-space:nowrap;z-index:10}.mindcat li a:hover{box-shadow:0 0 10px rgba(0,0,0,.3)}.mindcat_root{font-size:1em;font-weight:900}.mindcat_child{font-size:.7em;font-weight:500}.mindcat_child .mindcat_child .mindcat_child{font-weight:100}.mindcat_count{background:#eee;border-radius:9px;bottom:-10px;color:#333;font-size:11px;font-weight:700;height:15px;min-width:15px;padding:3px;position:absolute;left:-10px;text-align:center}.mindcat-mermaid g p a,.mindcat-mermaid g p a:hover,.mindcat-mermaid g p a:where(:not(.wp-element-button)){text-decoration:none}
+.mindcat{clear:both;font-size:1.5em;margin:2em 0;min-height:300px;position:relative;width:100%}.mindcat ul{bottom:0;display:block;height:100%;list-style:none;margin:0;padding:0;position:absolute;left:0;width:100%}.mindcat ul ul{height:0;width:0}.mindcat li{border-right:1px dotted #bbb;height:1px;right:0;position:absolute;top:0;transform-origin:100% 0;-moz-transform-origin:100% 0;-webkit-transform-origin:100% 0;width:1px;z-index:1}.mindcat li a{background:#ccc;border-radius:3px;bottom:0;color:#333;display:block;font-size:1em;height:auto;right:0;padding:.3em 2em;position:absolute;text-align:center;text-decoration:none;white-space:nowrap;z-index:10}.mindcat li a:hover{box-shadow:0 0 10px rgba(0,0,0,.3)}.mindcat_root{font-size:1em;font-weight:900}.mindcat_child{font-size:.7em;font-weight:500}.mindcat_child .mindcat_child .mindcat_child{font-weight:100}.mindcat_count{background:#eee;border-radius:9px;bottom:-10px;color:#333;font-size:11px;font-weight:700;height:15px;min-width:15px;padding:3px;position:absolute;left:-10px}.mindcat-mermaid,.mindcat_count{text-align:center}.mindcat-mermaid .edgePaths path.edge{stroke:#999!important;stroke-width:3!important}.mindcat-mermaid g p a,.mindcat-mermaid g p a:hover,.mindcat-mermaid g p a:where(:not(.wp-element-button)){text-decoration:none}

mindcat/trunk/build/mindmap/mindmap.asset.php

@@ -1 @@
-<?php return array('dependencies' => array('lodash'), 'version' => 'a172726c847fad96310b');
+<?php return array('dependencies' => array('lodash'), 'version' => '210fbb155d5c1d3aaa0e');

mindcat/trunk/build/mindmap/mindmap.css

@@ -1 @@
-.mindcat{clear:both;font-size:1.5em;margin:2em 0;min-height:300px;position:relative;width:100%}.mindcat ul{bottom:0;display:block;height:100%;list-style:none;margin:0;padding:0;position:absolute;right:0;width:100%}.mindcat ul ul{height:0;width:0}.mindcat li{border-left:1px dotted #bbb;height:1px;left:0;position:absolute;top:0;transform-origin:0 0;-moz-transform-origin:0 0;-webkit-transform-origin:0 0;width:1px;z-index:1}.mindcat li a{background:#ccc;border-radius:3px;bottom:0;color:#333;display:block;font-size:1em;height:auto;left:0;padding:.3em 2em;position:absolute;text-align:center;text-decoration:none;white-space:nowrap;z-index:10}.mindcat li a:hover{box-shadow:0 0 10px rgba(0,0,0,.3)}.mindcat_root{font-size:1em;font-weight:900}.mindcat_child{font-size:.7em;font-weight:500}.mindcat_child .mindcat_child .mindcat_child{font-weight:100}.mindcat_count{background:#eee;border-radius:9px;bottom:-10px;color:#333;font-size:11px;font-weight:700;height:15px;min-width:15px;padding:3px;position:absolute;right:-10px;text-align:center}.mindcat-mermaid g p a,.mindcat-mermaid g p a:hover,.mindcat-mermaid g p a:where(:not(.wp-element-button)){text-decoration:none}
+.mindcat{clear:both;font-size:1.5em;margin:2em 0;min-height:300px;position:relative;width:100%}.mindcat ul{bottom:0;display:block;height:100%;list-style:none;margin:0;padding:0;position:absolute;right:0;width:100%}.mindcat ul ul{height:0;width:0}.mindcat li{border-left:1px dotted #bbb;height:1px;left:0;position:absolute;top:0;transform-origin:0 0;-moz-transform-origin:0 0;-webkit-transform-origin:0 0;width:1px;z-index:1}.mindcat li a{background:#ccc;border-radius:3px;bottom:0;color:#333;display:block;font-size:1em;height:auto;left:0;padding:.3em 2em;position:absolute;text-align:center;text-decoration:none;white-space:nowrap;z-index:10}.mindcat li a:hover{box-shadow:0 0 10px rgba(0,0,0,.3)}.mindcat_root{font-size:1em;font-weight:900}.mindcat_child{font-size:.7em;font-weight:500}.mindcat_child .mindcat_child .mindcat_child{font-weight:100}.mindcat_count{background:#eee;border-radius:9px;bottom:-10px;color:#333;font-size:11px;font-weight:700;height:15px;min-width:15px;padding:3px;position:absolute;right:-10px}.mindcat-mermaid,.mindcat_count{text-align:center}.mindcat-mermaid .edgePaths path.edge{stroke:#999!important;stroke-width:3!important}.mindcat-mermaid g p a,.mindcat-mermaid g p a:hover,.mindcat-mermaid g p a:where(:not(.wp-element-button)){text-decoration:none}

mindcat/trunk/inc/class-mindcat.php

@@ -90 +90 @@
                 $rules.= '.mindcat-use-bg-color .mindcat-term-'.$id.'-bg{background-color:var(--mindcat-color-'.$id.'-bg);}';
                 $rules.= '.mindcat-use-txt-color .mindcat-term-'.$id.'-txt{color:var(--mindcat-color-'.$id.'-txt);}';
+                $rules.= '.mindcat-mermaid-term-'.$id.' .label-container path{fill:var(--mindcat-color-'.$id.'-bg) !important;}';
+                $rules.= '.mindcat-mermaid-term-'.$id.' p, .mindcat-mermaid-term-'.$id.' p a{color:var(--mindcat-color-'.$id.'-txt) !important;}';
             }
         }

mindcat/trunk/inc/views/mermaid.php

@@ -10 +10 @@
 
 namespace Mindcat;
-
-$GLOBALS['mindcat-mermaid-css-rules'] = '';
-function add_css_rule($selector, $rules){
-    $GLOBALS['mindcat-mermaid-css-rules'].="{$selector}{{$rules}}";
-}
 
 function mermaid_tags($args = [], $level=0){
@@ -71 +66 @@
             $bgcolor = isset($MindCatColors[$term->term_id]['bg']) ? $MindCatColors[$term->term_id]['bg'] : '#CCCCCC';
             $color = isset($MindCatColors[$term->term_id]['txt']) ? $MindCatColors[$term->term_id]['txt'] : '#333333';
-            add_css_rule(".mindcat-mermaid-term-{$term->slug} .label-container path", "fill: {$bgcolor} !important");
-            add_css_rule(".mindcat-mermaid-term-{$term->slug} p, .mindcat-mermaid-term-{$term->slug} p a", "color: {$color} !important");
             $ret .= $prefix."{$shapeOpen}<a href=\"{$link}\">{$term->name}</a>{$shapeClose}";
             $ret .= "\n";
-            $ret .= filter_input(INPUT_GET, 'context') !== 'edit' ? $prefix.":::mindcat-mermaid-term-{$term->slug}\n" : '';
+            $ret .= filter_input(INPUT_GET, 'context') !== 'edit' ? $prefix.":::mindcat-mermaid-term-{$term->term_id}\n" : '';
             if (!empty($args['max_level']) && $args['max_level'] > 0 && $args['max_level'] > $level) {
                 $ret .= mermaid_subcat($term->term_id, $level + 1, $args);
@@ -146 +139 @@
         $html .= mermaid_subcat($cat, 1, $args);
         $html .= '</pre>';
-        $html .= '<style>.edgePaths path.edge{ stroke: #999 !important; stroke-width: 3 !important; }';
-        $html.=$GLOBALS['mindcat-mermaid-css-rules'];
-        $html .= '</style>';
         return $html;
     }

mindcat/trunk/vendor/composer/installed.php

@@ -4 +4 @@
         'pretty_version' => 'dev-master',
         'version' => 'dev-master',
-        'reference' => '7348068a90cdaf75177c09cff981cb5026bc98b1',
+        'reference' => '2d798ab1cadf1bff0ccb781d28751fe89560518d',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../../',
@@ -14 +14 @@
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
-            'reference' => '7348068a90cdaf75177c09cff981cb5026bc98b1',
+            'reference' => '2d798ab1cadf1bff0ccb781d28751fe89560518d',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../../',