Merge branch 'master' of github.com:squidfunk/mkdocs-material

squidfunk · Sep 2, 2023 · c9b3d43 · c9b3d43
2 parents bca4b1f + ea53f53
commit c9b3d43
Show file tree

Hide file tree

Showing 7 changed files with 68 additions and 30 deletions.
diff --git a/...assets/javascripts/bundle.315d0c11.min.js → ...assets/javascripts/bundle.dff1b7c8.min.js b/...assets/javascripts/bundle.315d0c11.min.js → ...assets/javascripts/bundle.dff1b7c8.min.js
diff --git a/...ts/javascripts/bundle.315d0c11.min.js.map → ...ts/javascripts/bundle.dff1b7c8.min.js.map b/...ts/javascripts/bundle.315d0c11.min.js.map → ...ts/javascripts/bundle.dff1b7c8.min.js.map
diff --git a/.../assets/stylesheets/main.a40a1bc3.min.css → .../assets/stylesheets/main.046329b4.min.css b/.../assets/stylesheets/main.a40a1bc3.min.css → .../assets/stylesheets/main.046329b4.min.css
diff --git a/...ets/stylesheets/main.a40a1bc3.min.css.map → ...ets/stylesheets/main.046329b4.min.css.map b/...ets/stylesheets/main.a40a1bc3.min.css.map → ...ets/stylesheets/main.046329b4.min.css.map
diff --git a/material/base.html b/material/base.html
@@ -44,7 +44,7 @@
       {% endif %}
     {% endblock %}
     {% block styles %}
-      <link rel="stylesheet" href="{{ 'assets/stylesheets/main.a40a1bc3.min.css' | url }}">
+      <link rel="stylesheet" href="{{ 'assets/stylesheets/main.046329b4.min.css' | url }}">
       {% if config.theme.palette %}
         {% set palette = config.theme.palette %}
         <link rel="stylesheet" href="{{ 'assets/stylesheets/palette.85d0ee34.min.css' | url }}">
@@ -250,7 +250,7 @@
       </script>
     {% endblock %}
     {% block scripts %}
-      <script src="{{ 'assets/javascripts/bundle.315d0c11.min.js' | url }}"></script>
+      <script src="{{ 'assets/javascripts/bundle.dff1b7c8.min.js' | url }}"></script>
       {% for script in config.extra_javascript %}
         {{ script | script_tag }}
       {% endfor %}

diff --git a/src/assets/javascripts/components/content/mermaid/index.css b/src/assets/javascripts/components/content/mermaid/index.css
@@ -324,32 +324,38 @@ defs #ZERO_OR_MORE_END circle {
 
 /* Sequence actor */
 .actor {
-  fill: var(--md-mermaid-label-bg-color);
-  stroke: var(--md-mermaid-node-fg-color);
+  fill: var(--md-mermaid-sequence-actor-bg-color);
+  stroke: var(--md-mermaid-sequence-actor-border-color);
 }
 
 /* Sequence actor text */
 text.actor > tspan {
   font-family: var(--md-mermaid-font-family);
-  fill: var(--md-mermaid-label-fg-color);
+  fill: var(--md-mermaid-sequence-actor-fg-color);
 }
 
 /* Sequence actor line */
 line {
-  stroke: var(--md-default-fg-color--lighter);
+  stroke: var(--md-mermaid-sequence-actor-line-color);
 }
 
 /* Sequence actor */
 .actor-man circle,
 .actor-man line {
-  fill: var(--md-mermaid-label-bg-color);
-  stroke: var(--md-mermaid-node-fg-color);
+  fill: var(--md-mermaid-sequence-actorman-bg-color);
+  stroke: var(--md-mermaid-sequence-actorman-line-color);
 }
 
 /* Sequence message line */
 .messageLine0,
 .messageLine1 {
-  stroke: var(--md-mermaid-edge-color);
+  stroke: var(--md-mermaid-sequence-message-line-color);
+}
+
+/* Sequence note */
+.note {
+  fill: var(--md-mermaid-sequence-note-bg-color);
+  stroke: var(--md-mermaid-sequence-note-border-color);
 }
 
 /* Sequence message, loop and note text */
