Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ source "https://rubygems.org"

gem "jekyll", "~> 4.2"

gem "minima", "~> 2.5"

group :jekyll_plugins do
gem "jekyll-feed", "~> 0.12"
end
Expand Down
7 changes: 0 additions & 7 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,6 @@ GEM
jekyll (>= 3.7, < 5.0)
jekyll-sass-converter (3.1.0)
sass-embedded (~> 1.75)
jekyll-seo-tag (2.8.0)
jekyll (>= 3.8, < 5.0)
jekyll-watch (2.2.1)
listen (~> 3.0)
json (2.21.2)
Expand All @@ -91,10 +89,6 @@ GEM
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.4.0)
minima (2.5.2)
jekyll (>= 3.5, < 5.0)
jekyll-feed (~> 0.9)
jekyll-seo-tag (~> 2.1)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (6.0.2)
Expand Down Expand Up @@ -166,7 +160,6 @@ DEPENDENCIES
http_parser.rb (~> 0.6.0)
jekyll (~> 4.2)
jekyll-feed (~> 0.12)
minima (~> 2.5)
tzinfo (>= 1, < 3)
tzinfo-data
wdm (~> 0.1.1)
Expand Down
2 changes: 1 addition & 1 deletion _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ rss: true


# Build settings
theme: minima
# theme: minima # removed: contributed no layouts, includes or styles -- only an unused assets/main.css
permalink: /:categories/:title/
post_dir: false
markdown: kramdown
Expand Down
10 changes: 6 additions & 4 deletions _sass/forms.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use "sass:math";
@use "sass:color";
btnform {
margin: 0 0 5px 0;
fieldset {
Expand All @@ -13,7 +15,7 @@ btnform {
padding: 0;
color: $textcolor;
border: 0;
border-bottom: 1px solid lighten($black, 80);
border-bottom: 1px solid color.adjust($black, $lightness: 80%);
white-space: normal;
}
p {
Expand Down Expand Up @@ -63,10 +65,10 @@ select {
padding: 4px;
margin-bottom: 5px / 4;
background-color: $white;
border: 1px solid lighten($black, 80);
border: 1px solid color.adjust($black, $lightness: 80%);
color: $textcolor;
&:hover {
border-color: lighten($accentcolor, 50);
border-color: color.adjust($accentcolor, $lightness: 50%);
}
}
.input-mini {
Expand Down Expand Up @@ -184,7 +186,7 @@ select:focus {
/* help text ==================================== */
.help-block,
.help-inline {
color : lighten($black, 50);
color : color.adjust($black, $lightness: 50%);
}
.help-block {
display : block;
Expand Down
11 changes: 6 additions & 5 deletions _sass/grid.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@use "sass:math";
// Defining number of columns in the grid.
// Common Values would be 12, 16 or 24
$width: 100%;
Expand All @@ -16,16 +17,16 @@ $margin: 0;
@mixin grid($grid:$def_grid,$cols:'',$float:left,$display:inline){
display:$display;
float:$float;
width:(100%/$grid * $cols) - ($margin * 2);
width:(math.div(100%, $grid) * $cols) - ($margin * 2);
}

// Allows for padding before element
@mixin prefix($grid:$def_grid,$cols:''){
margin-left:(100%/$grid * $cols);
margin-left:(math.div(100%, $grid) * $cols);
}
// Allows for padding after element
@mixin suffix($grid:$def_grid,$cols:''){
margin-right:(100%/$grid * $cols);
margin-right:(math.div(100%, $grid) * $cols);
}
// Removes left margin
@mixin first(){
Expand All @@ -38,10 +39,10 @@ $margin: 0;

@mixin push($grid:$def_grid,$move:'') {
position:relative;
left:(100%/$grid * $move);
left:(math.div(100%, $grid) * $move);
}

@mixin pull($grid:$def_grid,$move:''){
position:relative;
left:(100%/$grid * $move) * -1;
left:(math.div(100%, $grid) * $move) * -1;
}
16 changes: 9 additions & 7 deletions _sass/mixins.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use "sass:math";
@use "sass:color";
// UTILITY MIXINS
// --------------------------------------------------

Expand Down Expand Up @@ -44,33 +46,33 @@
// ------------------------
@mixin font-size($size) {
font-size: 0px + $size;
font-size: 0rem + $size / $doc-font-size;
line-height: 0 + round($doc-line-height / $size*10000) / 10000;
font-size: 0rem + math.div($size, $doc-font-size);
line-height: 0 + math.div(math.round(math.div($doc-line-height, $size) * 10000), 10000);
margin-bottom: 0px + $doc-line-height;
margin-bottom: 0rem + ($doc-line-height / $doc-font-size);
margin-bottom: 0rem + math.div($doc-line-height, $doc-font-size);
}

// Just the REMs
// -------------
@mixin font-rem($size) {
font-size: 0px + $size;
font-size: 0rem + $size / $doc-font-size;
font-size: 0rem + math.div($size, $doc-font-size);
}

// Just font-size and line-height
// ------------------------------
@mixin font($size) {
font-size: 0px + $size;
font-size: 0rem + $size / $doc-font-size;
line-height: 0 + round($doc-line-height / $size*10000) / 10000;
font-size: 0rem + math.div($size, $doc-font-size);
line-height: 0 + math.div(math.round(math.div($doc-line-height, $size) * 10000), 10000);
}

@mixin text-overflow() {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap; }

$indent-var: 0rem + ($doc-line-height / $doc-font-size);
$indent-var: 0rem + math.div($doc-line-height, $doc-font-size);

// GRADIENTS
// --------------------------------------------------
Expand Down
42 changes: 22 additions & 20 deletions _sass/page.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use "sass:color";
@use "sass:math";
body {
background-color: $bodycolor;
font-family: $base-font;
Expand Down Expand Up @@ -54,7 +56,7 @@ body {
li {
display: block;
list-style-type: none;
border-bottom: 1px solid lighten($black,80);
border-bottom: 1px solid color.adjust($black, $lightness: 80%);
border-bottom: 1px solid fade($black,10);
@include font-rem(16);
&:last-child {
Expand Down Expand Up @@ -84,18 +86,18 @@ $button-size: 1.5rem;
@mixin navicon-line() {
display: inline-block;
width: $button-size;
height: $button-size/7;
height: math.div($button-size, 7);
// line color
background: $white;
border-radius: $button-size/14;
border-radius: math.div($button-size, 14);
transition: .3s;
}
.navicon-lines-button {
padding: $button-size/4 $button-size/2;
padding: math.div($button-size, 4) math.div($button-size, 2);
transition: .3s;
cursor: pointer;
user-select: none;
border-radius: $button-size/7;
border-radius: math.div($button-size, 7);
}
.navicon-lines-button:hover {
opacity: 1;
Expand All @@ -105,7 +107,7 @@ $button-size: 1.5rem;
}
.navicon-lines {
margin-right: 10px;
margin-bottom: $button-size/5;
margin-bottom: math.div($button-size, 5);
// create middle line
@include navicon-line;
position: relative;
Expand All @@ -116,17 +118,17 @@ $button-size: 1.5rem;
position: absolute;
left: 0;
content: '';
-webkit-transform-origin: $button-size/14 center;
transform-origin: $button-size/14 center;
-webkit-transform-origin: math.div($button-size, 14) center;
transform-origin: math.div($button-size, 14) center;
}
&:before { top: $button-size/4; }
&:after { top: -$button-size/4; }
&:before { top: math.div($button-size, 4); }
&:after { top: math.div(-$button-size, 4); }
}
.navicon-lines-button:hover {
opacity: 1;
.navicon-lines {
&:before { top: $button-size/3.5; }
&:after { top: -$button-size/3.5; }
&:before { top: math.div($button-size, 3.5); }
&:after { top: math.div(-$button-size, 3.5); }
}
}
.navicon-lines-button.x.active .navicon-lines {
Expand Down Expand Up @@ -241,21 +243,21 @@ $button-size: 1.5rem;
margin: 0;
padding-bottom: .5em;
@include font-rem(28);
border-bottom: 1px solid lighten($black,70);
border-bottom: 1px solid color.adjust($black, $lightness: 70%);
}
h4 {
margin: 0;
padding-bottom: .5em;
@include font-rem(28);
border-bottom: 1px solid lighten($black,70);
border-bottom: 1px solid color.adjust($black, $lightness: 70%);
}
article {
h2 {
margin-bottom: 4px;
@include font-rem(20);
&.link-post {
margin-bottom: 0px + $doc-line-height;
margin-bottom: 0rem + ($doc-line-height / $doc-font-size);
margin-bottom: 0rem + math.div($doc-line-height, $doc-font-size);
}
}
p {
Expand Down Expand Up @@ -416,7 +418,7 @@ $button-size: 1.5rem;
// Dotted line underlines for links
p > a,
li > a {
border-bottom: 1px dotted lighten($link-color, 50);
border-bottom: 1px dotted color.adjust($link-color, $lightness: 50%);
&:hover {
border-bottom-style: solid;
}
Expand All @@ -442,7 +444,7 @@ $button-size: 1.5rem;
background-color: $white;
}
header {
background: lighten($black, 10);
background: color.adjust($black, $lightness: 10%);
}
h3 {
margin: 0;
Expand Down Expand Up @@ -473,7 +475,7 @@ $button-size: 1.5rem;
display: block;
color: $white;
border-bottom-width: 0;
background: lighten($black, 30);
background: color.adjust($black, $lightness: 30%);
@include opacity(0.7);
@include transition(opacity 0.2s ease-in-out);
&:hover {
Expand Down Expand Up @@ -615,7 +617,7 @@ $button-size: 1.5rem;
display: inline-block;
padding-right: 5px;
a {
color: lighten($basecolor, 40%);
color: color.adjust($basecolor, $lightness: 40%);
@include transition(.4s linear);
&:hover {
text-decoration: none;
Expand Down Expand Up @@ -690,7 +692,7 @@ $button-size: 1.5rem;
color: $black;
border-width: 2px !important;
border-style: solid !important;
border-color: lighten($black,50);
border-color: color.adjust($black, $lightness: 50%);
@include rounded(3px);
}
#goog-wm-sb {
Expand Down
3 changes: 2 additions & 1 deletion _sass/pygments.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@use "sass:color";
.highlight {
background-color: #efefef;
font-family: $code-font;
Expand All @@ -10,7 +11,7 @@
margin: 0;
padding: 1em;
}
.lineno { padding-right: 24px; color: lighten(#333332,50);}
.lineno { padding-right: 24px; color: color.adjust(#333332, $lightness: 50%);}

.hll { background-color: #ffffcc }
.c { color: #408080; font-style: italic } /* Comment */
Expand Down
5 changes: 3 additions & 2 deletions _sass/site.scss
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
@use "sass:color";
/* Selection ============================================= */
::-moz-selection {
background-color: lighten($basecolor, 65%);
background-color: color.adjust($basecolor, $lightness: 65%);
color: $basecolor;
text-shadow: none;
}
::selection {
background-color: lighten($basecolor, 65%);
background-color: color.adjust($basecolor, $lightness: 65%);
color: $basecolor;
text-shadow: none;
}
Expand Down
11 changes: 6 additions & 5 deletions _sass/typography.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@use "sass:color";
// Headings
// --------------------------------------------------
h1, h2, h3, h4, h5, h6 {
Expand Down Expand Up @@ -49,7 +50,7 @@ figcaption {
padding-top: 10px;
@include font(14);
line-height: 1.3;
color: lighten($text-color, 10);
color: color.adjust($text-color, $lightness: 10%);
}

// Feature Image Caption
Expand All @@ -63,7 +64,7 @@ figcaption {
@include font(12);
line-height: 1.3;
font-style: italic;
color: lighten($text-color, 30);
color: color.adjust($text-color, $lightness: 30%);
@media #{$small} {
@include grid(12,9);
@include prefix(12,0);
Expand All @@ -73,7 +74,7 @@ figcaption {
@include grid(12,8.5);
}
a {
color: lighten($text-color, 30);
color: color.adjust($text-color, $lightness: 30%);
}
}

Expand All @@ -85,7 +86,7 @@ figcaption {
text-indent: 0;
@include font-rem(14);
background-color: $body-color;
border: 1px solid darken($body-color,20);
border: 1px solid color.adjust($body-color, $lightness: -20%);
@include rounded(3px);
}

Expand Down Expand Up @@ -134,7 +135,7 @@ li {
white-space: nowrap;
margin: 0 2px;
padding: 0 5px;
border: 1px solid lighten($black, 90);
border: 1px solid color.adjust($black, $lightness: 90%);
background-color: #efefef;
@include rounded(3px);
}
Expand Down
Loading
Loading