From de334777b3b1758677f344bd697673fb741a70dd Mon Sep 17 00:00:00 2001
From: Tunghsiao Liu <t@sparanoid.com>
Date: Mon, 16 May 2016 16:21:10 +0800
Subject: [PATCH] feat(style): merge  into

---
 _app/assets/_less/user.less                   |  6 ++
 _app/assets/themes/curtana/_less/app.less     |  1 -
 _app/assets/themes/curtana/_less/colors.less  | 58 ------------------
 .../themes/curtana/_less/variables.less       | 61 +++++++++++++++++--
 4 files changed, 62 insertions(+), 64 deletions(-)
 delete mode 100644 _app/assets/themes/curtana/_less/colors.less

diff --git a/_app/assets/_less/user.less b/_app/assets/_less/user.less
index af9904538..ae88d28cf 100644
--- a/_app/assets/_less/user.less
+++ b/_app/assets/_less/user.less
@@ -12,6 +12,12 @@
 }
 
 // amsf.github.io custom variables
+// EXAMPLE: alternative title color switch
+// Uncomment the following style will enalbe alternative post title color,
+// this is useful when you're using the custom color scheme.
+// .content { .list h2 a, header h1, header h1 a { color: @link-color; } }
+// .external span { background: @link-color; }
+
 @fontstack-sans-serif: "Helvetica Neue", "Hiragino Sans GB", Arial, sans-serif;
 @fontstack-serif: Georgia, "Hiragino Mincho ProN", serif;
 @link-color: #ff00b4;
diff --git a/_app/assets/themes/curtana/_less/app.less b/_app/assets/themes/curtana/_less/app.less
index 0ca5a35f5..cc044c6e8 100644
--- a/_app/assets/themes/curtana/_less/app.less
+++ b/_app/assets/themes/curtana/_less/app.less
@@ -4,7 +4,6 @@
 
 // Core components
 @import "variables";
-@import "colors";
 @import "mixins";
 @import "reset";
 @import "common";
diff --git a/_app/assets/themes/curtana/_less/colors.less b/_app/assets/themes/curtana/_less/colors.less
deleted file mode 100644
index a0affcd7d..000000000
--- a/_app/assets/themes/curtana/_less/colors.less
+++ /dev/null
@@ -1,58 +0,0 @@
-//
-// Colors
-// --------------------------------------------------
-
-// Custom color schemes
-// Change @link-color can change to whole theme color scheme
-// All other vaiables in `variables.less` can be overwritten here
-
-// tan #D2B48C rgb(210,180,140)
-// @link-color: darken(@background-color, 50%);
-// @background-color: tan;
-// @text-color: darken(@background-color, 30%);
-
-// mediumvioletred #C71585 rgb(199,21,133)
-// @link-color: mediumvioletred;
-// @background-color: #fff;
-// @text-color: #000;
-
-// orangered #FF4500 rgb(255,69,0)
-// @link-color: orangered;
-// @background-color: #fff;
-// @text-color: #000;
-
-// indigo (invert) #4B0082 rgb(75,0,130)
-// @link-color: #fff;
-// @background-color: indigo;
-// @text-color: lighten(@background-color, 60%);
-
-// indigo #4B0082 rgb(75,0,130)
-// @link-color: indigo;
-// @background-color: #fff;
-// @text-color: #000;
-
-// limegreen #32CD32 rgb(rgb(50,205,50))
-// @link-color: limegreen;
-// @background-color: #fff;
-// @text-color: darken(@link-color, 30%);
-
-// yellow #FFFF00 rgb(255,255,0)
-// @link-color: #000;
-// @background-color: yellow;
-// @text-color: darken(@background-color, 40%);
-
-// paleturquoise #AFEEEE rgb(175,238,238)
-// @link-color: darken(@background-color, 60%);
-// @background-color: paleturquoise;
-// @text-color: darken(@background-color, 50%);
-
-// crimson #DC143C rgb(220,20,60) × gold #FFD700 rgb(255,215,0)
-// @link-color: crimson;
-// @background-color: gold;
-// @text-color: #000;
-
-// Alternative title color switch
-// Uncomment the following style will enalbe alternative post title color,
-// this is useful when you're using the custom theme from above.
-// .content { .list h2 a, header h1, header h1 a { color: @link-color; } }
-// .external span { background: @link-color; }
diff --git a/_app/assets/themes/curtana/_less/variables.less b/_app/assets/themes/curtana/_less/variables.less
index 1c7a4acc4..aad8d51c7 100644
--- a/_app/assets/themes/curtana/_less/variables.less
+++ b/_app/assets/themes/curtana/_less/variables.less
@@ -2,6 +2,7 @@
 // Variables
 // --------------------------------------------------
 
+// Typography
 @fontstack-sans-serif: "Helvetica Neue", Arial, sans-serif;
 @fontstack-serif: Georgia, serif;
 @fontstack-monospace: Menlo, Consolas, monospace;
@@ -10,11 +11,7 @@
 @line-height: (20 / 14); // ~ 1.428571429
 @heading-letter-spacing: -.06em;
 
-@link-color: #a212d1;
-@background-color: #fff;
-@text-color: #000;
-@code-color: #00cc80;
-
+// Layout
 @breakpoint-lg: 1600px;
 @breakpoint-md: 1080px;
 @breakpoint-sm: 640px;
@@ -31,3 +28,57 @@
 @border-md: 2px;
 @border-sm: 1px;
 @border-default: @border-md;
+
+// Colors
+@link-color: #a212d1;
+@background-color: #fff;
+@text-color: #000;
+@code-color: #00cc80;
+
+// EXAMPLE: custom color schemes
+// Change @link-color could change the whole theme color scheme
+
+// tan #D2B48C rgb(210,180,140)
+// @link-color: darken(@background-color, 50%);
+// @background-color: tan;
+// @text-color: darken(@background-color, 30%);
+
+// mediumvioletred #C71585 rgb(199,21,133)
+// @link-color: mediumvioletred;
+// @background-color: #fff;
+// @text-color: #000;
+
+// orangered #FF4500 rgb(255,69,0)
+// @link-color: orangered;
+// @background-color: #fff;
+// @text-color: #000;
+
+// indigo (invert) #4B0082 rgb(75,0,130)
+// @link-color: #fff;
+// @background-color: indigo;
+// @text-color: lighten(@background-color, 60%);
+
+// indigo #4B0082 rgb(75,0,130)
+// @link-color: indigo;
+// @background-color: #fff;
+// @text-color: #000;
+
+// limegreen #32CD32 rgb(rgb(50,205,50))
+// @link-color: limegreen;
+// @background-color: #fff;
+// @text-color: darken(@link-color, 30%);
+
+// yellow #FFFF00 rgb(255,255,0)
+// @link-color: #000;
+// @background-color: yellow;
+// @text-color: darken(@background-color, 40%);
+
+// paleturquoise #AFEEEE rgb(175,238,238)
+// @link-color: darken(@background-color, 60%);
+// @background-color: paleturquoise;
+// @text-color: darken(@background-color, 50%);
+
+// crimson #DC143C rgb(220,20,60) × gold #FFD700 rgb(255,215,0)
+// @link-color: crimson;
+// @background-color: gold;
+// @text-color: #000;