Skip to content

Commit

Permalink
feat(style): merge into
Browse files Browse the repository at this point in the history
  • Loading branch information
sparanoid committed May 16, 2016
1 parent 5ad4095 commit de33477
Show file tree
Hide file tree
Showing 4 changed files with 62 additions and 64 deletions.
6 changes: 6 additions & 0 deletions _app/assets/_less/user.less
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion _app/assets/themes/curtana/_less/app.less
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

// Core components
@import "variables";
@import "colors";
@import "mixins";
@import "reset";
@import "common";
Expand Down
58 changes: 0 additions & 58 deletions _app/assets/themes/curtana/_less/colors.less

This file was deleted.

61 changes: 56 additions & 5 deletions _app/assets/themes/curtana/_less/variables.less
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// Variables
// --------------------------------------------------

// Typography
@fontstack-sans-serif: "Helvetica Neue", Arial, sans-serif;
@fontstack-serif: Georgia, serif;
@fontstack-monospace: Menlo, Consolas, monospace;
Expand All @@ -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;
Expand All @@ -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;

0 comments on commit de33477

Please sign in to comment.