Move mixins to separate file, adjust requires

colors.styl

@@ -1,5 +1,9 @@
+// * colors.styl
+
 // ** Solarized colors
+
 // From https://github.com/altercation/solarized
+
 base03 = #002b36
 base02 = #073642
 base01 = #586e75

dark.styl

@@ -1,4 +1,4 @@
-@require "colors"
+@require "main"
 
 // ** Colors
 color-background = base03

light.styl

@@ -1,4 +1,4 @@
-@require "colors"
+@require "main"
 
 // ** Colors
 color-background = base3

main.styl

@@ -0,0 +1,6 @@
+// * main.styl
+
+// Included in every sheet
+
+@require "mixins"
+@require "colors"

mixins.styl

@@ -0,0 +1,29 @@
+// * mixins.styl
+
+// Mixins for use in all sheets
+
+i = !important
+
+a()
+    color blue i
+
+background-color(c = color-background)
+    if c is "highlight"
+        c = color-background-highlight
+    if c is "highlight-extra"
+        c = color-background-highlight-extra
+    background-color c i
+
+bold()
+    font-weight bold i
+
+border-color(args...)
+    if args
+        c = args
+    else
+        c = color-border
+    border-color c i
+
+color(c = color-text)
+    color c i
+

sites/generic.styl

@@ -4,30 +4,6 @@
 
 i = !important
 
-// ** Mixins
-a()
-    color blue i
-
-background-color(c = color-background)
-    if c is "highlight"
-        c = color-background-highlight
-    if c is "highlight-extra"
-        c = color-background-highlight-extra
-    background-color c i
-
-bold()
-    font-weight bold i
-
-border-color(args...)
-    if args
-        c = args
-    else
-        c = color-border
-    border-color c i
-
-color(c = color-text)
-    color c i
-
 // ** HTML elements
 *
     border-color()