From 6955d770fe5fdeba40377509d12030e9ebfe0130 Mon Sep 17 00:00:00 2001 From: Barry Clark Date: Wed, 30 Jul 2014 17:36:13 -0400 Subject: [PATCH] Update Sass files to be built by GitHub Pages --- _config.yml | 5 + {scss => _scss}/_highlights.scss | 0 {scss => _scss}/_reset.scss | 0 {scss => _scss}/_variables.scss | 0 style.css | 530 ------------------------------- scss/style.scss => style.scss | 4 +- 6 files changed, 8 insertions(+), 531 deletions(-) rename {scss => _scss}/_highlights.scss (100%) rename {scss => _scss}/_reset.scss (100%) rename {scss => _scss}/_variables.scss (100%) delete mode 100644 style.css rename scss/style.scss => style.scss (99%) diff --git a/_config.yml b/_config.yml index a48f57d..75a0f91 100644 --- a/_config.yml +++ b/_config.yml @@ -55,6 +55,11 @@ permalink: /:title # The release of Jekyll Now that you're using version: beta +# Set the Sass partials directory, as we're using @imports +sass: + sass_dir: _scss + style: :expanded # You might prefer to minify using :compressed + # Use the following plug-ins gems: - jemoji # Emoji please! diff --git a/scss/_highlights.scss b/_scss/_highlights.scss similarity index 100% rename from scss/_highlights.scss rename to _scss/_highlights.scss diff --git a/scss/_reset.scss b/_scss/_reset.scss similarity index 100% rename from scss/_reset.scss rename to _scss/_reset.scss diff --git a/scss/_variables.scss b/_scss/_variables.scss similarity index 100% rename from scss/_variables.scss rename to _scss/_variables.scss diff --git a/style.css b/style.css deleted file mode 100644 index 8734188..0000000 --- a/style.css +++ /dev/null @@ -1,530 +0,0 @@ -/***************/ -/* MEYER RESET */ -/***************/ -html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, canvas, details, embed, figure, figcaption, footer, header, hgroup, menu, nav, output, ruby, section, summary, time, mark, audio, video { - margin: 0; - padding: 0; - border: 0; - font-size: 100%; - font: inherit; - vertical-align: baseline; } - -article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section { - display: block; } - -body { - line-height: 1; } - -ol, ul { - list-style: none; } - -blockquote, q { - quotes: none; } - -blockquote:before, blockquote:after, q:before, q:after { - content: ''; - content: none; } - -table { - border-collapse: collapse; - border-spacing: 0; } - -*, *:before, *:after { - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; } - -/*/ -/* BASE RULES -/*/ -html { - font-size: 100%; } - -body { - background: white; - font: 18px/1.4 Helvetica, Arial, sans-serif; - color: #333333; } - -.container { - margin: 0 auto; - max-width: 740px; - padding: 0 10px; - width: 100%; } - -h1, h2, h3, h4, h5, h6 { - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - color: #222222; - font-weight: 600; - line-height: 1.7; - margin: 1em 0 15px; - padding: 0; } - @media screen and (max-width: 640px) { - h1, h2, h3, h4, h5, h6 { - line-height: 1.4; } } - -h1 { - font-weight: 500; - font-size: 32px; } - h1 a { - color: inherit; } - -h2 { - font-weight: 400; - font-size: 24px; } - -h3 { - font-size: 18px; } - -h4 { - font-size: 18px; - color: #666666; } - -p { - margin: 15px 0; } - -a { - color: #4183c4; - text-decoration: none; - cursor: pointer; } - a:hover, a:active { - color: #4183c4; } - -ul, ol { - margin: 15px 0; - padding-left: 30px; } - -ul { - list-style-type: disc; } - -ol { - list-style-type: decimal; } - -ol ul, ul ol, ul ul, ol ol { - margin: 0; } - -ul ul, ol ul { - list-style-type: circle; } - -em, i { - font-style: italic; } - -strong, b { - font-weight: 600; } - -img { - max-width: 100%; } - -.date { - font-style: italic; - color: #666666; } - -::-moz-selection { - color: black; - background: #eeeeee; } - -::selection { - color: black; - background: #eeeeee; } - -.clearfix:before, .clearfix:after { - content: " "; - display: table; } - -.clearfix:after { - clear: both; } - -/*/ -/* LAYOUT / SECTIONS -/*/ -.wrapper-masthead { - margin-bottom: 50px; } - -.masthead { - padding: 20px 0; - border-bottom: 1px solid #eeeeee; } - @media screen and (max-width: 640px) { - .masthead { - text-align: center; } } - -.site-avatar { - float: left; - width: 70px; - height: 70px; - margin-right: 15px; } - @media screen and (max-width: 640px) { - .site-avatar { - float: none; - display: block; - margin: 0 auto; } } - .site-avatar img { - border-radius: 5px; } - -.site-info { - float: left; } - @media screen and (max-width: 640px) { - .site-info { - float: none; - display: block; - margin: 0 auto; } } - -.site-name { - margin: 0; - color: #333333; - cursor: pointer; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-weight: 300; - font-size: 28px; - letter-spacing: 1px; } - -.site-description { - margin: -5px 0 0 0; - color: #666666; - font-size: 16px; } - @media screen and (max-width: 640px) { - .site-description { - margin: 3px 0; } } - -nav { - float: right; - margin-top: 23px; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 18px; } - @media screen and (max-width: 640px) { - nav { - float: none; - margin-top: 9px; - display: block; - font-size: 16px; } } - nav a { - margin-left: 20px; - color: #333333; - text-align: right; - font-weight: 300; - letter-spacing: 1px; } - @media screen and (max-width: 640px) { - nav a { - margin: 0 10px; - color: #4183c4; } } - -.posts > .post { - padding-bottom: 2em; - border-bottom: 1px solid #eeeeee; } - -.posts > .post:last-child { - padding-bottom: 1em; - border-bottom: none; } - -.post blockquote { - margin: 1.8em 0.8em; - border-left: 2px solid #666666; - padding: 0.1em 1em; - color: #666666; - font-size: 22px; - font-style: italic; } -.post .comments { - margin-top: 10px; } -.post .read-more { - text-transform: uppercase; - font-size: 15px; } - -.wrapper-footer { - margin-top: 50px; - border-top: 1px solid #dddddd; - border-bottom: 1px solid #dddddd; - background-color: #eeeeee; } - -footer { - padding: 20px 0; - text-align: center; } - -/***********************/ -/* SYNTAX HIGHLIGHTING */ -/***********************/ -.highlight { - background-color: #222222; - padding: 5px 10px; - margin: 20px 0; } - -.highlight pre { - word-break: break-all; - word-wrap: break-word; } - -code { - font-family: 'Courier', monospace; - font-size: 14px; - color: #999999; } - -.highlight .c, .highlight .c1 { - color: #586e75; } - -/* Comment */ -.highlight .err { - color: #93a1a1; } - -/* Error */ -.highlight .g { - color: #93a1a1; } - -/* Generic */ -.highlight .k { - color: #859900; } - -/* Keyword */ -.highlight .l { - color: #93a1a1; } - -/* Literal */ -.highlight .n { - color: #93a1a1; } - -/* Name */ -.highlight .o { - color: #859900; } - -/* Operator */ -.highlight .x { - color: #cb4b16; } - -/* Other */ -.highlight .p { - color: #93a1a1; } - -/* Punctuation */ -.highlight .cm { - color: #586e75; } - -/* Comment.Multiline */ -.highlight .cp { - color: #859900; } - -/* Comment.Preproc */ -.highlight .c1 { - color: #586e75; } - -/* Comment.Single */ -.highlight .cs { - color: #859900; } - -/* Comment.Special */ -.highlight .gd { - color: #2aa198; } - -/* Generic.Deleted */ -.highlight .ge { - color: #93a1a1; - font-style: italic; } - -/* Generic.Emph */ -.highlight .gr { - color: #dc322f; } - -/* Generic.Error */ -.highlight .gh { - color: #cb4b16; } - -/* Generic.Heading */ -.highlight .gi { - color: #859900; } - -/* Generic.Inserted */ -.highlight .go { - color: #93a1a1; } - -/* Generic.Output */ -.highlight .gp { - color: #93a1a1; } - -/* Generic.Prompt */ -.highlight .gs { - color: #93a1a1; - font-weight: bold; } - -/* Generic.Strong */ -.highlight .gu { - color: #cb4b16; } - -/* Generic.Subheading */ -.highlight .gt { - color: #93a1a1; } - -/* Generic.Traceback */ -.highlight .kc { - color: #cb4b16; } - -/* Keyword.Constant */ -.highlight .kd { - color: #268bd2; } - -/* Keyword.Declaration */ -.highlight .kn { - color: #859900; } - -/* Keyword.Namespace */ -.highlight .kp { - color: #859900; } - -/* Keyword.Pseudo */ -.highlight .kr { - color: #268bd2; } - -/* Keyword.Reserved */ -.highlight .kt { - color: #dc322f; } - -/* Keyword.Type */ -.highlight .ld { - color: #93a1a1; } - -/* Literal.Date */ -.highlight .m { - color: #2aa198; } - -/* Literal.Number */ -.highlight .s { - color: #2aa198; } - -/* Literal.String */ -.highlight .na { - color: #93a1a1; } - -/* Name.Attribute */ -.highlight .nb { - color: #b58900; } - -/* Name.Builtin */ -.highlight .nc { - color: #268bd2; } - -/* Name.Class */ -.highlight .no { - color: #cb4b16; } - -/* Name.Constant */ -.highlight .nd { - color: #268bd2; } - -/* Name.Decorator */ -.highlight .ni { - color: #cb4b16; } - -/* Name.Entity */ -.highlight .ne { - color: #cb4b16; } - -/* Name.Exception */ -.highlight .nf { - color: #268bd2; } - -/* Name.Function */ -.highlight .nl { - color: #93a1a1; } - -/* Name.Label */ -.highlight .nn { - color: #93a1a1; } - -/* Name.Namespace */ -.highlight .nx { - color: #555555; } - -/* Name.Other */ -.highlight .py { - color: #93a1a1; } - -/* Name.Property */ -.highlight .nt { - color: #268bd2; } - -/* Name.Tag */ -.highlight .nv { - color: #268bd2; } - -/* Name.Variable */ -.highlight .ow { - color: #859900; } - -/* Operator.Word */ -.highlight .w { - color: #93a1a1; } - -/* Text.Whitespace */ -.highlight .mf { - color: #2aa198; } - -/* Literal.Number.Float */ -.highlight .mh { - color: #2aa198; } - -/* Literal.Number.Hex */ -.highlight .mi { - color: #2aa198; } - -/* Literal.Number.Integer */ -.highlight .mo { - color: #2aa198; } - -/* Literal.Number.Oct */ -.highlight .sb { - color: #586e75; } - -/* Literal.String.Backtick */ -.highlight .sc { - color: #2aa198; } - -/* Literal.String.Char */ -.highlight .sd { - color: #93a1a1; } - -/* Literal.String.Doc */ -.highlight .s2 { - color: #2aa198; } - -/* Literal.String.Double */ -.highlight .se { - color: #cb4b16; } - -/* Literal.String.Escape */ -.highlight .sh { - color: #93a1a1; } - -/* Literal.String.Heredoc */ -.highlight .si { - color: #2aa198; } - -/* Literal.String.Interpol */ -.highlight .sx { - color: #2aa198; } - -/* Literal.String.Other */ -.highlight .sr { - color: #dc322f; } - -/* Literal.String.Regex */ -.highlight .s1 { - color: #2aa198; } - -/* Literal.String.Single */ -.highlight .ss { - color: #2aa198; } - -/* Literal.String.Symbol */ -.highlight .bp { - color: #268bd2; } - -/* Name.Builtin.Pseudo */ -.highlight .vc { - color: #268bd2; } - -/* Name.Variable.Class */ -.highlight .vg { - color: #268bd2; } - -/* Name.Variable.Global */ -.highlight .vi { - color: #268bd2; } - -/* Name.Variable.Instance */ -.highlight .il { - color: #2aa198; } - -/* Literal.Number.Integer.Long */ \ No newline at end of file diff --git a/scss/style.scss b/style.scss similarity index 99% rename from scss/style.scss rename to style.scss index d1a7fa6..de8fc42 100755 --- a/scss/style.scss +++ b/style.scss @@ -1,4 +1,6 @@ - +--- +--- + // // IMPORTS //