Merge pull request #21 from pikinier20/scaladoc/code-snippet-style

Code snippet style

Author: fanixus96

docs/_assets/css/color-brewer.css

@@ -6,14 +6,14 @@ Ported by Fabrício Tavares de Oliveira
 
 */
 
-.hljs {
+/* .hljs {
   background: transparent;
 }
 
 .hljs,
 .hljs-subst {
   color: #000;
-}
+} */
 
 /*.hljs-string,
 .hljs-meta,
@@ -24,7 +24,7 @@ Ported by Fabrício Tavares de Oliveira
   color: #756bb1;
 }*/
 
-.hljs-comment,
+/* .hljs-comment,
 .hljs-quote {
   color: #636363;
 }
@@ -40,7 +40,7 @@ Ported by Fabrício Tavares de Oliveira
 .hljs-deletion,
 .hljs-variable {
   color: #88f;
-}
+} */
 
 /*.hljs-keyword,
 .hljs-selector-tag,
@@ -57,10 +57,10 @@ Ported by Fabrício Tavares de Oliveira
   color: #3182bd;
 }*/
 
-.hljs-emphasis {
+/* .hljs-emphasis {
   font-style: italic;
 }
 
 .hljs-attribute {
   color: #e6550d;
-}
+} */

docs/_layouts/main.html

@@ -6,26 +6,4 @@
   - css/content-contributors.css
 ---
 
-<div id="content-wrapper">
-  {{ content }}
-  <div id="footer" class="body-small mobile-footer">
-    <div class="left-container">"Generated with"</div>
-    <div class="right-container">
-      <a href="https://github.com/lampepfl/dotty">
-        <button class="icon-button gh"></button>
-      </a>
-      <a href="https://twitter.com/scala_lang">
-        <button class="icon-button twitter"></button>
-      </a>
-      <a href="https://discord.com/invite/scala">
-        <button class="icon-button discord"></button>
-      </a>
-      <a href="https://gitter.im/scala/scala">
-        <button class="icon-button gitter"></button>
-      </a>
-      <div class="text">"© 2002-2021 · LAMP/EPFL"</div>
-    </div>
-    <div cls="text-mobile"></div>
-    "© 2002-2021 · LAMP/EPFL"
-  </div>
-</div>
+<div id="content-wrapper">{{ content }}</div>

scaladoc-js/common/css/code-snippets.css

@@ -1,14 +1,14 @@
 /* Snippets */
 
-.snippet {
+/* .snippet {
   position: relative;
   background: var(--code-bg);
   margin: 1em 0px;
   border-radius: 2px;
   box-shadow: 0 0 2px #888;
   cursor: default;
-}
-.snippet-error {
+} */
+/* .snippet-error {
   border-bottom: 2px dotted red;
 }
 .snippet-warn {
@@ -19,17 +19,17 @@
 }
 .snippet-debug {
   border-bottom: 2px dotted pink;
-}
+} */
 
-.snippet .snippet-meta {
+/* .snippet .snippet-meta {
   border-top: 2px solid var(--inactive-bg);
   color: var(--inactive-fg);
   margin-top: 10px;
   padding-top: 10px;
   font-size: 0.75em;
-}
+} */
 
-.snippet-meta .snippet-label {
+/* .snippet-meta .snippet-label {
   font-weight: bold;
 }
 
@@ -319,4 +319,4 @@ input:checked + .slider:before {
       --slider-width: 24px;
       --slider-height: 10px;
   }
-}
+} */

scaladoc-js/common/src/code-snippets/CodeSnippets.scala

@@ -9,6 +9,7 @@ import scala.util.chaining._
 
 import CodeSnippetsGlobals._
 
+
 class CodeSnippets:
   lazy val scastieConfig = getScastieConfiguration
 
@@ -38,12 +39,10 @@ class CodeSnippets:
       case _ =>
     }
     def createShowHideButton(toggleRoot: html.Element) = {
-      div(cls := "snippet-showhide")(
+      div(cls := "snippet-showhide-container")(
         label(cls := "snippet-showhide-button")(
-          input("type" := "checkbox").tap(_.addEventListener("change", _ => toggleHide(toggleRoot))),
-          span(cls := "slider")
+          input("type" := "checkbox", cls := "snippet-showhide").tap(_.addEventListener("change", _ => toggleHide(toggleRoot))),
         ),
-        p("Show collapsed lines")
       )
     }
 
@@ -88,11 +87,14 @@ class CodeSnippets:
   }
 
   private def copyRunButtons(snippet: html.Element) = {
+    val copyButtonIcon = s"""<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2.5 2.5V9.5H4V11H2C1.44772 11 1 10.5523 1 10V2C1 1.44772 1.44772 1 2 1H10C10.5523 1 11 1.44772 11 2V4H9.5V2.5H2.5Z" fill="#A09FA6"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5 6C5 5.44772 5.44772 5 6 5H14C14.5523 5 15 5.44772 15 6V14C15 14.5523 14.5523 15 14 15H6C5.44772 15 5 14.5523 5 14V6ZM6.5 13.5V6.5H13.5V13.5H6.5Z" fill="#A09FA6"/>
+</svg>
+ """
     def copyButton = {
       div(
-        button(cls := "copy-button")(
-          i(cls := "far fa-clone")
-        ).tap(_.addEventListener("click", _ => {
+        button(cls := "copy-button icon-button").tap(_.addEventListener("click", _ => {
           val code = snippet.querySelectorAll("code>span:not(.hidden)")
             .map(_.textContent)
             .mkString
@@ -104,7 +106,6 @@ class CodeSnippets:
       val runButton = button(cls := "run-button")(
         i(cls := "fas fa-play")
       )
-
       runButton.addEventListener("click", _ =>
         if !runButton.hasAttribute("opened") then {
           scastie.Embedded(snippet.querySelector("pre"), scastieConfig)