aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--_scss/base/_highlight.scss29
-rw-r--r--_scss/base/_sakura.scss8
-rw-r--r--_scss/highlight/_main.scss415
-rw-r--r--_scss/sakura/_main.scss2
4 files changed, 223 insertions, 231 deletions
diff --git a/_scss/base/_highlight.scss b/_scss/base/_highlight.scss
index 31c1ad4..c801d16 100644
--- a/_scss/base/_highlight.scss
+++ b/_scss/base/_highlight.scss
@@ -1,13 +1,20 @@
-$color-01: #1d1f21;
-$color-02: #373b41;
-$color-03: #81a2be;
-$color-04: #8abeb7;
-$color-05: #969896;
-$color-06: #b294bb;
-$color-07: #b5bd68;
-$color-08: #c5c8c6;
-$color-09: #c66;
-$color-10: #de935f;
-$color-11: #f0c674;
+$color00: #000000;
+$color01: #000080;
+$color02: #0000FF;
+$color03: #008080;
+$color04: #008800;
+$color05: #555555;
+$color06: #800080;
+$color07: #888888;
+$color08: #999999;
+$color09: #a61717;
+$color10: #aa0000;
+$color11: #aaaaaa;
+$color12: #bbbbbb;
+$color13: #ddffdd;
+$color14: #e3d2d2;
+$color15: #FF0000;
+$color16: #ffdddd;
+$color17: #ffffcc;
@import 'highlight/main';
diff --git a/_scss/base/_sakura.scss b/_scss/base/_sakura.scss
index b615035..e35d59b 100644
--- a/_scss/base/_sakura.scss
+++ b/_scss/base/_sakura.scss
@@ -1,8 +1,8 @@
$color-bg-alt: rgba(0, 0, 0, .09);
-$color-bg: #fff;
-$color-blossom: #007ea7;
-$color-fade: #003459;
-$color-text: #00171f;
+$color-bg: rgba(235, 237, 236, 1);
+$color-blossom: rgba(76, 88, 112, 1);
+$color-fade: rgba(162, 169, 175, 1);
+$color-text: rgba(61, 61, 59, 1);
$font-family-sans-serif: '-apple-system', BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', 'Arial', sans-serif;
$font-size-base: 1.6rem;
diff --git a/_scss/highlight/_main.scss b/_scss/highlight/_main.scss
index a41e98d..f8ee252 100644
--- a/_scss/highlight/_main.scss
+++ b/_scss/highlight/_main.scss
@@ -1,217 +1,200 @@
-$color01: #000;
-$color02: #000080;
-$color03: #00f;
-$color04: #008080;
-$color05: #080;
-$color06: #555;
-$color07: #800080;
-$color08: #888;
-$color09: #999;
-$color10: #a61717;
-$color11: #a00;
-$color12: #aaa;
-$color13: #bbb;
-$color14: #dfd;
-$color15: #e3d2d2;
-$color16: #f00;
-$color17: #fdd;
-$color18: #ffc;
-
-.highlight .hll {
- background-color: $color18;
-}
-
-.highlight .c {
- color: $color05;
- font-style: italic;
-}
-
-.highlight .err {
- background-color: $color15;
- color: $color10;
-}
-
-.highlight .k {
- color: $color02;
- font-weight: bold;
-}
-
-.highlight .cm {
- color: $color05;
- font-style: italic;
-}
-
-.highlight .cp {
- color: $color04;
-}
-
-.highlight .c1 {
- color: $color05;
- font-style: italic;
-}
-
-.highlight .cs {
- color: $color05;
- font-weight: bold;
-}
-
-.highlight .gd {
- background-color: $color17;
- color: $color01;
-}
-
-.highlight .ge {
- font-style: italic;
-}
-
-.highlight .gr {
- color: $color11;
-}
-
-.highlight .gh {
- color: $color09;
-}
-
-.highlight .gi {
- background-color: $color14;
- color: $color01;
-}
-
-.highlight .go {
- color: $color08;
-}
-
-.highlight .gp {
- color: $color06;
-}
-
-.highlight .gs {
- font-weight: bold;
-}
-
-.highlight .gu {
- color: $color12;
-}
-
-.highlight .gt {
- color: $color11;
-}
-
-.highlight .kc {
- color: $color02;
- font-weight: bold;
-}
-
-.highlight .kd {
- color: $color02;
- font-weight: bold;
-}
-
-.highlight .kn {
- color: $color02;
- font-weight: bold;
-}
-
-.highlight .kp {
- color: $color02;
- font-weight: bold;
-}
-
-.highlight .kr {
- color: $color02;
- font-weight: bold;
-}
-
-.highlight .kt {
- color: $color02;
- font-weight: bold;
-}
-
-.highlight .m {
- color: $color03;
-}
-
-.highlight .s {
- color: $color03;
-}
-
-.highlight .na {
- color: $color16;
-}
-
-.highlight .nt {
- color: $color02;
- font-weight: bold;
-}
-
-.highlight .ow {
- font-weight: bold;
-}
-
-.highlight .w {
- color: $color13;
-}
-
-.highlight .mf {
- color: $color03;
-}
-
-.highlight .mh {
- color: $color03;
-}
-
-.highlight .mi {
- color: $color03;
-}
-
-.highlight .mo {
- color: $color03;
-}
-
-.highlight .sb {
- color: $color03;
-}
-
-.highlight .sc {
- color: $color07;
-}
-
-.highlight .sd {
- color: $color03;
-}
-
-.highlight .s2 {
- color: $color03;
-}
-
-.highlight .se {
- color: $color03;
-}
-
-.highlight .sh {
- color: $color03;
-}
-
-.highlight .si {
- color: $color03;
-}
-
-.highlight .sx {
- color: $color03;
-}
-
-.highlight .sr {
- color: $color03;
-}
-
-.highlight .s1 {
- color: $color03;
-}
-
-.highlight .ss {
- color: $color03;
-}
-
-.highlight .il {
- color: $color03;
+.highlight {
+ .c {
+ color: $color04;
+ font-style: italic;
+ }
+
+ .c1 {
+ color: $color04;
+ font-style: italic;
+ }
+
+ .cm {
+ color: $color04;
+ font-style: italic;
+ }
+
+ .cp {
+ color: $color03;
+ }
+
+ .cs {
+ color: $color04;
+ font-weight: bold;
+ }
+
+ .err {
+ background-color: $color14;
+ color: $color09;
+ }
+
+ .gd {
+ background-color: $color16;
+ color: $color00;
+ }
+
+ .ge {
+ font-style: italic;
+ }
+
+ .gh {
+ color: $color08;
+ }
+
+ .gi {
+ background-color: $color13;
+ color: $color00;
+ }
+
+ .go {
+ color: $color07;
+ }
+
+ .gp {
+ color: $color05;
+ }
+
+ .gr {
+ color: $color10;
+ }
+
+ .gs {
+ font-weight: bold;
+ }
+
+ .gt {
+ color: $color10;
+ }
+
+ .gu {
+ color: $color11;
+ }
+
+ .hll {
+ background-color: $color17;
+ }
+
+ .il {
+ color: $color02;
+ }
+
+ .k {
+ color: $color01;
+ font-weight: bold;
+ }
+
+ .kc {
+ color: $color01;
+ font-weight: bold;
+ }
+
+ .kd {
+ color: $color01;
+ font-weight: bold;
+ }
+
+ .kn {
+ color: $color01;
+ font-weight: bold;
+ }
+
+ .kp {
+ color: $color01;
+ font-weight: bold;
+ }
+
+ .kr {
+ color: $color01;
+ font-weight: bold;
+ }
+
+ .kt {
+ color: $color01;
+ font-weight: bold;
+ }
+
+ .m {
+ color: $color02;
+ }
+
+ .mf {
+ color: $color02;
+ }
+
+ .mh {
+ color: $color02;
+ }
+
+ .mi {
+ color: $color02;
+ }
+
+ .mo {
+ color: $color02;
+ }
+
+ .na {
+ color: $color15;
+ }
+
+ .nt {
+ color: $color01;
+ font-weight: bold;
+ }
+
+ .ow {
+ font-weight: bold;
+ }
+
+ .s {
+ color: $color02;
+ }
+
+ .s1 {
+ color: $color02;
+ }
+
+ .s2 {
+ color: $color02;
+ }
+
+ .sb {
+ color: $color02;
+ }
+
+ .sc {
+ color: $color06;
+ }
+
+ .sd {
+ color: $color02;
+ }
+
+ .se {
+ color: $color02;
+ }
+
+ .sh {
+ color: $color02;
+ }
+
+ .si {
+ color: $color02;
+ }
+
+ .sr {
+ color: $color02;
+ }
+
+ .ss {
+ color: $color02;
+ }
+
+ .sx {
+ color: $color02;
+ }
+
+ .w {
+ color: $color12;
+ }
}
diff --git a/_scss/sakura/_main.scss b/_scss/sakura/_main.scss
index 0c4dcf7..2bde68b 100644
--- a/_scss/sakura/_main.scss
+++ b/_scss/sakura/_main.scss
@@ -111,6 +111,7 @@ img {
pre {
background-color: $color-bg-alt;
+ border-radius: 4px;
display: block;
overflow-x: auto;
padding: 1em;
@@ -118,6 +119,7 @@ pre {
code {
background-color: $color-bg-alt;
+ border-radius: 4px;
font-size: .9em;
padding: 0 .5em;
white-space: pre-wrap;