From ee1c8ccf53cc1acf3d3068a7f536a7b8de38dc3e Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Thu, 6 Dec 2018 22:24:05 +0000
Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20put=20folder=20icon=20on=20temp?=
 =?UTF-8?q?lates=20=E2=80=98folder=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

After showing this to a few people the consensus seems to be that
‘Templates’ isn’t itself a folder. Therefore it shouldn’t have a folder
icon.

This has the advantage of disambiguating between being in a folder:
> [screenshot]

…and being in a subfolder:
> [screenshot]
---
 app/assets/images/folder-black.png            | Bin 266 -> 0 bytes
 app/assets/images/folder-black.svg            |   1 -
 .../stylesheets/components/message.scss       |  27 ++++--------------
 app/templates/components/folder-path.html     |   2 +-
 4 files changed, 7 insertions(+), 23 deletions(-)
 delete mode 100644 app/assets/images/folder-black.png
 delete mode 100644 app/assets/images/folder-black.svg

diff --git a/app/assets/images/folder-black.png b/app/assets/images/folder-black.png
deleted file mode 100644
index 6f29a028684bd9c5d5b461d2700b9850e409b286..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 266
zcmeAS@N?(olHy`uVBq!ia0vp^YCtT@!3HFcHOL(RQjEnx?oNz1PwLbIISR=hLB0$O
zRX|k@Ees65fI<x~7#K<o7#Ln9FfdrnU|<k0n6oR;1}MQ<;1OBOz`!jG!i)^F=12eq
zn>}3|Ln2z=Uf#&tpdiwc$hKg^(scGajWZ$yj~B?yJTz@bi*&}ECz4iD!iSrmh=%|9
z8-7P~t*POxPLHo1hKajFBJy7F?SA(>{MZbkZC#DN_oi<M=F!R9_?vT8f@QXD`Rw@{
z6TCT$5;bK_tgf#~+i;DMO(LNILa0fosUFBm&}VnpW5e}vyB^Rv44$rjF6*2UngFjO
BRXG3v

diff --git a/app/assets/images/folder-black.svg b/app/assets/images/folder-black.svg
deleted file mode 100644
index b621fb099..000000000
--- a/app/assets/images/folder-black.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="26" height="20" viewBox="0 0 26 20"><path d="M10.3 0H0v20h26V4H12l-1.5-4h-.2z" fill="#dee0e2"/><path d="M9.1 2l1 2.7.5 1.3H24v12H2V2h7.1m1.4-2H0v20h26V4H12l-1.5-4z" fill="#0b0c0c"/></svg>
diff --git a/app/assets/stylesheets/components/message.scss b/app/assets/stylesheets/components/message.scss
index ef867af2b..c4833d8dc 100644
--- a/app/assets/stylesheets/components/message.scss
+++ b/app/assets/stylesheets/components/message.scss
@@ -121,12 +121,13 @@
   white-space: nowrap;
 
 
-  a:first-child,
-  &-folder {
+  a,
+  &-folder,
+  &-subfolder {
 
     display: inline-block;
     vertical-align: top;
-    padding: 5px 0 0 60px;
+    padding: 5px 0 0 0;
     background-repeat: no-repeat;
     background-size: 38px auto;
     background-position: 0 1px;
@@ -139,8 +140,9 @@
     display: inline-block;
     vertical-align: top;
 
-    &:first-child {
+    &.folder-heading-folder {
 
+      padding: 5px 0 0 60px;
       background-image: file-url('folder-blue.svg');
       max-width: 33%;
       overflow: hidden;
@@ -154,23 +156,6 @@
 
   }
 
-  &-folder {
-
-    padding-left: 0;
-
-    &:first-child {
-
-      background-image: file-url('folder-black.svg');
-      padding-left: $gutter * 2;
-
-      @include ie-lte(8) {
-        background-image: file-url('folder-black.png');
-      }
-
-    }
-
-  }
-
   &-separator {
 
     display: inline-block;
diff --git a/app/templates/components/folder-path.html b/app/templates/components/folder-path.html
index d342465b5..bfcadd3bc 100644
--- a/app/templates/components/folder-path.html
+++ b/app/templates/components/folder-path.html
@@ -17,7 +17,7 @@
           <span class="folder-heading-folder">{{ folder.name }}</span>
         {% else %}
           {% if folder.id %}
-            <a href="{{ url_for('.choose_template', service_id=service_id, template_type=template_type, template_folder_id=folder.id) }}">{{ folder.name }}</a> {% if not loop.last %}{{ folder_path_separator() }}{% endif %}
+            <a href="{{ url_for('.choose_template', service_id=service_id, template_type=template_type, template_folder_id=folder.id) }}" class="folder-heading-folder">{{ folder.name }}</a> {% if not loop.last %}{{ folder_path_separator() }}{% endif %}
           {% else %}
             <a href="{{ url_for('.choose_template', service_id=service_id, template_type=template_type) }}">Templates</a> {% if not loop.last %}{{ folder_path_separator() }}{% endif %}
           {% endif %}