From 4ae81799c3b6ae04f4caf75557cafebdbb03f19c Mon Sep 17 00:00:00 2001
From: Paul Adam Davis <pauladamdavis@gmail.com>
Date: Fri, 24 Oct 2014 15:12:22 +0100
Subject: [PATCH] File structure cleanup

---
 .../sass/{helpers => modules}/animations.scss | 57 ++++++++++---------
 .../sass/{helpers => modules}/icons.scss      |  0
 .../sass/{helpers => modules}/mixins.scss     |  0
 .../sass/{helpers => modules}/variables.scss  |  0
 core/client/assets/sass/screen.scss           | 20 +++----
 .../sass/{lib => vendor}/codemirror.scss      |  0
 .../sass/{lib => vendor}/nanoscroller.scss    |  0
 .../sass/{lib => vendor}/nprogress.scss       |  0
 8 files changed, 40 insertions(+), 37 deletions(-)
 rename core/client/assets/sass/{helpers => modules}/animations.scss (76%)
 rename core/client/assets/sass/{helpers => modules}/icons.scss (100%)
 rename core/client/assets/sass/{helpers => modules}/mixins.scss (100%)
 rename core/client/assets/sass/{helpers => modules}/variables.scss (100%)
 rename core/client/assets/sass/{lib => vendor}/codemirror.scss (100%)
 rename core/client/assets/sass/{lib => vendor}/nanoscroller.scss (100%)
 rename core/client/assets/sass/{lib => vendor}/nprogress.scss (100%)

diff --git a/core/client/assets/sass/helpers/animations.scss b/core/client/assets/sass/modules/animations.scss
similarity index 76%
rename from core/client/assets/sass/helpers/animations.scss
rename to core/client/assets/sass/modules/animations.scss
index fd1749862d..e8cd498e14 100755
--- a/core/client/assets/sass/helpers/animations.scss
+++ b/core/client/assets/sass/modules/animations.scss
@@ -1,5 +1,14 @@
+// ------------------------------------------------------------
+// Animations
 //
-// Fade in
+// Keyframe animations used through Ghost
+//
+// * Define animations
+// * Classed to use these animations
+// ------------------------------------------------------------
+
+//
+// Define animations
 // --------------------------------------------------
 
 @keyframes fade-in {
@@ -10,10 +19,6 @@
         opacity: 1;
     }
 }
-.fade-in {
-    animation: fade-in 0.2s;
-    animation-fill-mode: forwards;
-}
 
 @keyframes fade-in-snap {
     to {
@@ -21,10 +26,6 @@
     }
 }
 
-
-//
-// Fade in scale up
-// --------------------------------------------------
 @keyframes fade-in-scale {
     from {
         transform: scale(0.8);
@@ -35,15 +36,6 @@
         opacity: 1;
     }
 }
-.fade-in-scale {
-    animation: fade-in-scale 0.2s;
-    animation-fill-mode: forwards;
-}
-
-
-//
-// Fade out
-// --------------------------------------------------
 
 @keyframes fade-out {
     from {
@@ -53,15 +45,6 @@
         opacity: 0;
     }
 }
-.fade-out {
-    animation: fade-out 0.5s;
-    animation-fill-mode: forwards;
-}
-
-
-//
-// Fade out inset box shadow for content page keyboard focus
-// --------------------------------------------------
 
 @keyframes keyboard-focus-style-fade-out {
     from {
@@ -70,4 +53,24 @@
     to {
         box-shadow: none;
     }
+}
+
+
+//
+// Classed to use these animations
+// --------------------------------------------------
+
+.fade-in {
+    animation: fade-in 0.2s;
+    animation-fill-mode: forwards;
+}
+
+.fade-in-scale {
+    animation: fade-in-scale 0.2s;
+    animation-fill-mode: forwards;
+}
+
+.fade-out {
+    animation: fade-out 0.5s;
+    animation-fill-mode: forwards;
 }
\ No newline at end of file
diff --git a/core/client/assets/sass/helpers/icons.scss b/core/client/assets/sass/modules/icons.scss
similarity index 100%
rename from core/client/assets/sass/helpers/icons.scss
rename to core/client/assets/sass/modules/icons.scss
diff --git a/core/client/assets/sass/helpers/mixins.scss b/core/client/assets/sass/modules/mixins.scss
similarity index 100%
rename from core/client/assets/sass/helpers/mixins.scss
rename to core/client/assets/sass/modules/mixins.scss
diff --git a/core/client/assets/sass/helpers/variables.scss b/core/client/assets/sass/modules/variables.scss
similarity index 100%
rename from core/client/assets/sass/helpers/variables.scss
rename to core/client/assets/sass/modules/variables.scss
diff --git a/core/client/assets/sass/screen.scss b/core/client/assets/sass/screen.scss
index c1dac66988..cab7ce5188 100644
--- a/core/client/assets/sass/screen.scss
+++ b/core/client/assets/sass/screen.scss
@@ -1,25 +1,25 @@
 //
-// Helpers: Sass Utilities
+// Modules: Mixins, variables, and utilities
 // --------------------------------------------------
 
-@import "helpers/variables";
-@import "helpers/mixins";
-@import "helpers/icons";
-@import "helpers/animations";
+@import "modules/variables";
+@import "modules/mixins";
+@import "modules/icons";
+@import "modules/animations";
 
 
 //
-// Libraries: Code by Other Homies
+// Libraries: Code by other Homies
 // --------------------------------------------------
 
 @import "../../../../bower_components/normalize-scss/_normalize"; // via Bower
-@import "lib/nprogress";
-@import "lib/codemirror";
-@import "lib/nanoscroller";
+@import "vendor/nprogress";
+@import "vendor/codemirror";
+@import "vendor/nanoscroller";
 
 
 //
-// Patterns: Groups of Styles
+// Patterns: Groups of styles
 // --------------------------------------------------
 
 @import "patterns/global";
diff --git a/core/client/assets/sass/lib/codemirror.scss b/core/client/assets/sass/vendor/codemirror.scss
similarity index 100%
rename from core/client/assets/sass/lib/codemirror.scss
rename to core/client/assets/sass/vendor/codemirror.scss
diff --git a/core/client/assets/sass/lib/nanoscroller.scss b/core/client/assets/sass/vendor/nanoscroller.scss
similarity index 100%
rename from core/client/assets/sass/lib/nanoscroller.scss
rename to core/client/assets/sass/vendor/nanoscroller.scss
diff --git a/core/client/assets/sass/lib/nprogress.scss b/core/client/assets/sass/vendor/nprogress.scss
similarity index 100%
rename from core/client/assets/sass/lib/nprogress.scss
rename to core/client/assets/sass/vendor/nprogress.scss