diff --git a/_includes/head.html b/_includes/head.html index 08fb77e..3510995 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -16,4 +16,5 @@ + diff --git a/_includes/news.html b/_includes/news.html new file mode 100644 index 0000000..5a07592 --- /dev/null +++ b/_includes/news.html @@ -0,0 +1,3 @@ +
+

news

+
diff --git a/_includes/social.html b/_includes/social.html new file mode 100644 index 0000000..f587184 --- /dev/null +++ b/_includes/social.html @@ -0,0 +1,13 @@ +
+ + + + + + + + +
+ You can even add a little note about which of these is the best way to reach you. +
+
diff --git a/_layouts/page.html b/_layouts/page.html index 4c7631f..6ed7ca6 100644 --- a/_layouts/page.html +++ b/_layouts/page.html @@ -8,8 +8,16 @@ layout: default
{{ page.description }}
-
+
{{ content }}
+ {% if page.news %} + {% include news.html %} + {% endif %} + + {% if page.social %} + {% include social.html %} + {% endif %} + diff --git a/_pages/about.md b/_pages/about.md index 90f9f51..8f07e87 100644 --- a/_pages/about.md +++ b/_pages/about.md @@ -2,27 +2,13 @@ layout: page permalink: / title: your name -description: Affiliations. Address. Contacts. Moto. Etc. +description: Affiliations. Address. Contacts. Moto. Etc. +news: true +social: true --- -
-Write your biography here. Tell the world about yourself. Link to your favorite subreddit. You can put a picture in, too. The code is already in, just name your picture "prof_pic.jpg" and put it in the img folder. +Write your biography here. Tell the world about yourself. Link to your favorite [subreddit](http://reddit.com). You can put a picture in, too. The code is already in, just name your picture "prof_pic.jpg" and put it in the img folder. -Link to your social media connections, too. This theme is set up to use Font Awesome icons, like the ones below. Add your Facebook, Twitter, LinkedIn, or just disable all of them. - - -
-
-
- - - - - - - -
- You can even add a little note about which of these is the best way to reach you. -
+Link to your social media connections, too. This theme is set up to use [Font Awesome icons](http://fortawesome.github.io/Font-Awesome/){:target="\_blank"} and [Academicons](https://jpswalsh.github.io/academicons/){:target="\_blank"}, like the ones below. Add your Facebook, Twitter, LinkedIn, Google Scholar, or just disable all of them. diff --git a/_sass/_base.scss b/_sass/_base.scss index 1a4bb3d..b16c815 100644 --- a/_sass/_base.scss +++ b/_sass/_base.scss @@ -145,6 +145,11 @@ article a { } } +.social a { + color: $text-color; + + &:hover { color: $theme-color; } +} /** diff --git a/_sass/_layout.scss b/_sass/_layout.scss index efbbcf8..7564496 100644 --- a/_sass/_layout.scss +++ b/_sass/_layout.scss @@ -70,6 +70,24 @@ display: line; } } +/** + * News block ********************************************************** + */ + .news { + border-top: 1px solid $grey-color-light; + margin-top: 50px; + padding-top: 20px; + } + +/** + * Social block ********************************************************** + */ +.social { + border-top: 1px solid $grey-color-light; + margin-top: 50px; + padding-top: 20px; +} + /** * Site footer ********************************************************** */ @@ -88,6 +106,7 @@ width: 100%; a { color: #fff; } a:hover { color: $theme-color; } } + /** * Pagination ********************************************************** */ @@ -104,86 +123,88 @@ a { color: $theme-color; } } + /** * Page content ********************************************************** */ .page-content { -padding: 100px 0; /* VERTICAL PADDING FOR TITLE ON EVERY PAGE */ + padding: 100px 0; /* VERTICAL PADDING FOR TITLE ON EVERY PAGE */ } .page-heading { -font-size: 20px; + font-size: 20px; } .post-list { -margin: 0px 0; -list-style: none; - > li { -margin-bottom: $vertical-spacing-unit; - } + margin: 0px 0; + list-style: none; + + > li { + margin-bottom: $vertical-spacing-unit; + } } .contacticon { -font-size: 60px; -display:block; -margin: 10px; + display: block; + font-size: 60px; + margin: 10px; } .center{ -text-align: center; + text-align: center; } + /** * Posts ********************************************************** */ .post-header { -margin-bottom: $vertical-spacing-unit; + margin-bottom: $vertical-spacing-unit; } .post-title { -font-size: 42px; -letter-spacing: -1px; -line-height: 1; -margin-bottom: 10px; + font-size: 42px; + letter-spacing: -1px; + line-height: 1; + margin-bottom: 10px; @include media-query($on-laptop) { font-size: 36px; } } .post-content { -h2 { -font-size: 42px; -@include media-query($on-laptop) { -font-size: 28px; - } + h2 { + font-size: 42px; + @include media-query($on-laptop) { + font-size: 28px; } -h3 { -font-size: 30px; -@include media-query($on-laptop) { -font-size: 22px; - } + } + h3 { + font-size: 30px; + @include media-query($on-laptop) { + font-size: 22px; } -h4 { -font-size: 20px; -@include media-query($on-laptop) { -font-size: 18px; - } + } + h4 { + font-size: 20px; + @include media-query($on-laptop) { + font-size: 18px; } + } } .post-meta { -font-size: $small-font-size; -color: $grey-color; -margin-bottom: 0px; + color: $grey-color; + font-size: $small-font-size; + margin-bottom: 0px; } .post-link { -display: block; -font-size: 42px; + display: block; + font-size: 42px; } /** Poem formatting ********************************************/ .poem-title { -font-size: 24px; -letter-spacing: -1px; -line-height: 1; -@include media-query($on-laptop) { -font-size: 16px; - } + font-size: 24px; + letter-spacing: -1px; + line-height: 1; + @include media-query($on-laptop) { + font-size: 16px; + } } - /** * Portfolio grid ********************************************************** */ @@ -191,90 +212,91 @@ font-size: 16px; // http://nicolasgallagher.com/micro-clearfix-hack/ .clearfix:before, .clearfix:after { -content: " "; -display: table; + content: " "; + display: table; } .clearfix:after { -clear: both; + clear: both; } .project { -width: 33.33%; -height: 250px; -float: left; -vertical-align: middle; -box-sizing: border-box; -padding: 10px; + box-sizing: border-box; + float: left; + height: 250px; + padding: 10px; + vertical-align: middle; + width: 33.33%; } -.thumbnail{ -width: 100%; -height: 230px; -overflow: hidden; +.thumbnail { + overflow: hidden; + height: 230px; + width: 100%; } .thumbnail img{ -width: 500px; -height: auto; -position: relative; -left: -25%; -top: -5%; + height: auto; + position: relative; + left: -25%; + top: -5%; + width: 500px; } .thumbnail a{ -float: left; -position: relative; -width: 100%; -height: 230px; + float: left; + position: relative; + width: 100%; + height: 230px; } .thumbnail a span { -display: none; -position: absolute; -top: 0; -left: 0; -bottom: 0; -right: 0; -background: rgba(0,0,0,0.4); -color: $grey-color-light; -padding: 40px; -text-align: center; + display: none; + position: absolute; + top: 0; + left: 0; + bottom: 0; + right: 0; + background: rgba(0,0,0,0.4); + color: $grey-color-light; + padding: 40px; + text-align: center; } .thumbnail a:hover span { -display: block; + display: block; } + /** * Portfolio pages ********************************************************** */ .blankbox{ -background: $theme-color; + background: $theme-color; } .img_row{ -height: $img_height; -width: 100%; -overflow: hidden; -box-sizing:border-box; -padding: $img_spacing; + height: $img_height; + width: 100%; + overflow: hidden; + box-sizing:border-box; + padding: $img_spacing; } .col{ -width: 100%; -height: 100%; -float: left; -object-fit: cover; -box-sizing:border-box; -padding: $img_spacing; + width: 100%; + height: 100%; + float: left; + object-fit: cover; + box-sizing:border-box; + padding: $img_spacing; } .right{ -float: right; + float: right; } .one { -width:33.33%; + width:33.33%; } .two { -width: 66.66%; + width: 66.66%; } .three{ -width: 100%; + width: 100%; } .caption{ -height: 100%; -color: $caption_color; -text-align: center; -vertical-align: middle; -font-size: $caption_font_size; + height: 100%; + color: $caption_color; + text-align: center; + vertical-align: middle; + font-size: $caption_font_size; } diff --git a/css/academicons.css b/css/academicons.css new file mode 100644 index 0000000..69a8bbd --- /dev/null +++ b/css/academicons.css @@ -0,0 +1,99 @@ +/*! + * Academicons 1.5.0 by James Walsh - https://github.com/jpswalsh + * Fonts generated using the IcoMoon app - http://icomoon.io/app + * Square icons designed to be used alongside Font Awesome square icons - https://fortawesome.github.io/Font-Awesome/ + * License - Font: SIL OFL 1.1, CSS: MIT License + */ + +@font-face { + font-family: 'academicons'; + src:url('fonts/academicons.eot?qbqm87'); + src:url('fonts/academicons.eot?#iefixqbqm87') format('embedded-opentype'), + url('fonts/academicons.ttf?qbqm87') format('truetype'), + url('fonts/academicons.woff?qbqm87') format('woff'), + url('fonts/academicons.svg?qbqm87#academicons') format('svg'); + font-weight: normal; + font-style: normal; +} + +.ai { + display:inline-block; + font:normal normal normal 14px/1 Academicons; + font-size:inherit; + text-rendering:auto; + -webkit-font-smoothing:antialiased; + -moz-osx-font-smoothing:grayscale; +} + +.ai-google-scholar:before { + content: "\e600"; +} +.ai-google-scholar-square:before { + content: "\e601"; +} +.ai-researchgate:before { + content: "\e612"; +} +.ai-researchgate-square:before { + content: "\e613"; +} +.ai-mendeley:before { + content: "\e604"; +} +.ai-mendeley-square:before { + content: "\e605"; +} +.ai-orcid:before { + content: "\e606"; +} +.ai-orcid-square:before { + content: "\e607"; +} +.ai-impactstory:before { + content: "\e608"; +} +.ai-impactstory-square:before { + content: "\e609"; +} +.ai-academia:before { + content: "\e60a"; +} +.ai-academia-square:before { + content: "\e60b"; +} +.ai-zotero:before { + content: "\e60c"; +} +.ai-zotero-square:before { + content: "\e60d"; +} +.ai-figshare:before { + content: "\e60e"; +} +.ai-figshare-square:before { + content: "\e60f"; +} +.ai-dryad:before { + content: "\e610"; +} +.ai-dryad-square:before { + content: "\e611"; +} +.ai-arxiv:before { + content: "\e616"; +} +.ai-arxiv-square:before { + content: "\e617"; +} +.ai-scirate:before { + content: "\e614"; +} +.ai-scirate-square:before { + content: "\e615"; +} +.ai-researchgate-old:before { + content: "\e602"; +} +.ai-researchgate-old-square:before { + content: "\e603"; +} diff --git a/css/fonts/academicons.eot b/css/fonts/academicons.eot new file mode 100644 index 0000000..b727da4 Binary files /dev/null and b/css/fonts/academicons.eot differ diff --git a/css/fonts/academicons.svg b/css/fonts/academicons.svg new file mode 100644 index 0000000..34d8e8c --- /dev/null +++ b/css/fonts/academicons.svg @@ -0,0 +1,54 @@ + + + + + + +{ + "fontFamily": "academicons", + "majorVersion": 1, + "minorVersion": 0, + "copyright": "James Walsh", + "license": "SIL OFL 1.1", + "licenseURL": "http://scripts.sil.org/OFL", + "designerURL": "http://jpswalsh.com", + "description": "Font icons for academic websites.\nFont generated by IcoMoon.", + "version": "Version 1.0", + "fontId": "academicons", + "psName": "academicons", + "subFamily": "Regular", + "fullName": "academicons" +} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/css/fonts/academicons.ttf b/css/fonts/academicons.ttf new file mode 100644 index 0000000..a220668 Binary files /dev/null and b/css/fonts/academicons.ttf differ diff --git a/css/fonts/academicons.woff b/css/fonts/academicons.woff new file mode 100644 index 0000000..ae8a0db Binary files /dev/null and b/css/fonts/academicons.woff differ