diff options
Diffstat (limited to '_scss')
| -rw-r--r-- | _scss/base/_fonts.scss | 9 | ||||
| -rw-r--r-- | _scss/base/_highlight.scss | 20 | ||||
| -rw-r--r-- | _scss/base/_main.scss | 2 | ||||
| -rw-r--r-- | _scss/base/_sakura.scss | 14 | ||||
| -rw-r--r-- | _scss/components/_avatar.scss | 9 | ||||
| -rw-r--r-- | _scss/components/_core.scss | 38 | ||||
| -rw-r--r-- | _scss/components/_header.scss | 9 | ||||
| -rw-r--r-- | _scss/highlight/_main.scss | 207 | ||||
| -rw-r--r-- | _scss/normalize/_main.scss | 30 | ||||
| -rw-r--r-- | _scss/sakura/_main.scss | 35 | ||||
| -rw-r--r-- | _scss/utilities/_textsizeadjust.scss | 7 | 
11 files changed, 70 insertions, 310 deletions
| diff --git a/_scss/base/_fonts.scss b/_scss/base/_fonts.scss new file mode 100644 index 0000000..ad6d38e --- /dev/null +++ b/_scss/base/_fonts.scss @@ -0,0 +1,9 @@ +@font-face { +  font-display: swap; +  font-family: 'Open Sans'; +  font-style: normal; +  font-weight: normal; +  src: url('/assets/fonts/open-sans/open-sans-regular.ttf') format('truetype'), +       url('/assets/fonts/open-sans/open-sans-regular.woff') format('woff'), +       url('/assets/fonts/open-sans/open-sans-regular.woff2') format('woff2'); +} diff --git a/_scss/base/_highlight.scss b/_scss/base/_highlight.scss index d7754cf..c3cf783 100644 --- a/_scss/base/_highlight.scss +++ b/_scss/base/_highlight.scss @@ -1,20 +1,4 @@ -$color00: #000; -$color01: #000080; -$color02: #0000cf; -$color03: #00a000; -$color04: #204a87; -$color05: #3465a4; -$color06: #4e9a06; -$color07: #5c35cc; -$color08: #800080; -$color09: #8f5902; -$color10: #a40000; -$color11: #c4a000; -$color12: #c00; -$color13: #ce5c00; -$color14: #ef2929; -$color15: #f57900; -$color16: #f8f8f8; -$color17: #ffc; +$color00: rgb(255, 0, 0); +$color01: rgb(255, 255, 204);  @import 'highlight/main'; diff --git a/_scss/base/_main.scss b/_scss/base/_main.scss index e617f45..810b2d4 100644 --- a/_scss/base/_main.scss +++ b/_scss/base/_main.scss @@ -1,3 +1 @@ -@import 'components/avatar';  @import 'components/core'; -@import 'components/header'; diff --git a/_scss/base/_sakura.scss b/_scss/base/_sakura.scss index cdc2fe4..58b95fe 100644 --- a/_scss/base/_sakura.scss +++ b/_scss/base/_sakura.scss @@ -1,11 +1,11 @@  $color-bg-alt: rgba(0, 0, 0, .09); -$color-bg: rgb(255, 255, 255); -$color-blossom:rgb(0, 51, 153); -$color-fade: rgb(51, 102, 204); -$color-html:rgb(255, 255, 255); -$color-text: rgb(0, 0, 0); +$color-bg: rgb(250, 250, 250); +$color-blossom: rgb(0, 108, 160); +$color-fade: rgb(13, 78, 120); +$color-html: rgb(250, 250, 250); +$color-text: rgb(85, 85, 85); -$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; +$font-family-sans-serif: 'Open Sans', sans-serif; +$font-size-base: 1.6em;  @import 'sakura/main'; diff --git a/_scss/components/_avatar.scss b/_scss/components/_avatar.scss deleted file mode 100644 index e4b133f..0000000 --- a/_scss/components/_avatar.scss +++ /dev/null @@ -1,9 +0,0 @@ -.avatar { -  margin: auto; -  max-width: 148px; -  text-align: center; - -  img { -    border-radius: 10px; -  } -} diff --git a/_scss/components/_core.scss b/_scss/components/_core.scss index f3a28f1..46740ac 100644 --- a/_scss/components/_core.scss +++ b/_scss/components/_core.scss @@ -4,47 +4,11 @@  *::after,  *::before {    @include text-size-adjust(100%); +    box-sizing: border-box;  }  html {    background-color: $color-html; -  height: 100%;    overflow-y: scroll;  } - -body { -  display: flex; -  flex-direction: row; -  min-height: 100%; -} - -.container { -  flex: 75%; -  padding-right: 16px; -} - -.sidebar { -  border-left: 1px solid $color-bg-alt; -  flex: 25%; -  height: 100%; -  padding-left: 16px; -} - -@media (max-width: 684px) { -  body { -    flex-direction: column; -  } - -  .container { -    flex: 100%; -    padding-right: 0; -  } - -  .sidebar { -    border: 0; -    display: none; -    flex: 100%; -    padding-left: 0; -  } -} diff --git a/_scss/components/_header.scss b/_scss/components/_header.scss deleted file mode 100644 index c5b95b8..0000000 --- a/_scss/components/_header.scss +++ /dev/null @@ -1,9 +0,0 @@ -header { -  border-bottom: 1px solid $color-bg-alt; -} - -article { -  header { -    padding-bottom: 16px; -  } -} diff --git a/_scss/highlight/_main.scss b/_scss/highlight/_main.scss index f5cdc72..5e999b9 100644 --- a/_scss/highlight/_main.scss +++ b/_scss/highlight/_main.scss @@ -1,310 +1,139 @@  .highlight { -  .bp { -    color: $color05; -  } -    .c { -    color: $color09;      font-style: italic;    }    .c1 { -    color: $color09;      font-style: italic;    }    .cm { -    color: $color09; -    font-style: italic; -  } - -  .cp { -    color: $color09;      font-style: italic;    }    .cs { -    color: $color09;      font-style: italic;    }    .err { -    border: 1px solid $color14; -    color: $color10; -  } - -  .g { -    color: $color00; -  } - -  .gd { -    color: $color10; +    border: 1px solid $color00;    }    .ge { -    color: $color00;      font-style: italic;    }    .gh { -    color: $color01;      font-weight: bold;    } -  .gi { -    color: $color03; -  } - -  .go { -    color: $color00; -    font-style: italic; -  } -    .gp { -    color: $color09; -  } - -  .gr { -    color: $color14; -  } - -  .gs { -    color: $color00;      font-weight: bold;    } -  .gt { -    color: $color10; +  .gs {      font-weight: bold;    }    .gu { -    color: $color08;      font-weight: bold;    }    .hll { -    background-color: $color17; -  } - -  .il { -    color: $color02; -    font-weight: bold; +    background-color: $color01;    }    .k { -    color: $color04;      font-weight: bold;    }    .kc { -    color: $color04;      font-weight: bold;    }    .kd { -    color: $color04;      font-weight: bold;    }    .kn { -    color: $color04; -    font-weight: bold; -  } - -  .kp { -    color: $color04;      font-weight: bold;    }    .kr { -    color: $color04; -    font-weight: bold; -  } - -  .kt { -    color: $color04;      font-weight: bold;    } -  .l { -    color: $color00; -  } - -  .ld { -    color: $color00; -  } - -  .m { -    color: $color02; -    font-weight: bold; -  } - -  .mf { -    color: $color02; -    font-weight: bold; -  } - -  .mh { -    color: $color02; -    font-weight: bold; -  } - -  .mi { -    color: $color02; -    font-weight: bold; -  } - -  .mo { -    color: $color02; -    font-weight: bold; -  } - -  .n { -    color: $color00; -  } - -  .na { -    color: $color11; -  } - -  .nb { -    color: $color04; -  } -    .nc { -    color: $color00; -  } - -  .nd { -    color: $color07;      font-weight: bold;    }    .ne { -    color: $color12;      font-weight: bold;    } -  .nf { -    color: $color00; -  } -    .ni { -    color: $color13; -  } - -  .nl { -    color: $color15; +    font-weight: bold;    }    .nn { -    color: $color00; -  } - -  .no { -    color: $color00; -  } - -  .nt { -    color: $color04;      font-weight: bold;    } -  .nv { -    color: $color00; -  } - -  .nx { -    color: $color00; -  } - -  .o { -    color: $color13; +  .nt {      font-weight: bold;    }    .ow { -    color: $color04; -    font-weight: bold; -  } - -  .p { -    color: $color00;      font-weight: bold;    } -  .py { -    color: $color00; -  } -    .s { -    color: $color06; +    font-style: italic;    }    .s1 { -    color: $color06; +    font-style: italic;    }    .s2 { -    color: $color06; +    font-style: italic;    }    .sb { -    color: $color06; +    font-style: italic;    }    .sc { -    color: $color06; +    font-style: italic;    }    .sd { -    color: $color09;      font-style: italic;    }    .se { -    color: $color06; +    font-style: italic; +    font-weight: bold;    }    .sh { -    color: $color06; +    font-style: italic;    }    .si { -    color: $color06; +    font-style: italic; +    font-weight: bold;    }    .sr { -    color: $color06; +    font-style: italic;    }    .ss { -    color: $color06; +    font-style: italic;    }    .sx { -    color: $color06; -  } - -  .vc { -    color: $color00; -  } - -  .vg { -    color: $color00; -  } - -  .vi { -    color: $color00; -  } - -  .w { -    color: $color16; -    text-decoration: underline; -  } - -  .x { -    color: $color00; +    font-style: italic;    }  } diff --git a/_scss/normalize/_main.scss b/_scss/normalize/_main.scss index 3931bbb..791ed81 100644 --- a/_scss/normalize/_main.scss +++ b/_scss/normalize/_main.scss @@ -93,24 +93,24 @@ select {  }  button, -[type="button"], -[type="reset"], -[type="submit"] { +[type='button'], +[type='reset'], +[type='submit'] {    -webkit-appearance: button;  }  button::-moz-focus-inner, -[type="button"]::-moz-focus-inner, -[type="reset"]::-moz-focus-inner, -[type="submit"]::-moz-focus-inner { +[type='button']::-moz-focus-inner, +[type='reset']::-moz-focus-inner, +[type='submit']::-moz-focus-inner {    border-style: none;    padding: 0;  }  button:-moz-focusring, -[type="button"]:-moz-focusring, -[type="reset"]:-moz-focusring, -[type="submit"]:-moz-focusring { +[type='button']:-moz-focusring, +[type='reset']:-moz-focusring, +[type='submit']:-moz-focusring {    outline: 1px dotted ButtonText;  } @@ -135,23 +135,23 @@ textarea {    overflow: auto;  } -[type="checkbox"], -[type="radio"] { +[type='checkbox'], +[type='radio'] {    box-sizing: border-box;    padding: 0;  } -[type="number"]::-webkit-inner-spin-button, -[type="number"]::-webkit-outer-spin-button { +[type='number']::-webkit-inner-spin-button, +[type='number']::-webkit-outer-spin-button {    height: auto;  } -[type="search"] { +[type='search'] {    -webkit-appearance: textfield;    outline-offset: -2px;  } -[type="search"]::-webkit-search-decoration { +[type='search']::-webkit-search-decoration {    -webkit-appearance: none;  } diff --git a/_scss/sakura/_main.scss b/_scss/sakura/_main.scss index 8e15541..3f1b756 100644 --- a/_scss/sakura/_main.scss +++ b/_scss/sakura/_main.scss @@ -7,26 +7,20 @@ body {    background-color: $color-bg;    color: $color-text;    font-size: $font-size-base; -  line-height: 1.6em; +  line-height: 1.4em;    margin: auto; -  max-width: 72em; -  padding: 32px; +  max-width: 64em; +  padding: 4em;  }  @media (max-width: 684px) {    body {      font-size: $font-size-base * .85; -    padding: 8px; +    padding: 2em;    }  } -@media (max-width: 382px) { -  body { -    font-size: $font-size-base * .75; -  } -} - -@mixin word-wrap() { +@mixin word-wrap {    hyphens: auto;    overflow-wrap: break-word;    word-break: break-word; @@ -40,6 +34,7 @@ h4,  h5,  h6 {    @include word-wrap; +    font-weight: 700;    line-height: 1.1;  } @@ -80,13 +75,11 @@ hr {  a {    color: $color-blossom; -  text-decoration: none;    &:active,    &:focus,    &:hover {      color: $color-fade; -    text-decoration: none;    }  } @@ -126,7 +119,7 @@ code {    white-space: pre-wrap;  } -pre>code { +pre > code {    background-color: transparent;    padding: 0;    white-space: pre; @@ -159,9 +152,9 @@ textarea {  .button,  button, -input[type="submit"], -input[type="reset"], -input[type="button"] { +input[type='submit'], +input[type='reset'], +input[type='button'] {    background-color: $color-blossom;    border: 1px solid $color-blossom;    border-radius: 1px; @@ -169,7 +162,7 @@ input[type="button"] {    color: $color-bg;    cursor: pointer;    display: inline-block; -  padding: 5px 10px; +  padding: 1em;    text-align: center;    text-decoration: none;    white-space: nowrap; @@ -197,8 +190,8 @@ input[type] {    box-shadow: none;    box-sizing: border-box;    color: $color-text; -  margin-bottom: 10px; -  padding: 6px 10px; +  margin: .5em; +  padding: 1em;    &:focus {      border: 1px solid $color-blossom; @@ -206,7 +199,7 @@ input[type] {    }  } -input[type="checkbox"]:focus { +input[type='checkbox']:focus {    outline: 1px dotted $color-blossom;  } diff --git a/_scss/utilities/_textsizeadjust.scss b/_scss/utilities/_textsizeadjust.scss index 49edd0b..8a01d4d 100644 --- a/_scss/utilities/_textsizeadjust.scss +++ b/_scss/utilities/_textsizeadjust.scss @@ -1,13 +1,14 @@  // Text Size Adjust  // -// The text-size-adjust CSS property controls the text inflation algorithm used on some smartphones and tablets. Other browsers will ignore this property. +// The text-size-adjust CSS property controls the text inflation algorithm used +// on some smartphones and tablets. Other browsers will ignore this property.  //  // Values: none | auto | <percentage>  // Default: none  //  // https://drafts.csswg.org/css-size-adjust/#adjustment-control  @mixin text-size-adjust($value: none) { +  -moz-text-size-adjust: $value; +  -ms-text-size-adjust: $value;    -webkit-text-size-adjust: $value; -     -moz-text-size-adjust: $value; -      -ms-text-size-adjust: $value;  } | 