@@ -358,57 +364,67 @@ line {
 .loopText > tspan,
 .noteText > tspan {
   font-family: var(--md-mermaid-font-family) !important;
-  fill: var(--md-mermaid-edge-color);
   stroke: none;
 }
 
+/* Sequence message text */
+.messageText {
+  fill: var(--md-mermaid-sequence-message-fg-color);
+}
+
+/* Sequence loop text */
+.loopText,
+.loopText > tspan {
+  fill: var(--md-mermaid-sequence-loop-fg-color);
+}
+
 /* Sequence note text */
 .noteText > tspan {
-  fill: hsl(0, 0%, 0%);
+  fill: var(--md-mermaid-sequence-note-fg-color);
 }
 
 /* Sequence arrow head */
 #arrowhead path {
-  fill: var(--md-mermaid-edge-color);
+  fill: var(--md-mermaid-sequence-message-line-color);
   stroke: none;
 }
 
 /* Sequence loop line */
 .loopLine {
-  fill: var(--md-mermaid-node-bg-color);
-  stroke: var(--md-mermaid-node-fg-color);
+  fill: var(--md-mermaid-sequence-loop-bg-color);
+  stroke: var(--md-mermaid-sequence-loop-border-color);
 }
 
 /* Sequence label box */
 .labelBox {
-  fill: var(--md-mermaid-node-bg-color);
+  fill: var(--md-mermaid-sequence-label-bg-color);
   stroke: none;
 }
 
 /* Sequence label text */
 .labelText,
 .labelText > span {
   font-family: var(--md-mermaid-font-family);
-  fill: var(--md-mermaid-node-fg-color);
+  fill: var(--md-mermaid-sequence-label-fg-color);
 }
 
 /* Sequence number */
 .sequenceNumber {
-  fill: var(--md-accent-bg-color);
+  fill: var(--md-mermaid-sequence-number-fg-color);
 }
 
 /* Sequence rectangle */
 rect.rect {
-  fill: var(--md-mermaid-node-bg-color);
+  fill: var(--md-mermaid-sequence-box-bg-color);
   stroke: none;
 }
 
 /* Sequence rectangle text */
 rect.rect + text.text {
-  fill: var(--md-mermaid-edge-color);
+  fill: var(--md-mermaid-sequence-box-fg-color);
 }
 
 /* Sequence diagram markers */
 defs #sequencenumber {
-  fill: var(--md-mermaid-node-fg-color) !important;
+  fill: var(--md-mermaid-sequence-number-bg-color) !important;
 }
diff --git a/src/assets/stylesheets/main/integrations/_mermaid.scss b/src/assets/stylesheets/main/integrations/_mermaid.scss
@@ -28,12 +28,34 @@
 :root > * {
   --md-mermaid-font-family:            var(--md-text-font-family), sans-serif;
 
-  // Colors
+  // General colors
   --md-mermaid-edge-color:             var(--md-code-fg-color);
   --md-mermaid-node-bg-color:          var(--md-accent-fg-color--transparent);
   --md-mermaid-node-fg-color:          var(--md-accent-fg-color);
   --md-mermaid-label-bg-color:         var(--md-default-bg-color);
   --md-mermaid-label-fg-color:         var(--md-code-fg-color);
+
+  // Sequence diagram colors
+  --md-mermaid-sequence-actor-bg-color:      var(--md-mermaid-label-bg-color);
+  --md-mermaid-sequence-actor-fg-color:      var(--md-mermaid-label-fg-color);
+  --md-mermaid-sequence-actor-border-color:  var(--md-mermaid-node-fg-color);
+  --md-mermaid-sequence-actor-line-color:    var(--md-default-fg-color--lighter);
+  --md-mermaid-sequence-actorman-bg-color:   var(--md-mermaid-label-bg-color);
+  --md-mermaid-sequence-actorman-line-color: var(--md-mermaid-node-fg-color);
+  --md-mermaid-sequence-box-bg-color:        var(--md-mermaid-node-bg-color);
+  --md-mermaid-sequence-box-fg-color:        var(--md-mermaid-edge-color);
+  --md-mermaid-sequence-label-bg-color:      var(--md-mermaid-node-bg-color);
+  --md-mermaid-sequence-label-fg-color:      var(--md-mermaid-node-fg-color);
+  --md-mermaid-sequence-loop-bg-color:       var(--md-mermaid-node-bg-color);
+  --md-mermaid-sequence-loop-fg-color:       var(--md-mermaid-edge-color);
+  --md-mermaid-sequence-loop-border-color:   var(--md-mermaid-node-fg-color);
+  --md-mermaid-sequence-message-fg-color:    var(--md-mermaid-edge-color);
+  --md-mermaid-sequence-message-line-color:  var(--md-mermaid-edge-color);
+  --md-mermaid-sequence-note-bg-color:       var(--md-mermaid-label-bg-color);
+  --md-mermaid-sequence-note-fg-color:       var(--md-mermaid-edge-color);
+  --md-mermaid-sequence-note-border-color:   var(--md-mermaid-label-fg-color);
+  --md-mermaid-sequence-number-bg-color:     var(--md-mermaid-node-fg-color);
+  --md-mermaid-sequence-number-fg-color:     var(--md-accent-bg-color);
 }
 
 // ----------------------------------------------------------------------------