Skip to content

Commit

Permalink
Merge branch 'academicpages#137'
Browse files Browse the repository at this point in the history
  • Loading branch information
@rjzupkoii
rjzupkoii committed Feb 2, 2025
2 parents 47b944e + 0ccd873 commit 4594e4b
Show file tree
Hide file tree
Showing 22 changed files with 317 additions and 268 deletions.
1 change: 1 addition & 0 deletions _config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

# Basic Site Settings
locale : "en-US"
site_theme : "default"
title : "Your Name / Site Title"
title_separator : "-"
name : &name "Your Name"
Expand Down
21 changes: 0 additions & 21 deletions _sass/_animations.scss
View file

This file was deleted.

18 changes: 0 additions & 18 deletions _sass/_print.scss
View file

This file was deleted.

6 changes: 3 additions & 3 deletions _sass/_syntax.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ div.highlighter-rouge, figure.highlight {
position: relative;
margin-bottom: 1em;
padding: 1em;
border: 1px solid $border-color;
border: 1px solid var(--global-border-color);
border-radius: $border-radius;
background-color: $code-background-color;
background-color: var(--global-code-background-color);
box-shadow: $box-shadow;
font-size: $type-size-4;

Expand All @@ -17,7 +17,7 @@ div.highlighter-rouge, figure.highlight {
top: 0;
right: 0;
padding: 0.5em;
background-color: $lighter-gray;
background-color: mix(#fff, #7a8288, 90%);
content: "\f121";
font-family: "Font Awesome 6 Free" !important;
font-size: $type-size-6;
Expand Down
146 changes: 43 additions & 103 deletions _sass/_variables.scss → _sass/_themes.scss
View file
Original file line number Diff line number Diff line change
@@ -1,38 +1,35 @@
/* ==========================================================================
Variables
SHARED THEME SETTINGS
========================================================================== */

/*
Typography
/* ==========================================================================
TYPOGRAPHY
========================================================================== */

/* Used to set the size for <em> */
$doc-font-size : 16;

/* paragraph indention */
/* Paragraph indention */
$paragraph-indent : false; // true, false (default)
$indent-var : 1.3em;

/* system typefaces */
/* System typefaces */
$serif : Georgia, Times, serif;
$sans-serif : -apple-system, ".SFNSText-Regular", "San Francisco", "Roboto", "Segoe UI", "Helvetica Neue", "Lucida Grande", Arial, sans-serif;
$monospace : Monaco, Consolas, "Lucida Console", monospace;

/* sans serif typefaces */
/* Sans serif typefaces */
$sans-serif-narrow : $sans-serif;
$helvetica : Helvetica, "Helvetica Neue", Arial, sans-serif;

/* serif typefaces */
/* Serif typefaces */
$georgia : Georgia, serif;
$times : Times, serif;
$bodoni : "Bodoni MT", serif;
$calisto : "Calisto MT", serif;
$garamond : Garamond, serif;

$global-font-family : $sans-serif;
$header-font-family : $sans-serif;
$caption-font-family : $serif;

/* type scale */
/* Type scale */
$type-size-1 : 2.441em; // ~39.056px
$type-size-2 : 1.953em; // ~31.248px
$type-size-3 : 1.563em; // ~25.008px
Expand All @@ -42,39 +39,45 @@ $type-size-6 : 0.75em; // ~12px
$type-size-7 : 0.6875em; // ~11px
$type-size-8 : 0.625em; // ~10px

/* masthead properties */
$masthead-height : 70px;
$global-font-family : $sans-serif;
$header-font-family : $sans-serif;
$caption-font-family : $serif;

/* Sidebar properties */
$sidebar-screen-min-width : 1024px;
$sidebar-link-max-width : 250px;
/* ==========================================================================
Breakpoints
========================================================================== */

@include breakpoint-set("to ems", true);

$small : 600px !default;
$medium : 768px !default;
$medium-wide : 900px !default;
$large : 925px !default;
$x-large : 1280px !default;

/* ==========================================================================
Grid
========================================================================== */

$right-sidebar-width-narrow : 20px !default;
$right-sidebar-width : 30px !default;
$right-sidebar-width-wide : 40px !default;

/*
Colors
$susy: (
columns: 12,
column-width: 120px,
gutters: 1/4,
math: fluid,
output: float,
gutter-position: after,
container: $large,
global-box-sizing: border-box,
);

/* ==========================================================================
BRAND COLORS
========================================================================== */

$gray : #7a8288;
$dark-gray : mix(#000, $gray, 40%);
$darker-gray : mix(#000, $gray, 60%);
$light-gray : mix(#fff, $gray, 50%);
$lighter-gray : mix(#fff, $gray, 90%);

$body-color : #fff;
$background-color : #fff;
$code-background-color : #fafafa;
$code-background-color-dark : $light-gray;
$text-color : $dark-gray;
$border-color : $lighter-gray;

$primary-color : #7a8288;
$success-color : #62c462;
$warning-color : #f89406;
$danger-color : #ee5f5b;
$info-color : #2f7f93;

/* brands */
$behance-color : #1769FF;
$bluesky-color : #1184fe;
$dribbble-color : #ea4c89;
Expand All @@ -99,67 +102,4 @@ $vimeo-color : #1ab7ea;
$vine-color : #00bf8f;
$youtube-color : #bb0000;
$xing-color : #006567;


/* links */
$link-color : $info-color;
$link-color-hover : mix(#000, $link-color, 25%);
$link-color-visited : mix(#fff, $link-color, 25%);
$masthead-link-color : $primary-color;
$masthead-link-color-hover : mix(#000, $primary-color, 25%);


/*
Breakpoints
========================================================================== */

@include breakpoint-set("to ems", true);
/*
$small : 400px;
$medium : 500px;
$medium-wide : 550px;
$large : 1200px;
$x-large : 1800px;
*/

$small : 600px !default;
$medium : 768px !default;
$medium-wide : 900px !default;
$large : 925px !default;
$x-large : 1280px !default;

/*
Grid
========================================================================== */

$right-sidebar-width-narrow : 20px !default;
$right-sidebar-width : 30px !default;
$right-sidebar-width-wide : 40px !default;

$susy: (
columns: 12,
column-width: 120px,
gutters: 1/4,
math: fluid,
output: float,
gutter-position: after,
container: $large,
global-box-sizing: border-box,
// debug: (
// image: show,
// color: blue,
// output: overlay,
// toggle: top right,
// ),
);


/*
Other
========================================================================== */

$border-radius : 4px;
$box-shadow : 0 1px 1px rgba(0, 0, 0, 0.125);
$navicon-width : 28px;
$navicon-height : 4px;
$global-transition : all 0.2s ease-in-out;

0 _sass/_mixins.scss → _sass/include/_mixins.scss
View file
File renamed without changes.
10 changes: 5 additions & 5 deletions _sass/_utilities.scss → _sass/include/_utilities.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ body:hover .visually-hidden button {
min-height: 0;
z-index: 9999;
background: #fff;
border: 1px solid $border-color;
border: 1px solid var(--global-border-color);
border-radius: $border-radius;
box-shadow: $box-shadow;

Expand All @@ -461,7 +461,7 @@ body:hover .visually-hidden button {

&__actions {
padding: 0.5em 1em;
border-top: 1px solid $border-color;
border-top: 1px solid var(--global-border-color);
}
}

Expand All @@ -471,12 +471,12 @@ body:hover .visually-hidden button {
========================================================================== */

.footnote {
color: mix(#fff, $gray, 25%);
color: var(--global-text-color-light);
text-decoration: none;
}

.footnotes {
color: mix(#fff, $gray, 25%);
color: var(--global-text-color-light);

ol, li, p {
margin-bottom: 0;
Expand All @@ -485,7 +485,7 @@ body:hover .visually-hidden button {
}

a.reversefootnote {
color: $gray;
color: var(--global-text-color-light);
text-decoration: none;

&:hover {
Expand Down
6 changes: 3 additions & 3 deletions _sass/_archive.scss → _sass/layout/_archive.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
margin: 1.414em 0 0;
padding-bottom: 0.5em;
font-size: $type-size-5;
color: mix(#fff, $gray, 25%);
border-bottom: 1px solid $border-color;
color: var(--global-text-color-light);
border-bottom: 1px solid var(--global-border-color);

+ .list__item .archive__item-title {
margin-top: 0.5em;
Expand Down Expand Up @@ -159,7 +159,7 @@
.feature__wrapper {
@include clearfix();
margin-bottom: 2em;
border-bottom: 1px solid $border-color;
border-bottom: 1px solid var(--global-border-color);
}

.feature__item {
Expand Down
Loading

0 comments on commit 4594e4b

Please sign in to comment.