From 24a49ac7789f7196171f19ad29d8ea57f12a5844 Mon Sep 17 00:00:00 2001
From: Florens Verschelde <fverschelde@kaliop.com>
Date: Mon, 26 Sep 2016 18:57:04 +0200
Subject: [PATCH] Tweak CSS, put all assets in Resources/public

---
 Resources/public/{ => css}/styles.css         | 22 ++++++++-----------
 .../js}/build-instructions.md                 |  0
 .../{assets => public/js}/highlight-main.js   |  0
 .../{assets => public/js}/highlight-twig.js   |  0
 .../{assets => public/js}/highlight.min.js    |  0
 Resources/public/{ => svg}/sprite.svg         |  0
 Resources/views/dir.html.twig                 |  2 +-
 Resources/views/page.html.twig                |  6 ++---
 8 files changed, 13 insertions(+), 17 deletions(-)
 rename Resources/public/{ => css}/styles.css (98%)
 rename Resources/{assets => public/js}/build-instructions.md (100%)
 rename Resources/{assets => public/js}/highlight-main.js (100%)
 rename Resources/{assets => public/js}/highlight-twig.js (100%)
 rename Resources/{assets => public/js}/highlight.min.js (100%)
 rename Resources/public/{ => svg}/sprite.svg (100%)

diff --git a/Resources/public/styles.css b/Resources/public/css/styles.css
similarity index 98%
rename from Resources/public/styles.css
rename to Resources/public/css/styles.css
index 8d98b4a..2d3282c 100644
--- a/Resources/public/styles.css
+++ b/Resources/public/css/styles.css
@@ -182,14 +182,17 @@ footer {
 /* List of files or folders */
 
 .Links {
-    margin: 1.5em 0 .5em;
+    margin: 1.25em 0 .5em;
     padding: 0;
     list-style: none;
     line-height: 1.3;
 }
 
 @media (min-width: 900px) {
-    .Links--files {
+    .Links:not(.Links--cols) {
+        width: calc(50% - .375em);
+    }
+    .Links--cols {
         -webkit-column-count: 2;
         -moz-column-count: 2;
         column-count: 2;
@@ -197,10 +200,7 @@ footer {
         -moz-column-gap: .75em;
         column-gap: .75em;
     }
-    .Links--folders {
-        width: calc(50% - .375em);
-    }
-    .Links--files li {
+    .Links--cols li {
         -webkit-column-break-inside: avoid;
         page-break-inside: avoid;
         break-inside: avoid;
@@ -284,23 +284,19 @@ pre mark {
 
 .Code {
     position: relative;
+    overflow: hidden;
     margin: -1rem;
     margin: calc(var(--pad) * -1);
     margin-top: 1rem;
     padding: 1rem;
     padding: calc(var(--pad) * .85) var(--pad);
+    white-space: pre-wrap;
+    font-family: inherit;
     line-height: 1.5;
     color: var(--base-gray);
     background: var(--black);
 }
 
-.Code > pre {
-    overflow: hidden;
-    margin: 0;
-    white-space: pre-wrap;
-    font-family: inherit;
-}
-
 .Code--mark code > :not(mark),
 .Code--mark mark > :not([class*="hljs-template-"]) {
     filter: saturate(0%);
diff --git a/Resources/assets/build-instructions.md b/Resources/public/js/build-instructions.md
similarity index 100%
rename from Resources/assets/build-instructions.md
rename to Resources/public/js/build-instructions.md
diff --git a/Resources/assets/highlight-main.js b/Resources/public/js/highlight-main.js
similarity index 100%
rename from Resources/assets/highlight-main.js
rename to Resources/public/js/highlight-main.js
diff --git a/Resources/assets/highlight-twig.js b/Resources/public/js/highlight-twig.js
similarity index 100%
rename from Resources/assets/highlight-twig.js
rename to Resources/public/js/highlight-twig.js
diff --git a/Resources/assets/highlight.min.js b/Resources/public/js/highlight.min.js
similarity index 100%
rename from Resources/assets/highlight.min.js
rename to Resources/public/js/highlight.min.js
diff --git a/Resources/public/sprite.svg b/Resources/public/svg/sprite.svg
similarity index 100%
rename from Resources/public/sprite.svg
rename to Resources/public/svg/sprite.svg
diff --git a/Resources/views/dir.html.twig b/Resources/views/dir.html.twig
index 1592a6f..76e9d31 100755
--- a/Resources/views/dir.html.twig
+++ b/Resources/views/dir.html.twig
@@ -19,7 +19,7 @@
         </ul>
     {% endif %}
     {% if fileList|length > 0 %}
-        <ul class="Links Links--files">
+        <ul class="Links Links--files{% if fileList|length > 3 %} Links--cols{% endif %}">
         {% for file in fileList %}
             <li><a href="{{ file }}">{{ icon.file|raw }}{{
                 file|replace({'.html':'<span>.html</span>'}) | raw
diff --git a/Resources/views/page.html.twig b/Resources/views/page.html.twig
index 442f913..ca75100 100644
--- a/Resources/views/page.html.twig
+++ b/Resources/views/page.html.twig
@@ -22,12 +22,12 @@
     <title>{{ metaTitle }}</title>
     {% endif %}
     <style>
-        {{- source('@GradientzTwigExpressBundle/Resources/public/styles.css')|raw -}}
+        {{- source('@GradientzTwigExpressBundle/Resources/public/css/styles.css')|raw -}}
     </style>
 </head>
 <body>
 
-{{ source('@GradientzTwigExpressBundle/Resources/public/sprite.svg')|raw }}
+{{ source('@GradientzTwigExpressBundle/Resources/public/svg/sprite.svg')|raw }}
 
 <header>
 {% if showCrumbs %}
@@ -73,7 +73,7 @@
 {% if codeLang|default('') %}
 window.twigSubLanguage = '{{ codeLang }}';
 {% endif %}
-{{ source('@GradientzTwigExpressBundle/Resources/assets/highlight.min.js')
+{{ source('@GradientzTwigExpressBundle/Resources/public/js/highlight.min.js')
    |replace({'</script': '<\\/script'})
    |raw }};hljs.initHighlighting();
 </script>