diff --git a/Gemfile b/Gemfile index 4e5d8adc5..f3a3522b2 100644 --- a/Gemfile +++ b/Gemfile @@ -3,6 +3,9 @@ source "https://rubygems.org" gem 'jekyll', '~> 3.0.0' gem 'jekyll-paginate', '~> 1.1.0', github: 'egladman/jekyll-paginate' gem 'jekyll-sitemap', '~> 0.9.0' +gem 'jekyll-last-modified-at', '~> 0.3.4' gem 'jekyll-feed', '~> 0.3.1' gem 'rake', '~> 10.4.2' gem 'sass', '~> 3.4' +gem 'nokogiri', '~> 1.6', '>= 1.6.6.2' +gem 'iconv', '~> 1.0', '>= 1.0.4' diff --git a/Gemfile.lock b/Gemfile.lock index 293100698..10c5be2c9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,6 +9,7 @@ GEM specs: colorator (0.1) ffi (1.9.10) + iconv (1.0.4) jekyll (3.0.0) colorator (~> 0.1) jekyll-sass-converter (~> 1.0) @@ -19,6 +20,8 @@ GEM rouge (~> 1.7) safe_yaml (~> 1.0) jekyll-feed (0.3.1) + jekyll-last-modified-at (0.3.4) + jekyll jekyll-sass-converter (1.3.0) sass (~> 3.2) jekyll-sitemap (0.9.0) @@ -30,6 +33,9 @@ GEM rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) mercenary (0.3.5) + mini_portile (0.6.2) + nokogiri (1.6.6.2) + mini_portile (~> 0.6.0) rake (10.4.2) rb-fsevent (0.9.6) rb-inotify (0.9.5) @@ -42,10 +48,13 @@ PLATFORMS ruby DEPENDENCIES + iconv (~> 1.0, >= 1.0.4) jekyll (~> 3.0.0) jekyll-feed (~> 0.3.1) + jekyll-last-modified-at (~> 0.3.4) jekyll-paginate (~> 1.1.0)! jekyll-sitemap (~> 0.9.0) + nokogiri (~> 1.6, >= 1.6.6.2) rake (~> 10.4.2) sass (~> 3.4) diff --git a/Gruntfile.coffee b/Gruntfile.coffee index b2e5c671d..b645068a7 100644 --- a/Gruntfile.coffee +++ b/Gruntfile.coffee @@ -306,6 +306,9 @@ module.exports = (grunt) -> jekyll: cmd: 'bundle exec jekyll build' + aliasFeed: + cmd: 'cp _site/atom.xml _site/rss.xml' + new_post: cmd: './_helpers/new-post.sh' @@ -370,7 +373,7 @@ module.exports = (grunt) -> 'jade' 'copy:scss' 'exec:jekyll' - # delete grunt.config.data.copy.scss + 'exec:aliasFeed' 'copy:js' 'copy:css' 'copy:image' diff --git a/_assets/css/_mailchimp.sass b/_assets/css/_mailchimp.sass index 7d9cc90d3..54d2660ea 100644 --- a/_assets/css/_mailchimp.sass +++ b/_assets/css/_mailchimp.sass @@ -66,6 +66,7 @@ form #mc_embed_signup, #mc_embed_signup * box-sizing: border-box + // position: relative .mc-field-group.input-group ul @@ -125,7 +126,9 @@ form #mc_embed_signup_scroll line-height: 8em - height: 12em + min-height: 12em + display: inline-block + width: 100% .mc-field-group margin-right: 8em diff --git a/_assets/css/_media-queries.sass b/_assets/css/_media-queries.sass index 891609fc9..791cedef5 100644 --- a/_assets/css/_media-queries.sass +++ b/_assets/css/_media-queries.sass @@ -1,4 +1,4 @@ -@media (max-width: 550px) +@media (max-width: 549px) #search-results li .primary max-width: none!important @@ -8,7 +8,7 @@ width: 100% float: left .landing - height: 100% + height: 40em #heading-wrapper top: 50% #brand @@ -31,20 +31,21 @@ &::before display: none -@media (min-width: 550px) and (max-width: 750px) and (orientation: landscape) - .landing - height: 100% - #heading-wrapper - top: 25% +@media (min-width: 550px) and (max-width: 749px) and (orientation: landscape) + // .landing + // height: 100% + // #heading-wrapper + // top: 25% -@media (min-width: 550px) and (max-width: 750px) +@media (min-width: 550px) and (max-width: 749px) #heading font-size: 135% .landing - height: 75% - text-align: center + // height: 31em + + //fixme #heading-wrapper - top: 50% + // top: 50% .landing-heading // font-size: 2.4rem h4 @@ -68,13 +69,13 @@ width: 100% .section - padding: 14rem 0 15rem + padding: 10rem 0 15rem @media (min-width: 750px) .landing-heading font-size: 2.6rem - .section - padding: 14rem 0 15rem + // .section + // padding: 5rem 0 15rem .section-description margin-left: auto margin-right: auto @@ -85,6 +86,7 @@ @media (min-width: 1200px) .navbar width: inherit + width: calc(100% - #{$sidebarWidth}) z-index: 10 left: $sidebarWidth border-bottom: 1px solid #D5D5D5 @@ -97,10 +99,10 @@ margin: 0 auto max-width: $maxContentWidth .landing - padding: 0 - height: 50% + height: 75em + // height: 50% #heading-wrapper - top: 25% + // top: 25% #scroll-indicator bottom: 50% #page-content-wrapper @@ -108,20 +110,24 @@ left: $sidebarWidth overflow-x: hidden right: 0 + width: 100% + width: calc(100% - #{$sidebarWidth}) height: 100% + height: calc(100% - 9rem) transition: all 0.25s linear z-index: 9 + margin-top: 9rem &.index left: $sidebarWidth >* transition: 0s .layout-desktop display: inherit - .section - padding: 20rem 0 19rem - .about - h5 - font-size: 185% + // .section + // padding: 20rem 0 19rem + // .about + // h5 + // font-size: 185% #social-media width: 15% .sidebar + #page-content-wrapper @@ -131,58 +137,59 @@ > .section.posts:only-child > .container width: 50% -@media (min-width: 550px) and (max-width: 750px) and (orientation: landscape) +@media (min-width: 550px) and (max-width: 749px) and (orientation: landscape) .landing - height: 100%!important + // height: 100%!important #heading-wrapper - top: 50% + // top: 50% #heading font-size: 85% -@media (max-width: 750px) and (min-height: 500px) - .landing - height: 75% +// @media (max-width: 749px) and (min-height: 500px) +// // .landing +// // height: 20em +// // fixme +// +// @media (max-width: 749px) and (min-height: 500px) and (orientation: portrait) +// // .landing +// // height: 30em +// //fixme +// // #heading-wrapper +// // top: 37.5% -@media (max-width: 750px) and (min-height: 500px) and (orientation: portrait) - .landing - height: 75% - #heading-wrapper - top: 37.5% - -@media (min-width: 750px) and (max-width: 1200px) and (orientation: landscape) +@media (min-width: 750px) and (max-width: 1199px) and (orientation: landscape) input#mce-EMAIL min-width: 10em ul li:not(:last-of-type) margin-right: 3em - .landing - height: 100% - #heading-wrapper - top: 50% + // .landing + // height: 100% + // #heading-wrapper + // top: 50% @media (min-width: 1200px) and (orientation: landscape) .landing - height: 85% - #heading-wrapper - top: 42.5% + height: 70em #heading font-size: 125% -@media (min-width: 1200px) and (orientation: landscape) and (max-height: 800px) - .landing - height: 100% - #heading-wrapper - top: 50% +// @media (min-width: 1200px) and (orientation: landscape) and (max-height: 799px) +// // .landing +// // height: 100% +// // #heading-wrapper +// // top: 50% -@media (max-width: 1200px) and (min-width: 550px) +@media (max-width: 1199px) and (min-width: 550px) .landing + // height: 45em img - height: 15em + height: 12em h4 font-size: 3.25em h5 font-size: 1.5em -@media (max-width: 1200px) +@media (max-width: 1199px) input#mce-EMAIL min-width: initial .category-title @@ -199,8 +206,8 @@ margin: 0 1.5em 1.5em 1.5em &:first-of-type .info-wrapper margin-top: 1.5em - .github-ribbon - top: 8rem + // .github-ribbon + // top: 8rem #scroll-indicator display: none .layout-mobile @@ -321,11 +328,12 @@ margin-top: 3em z-index: 2 #page-content-wrapper - position: fixed left: 0 right: 0 - overflow-x: hidden height: 100% + height: calc(100% - 8rem) + margin-top: 8rem + overflow-x: hidden transition: all 0.25s linear -webkit-overflow-scrolling: touch @@ -343,7 +351,8 @@ left: 35rem transition: all 0.25s linear - *:not(#page-content-wrapper):not(.sidebar):not(.navbar):not(.menu-toggle):not(#search-posts):not(.search-submit):not(.search-results) + *:not(#page-content-wrapper):not(.sidebar):not(.navbar):not(.menu-toggle):not(#search-posts):not(.search-submit):not(.search-results):not(.scrollToTop) + //todo mixin that daisy chains :not animation: none !important transition-property: none !important -o-transition-property: none !important @@ -356,7 +365,9 @@ -ms-animation: none !important -@media (max-width: 750px) +@media (max-width: 749px) + #page-content-wrapper + width: 100% #main-nav padding-top: 8rem .navbar @@ -374,21 +385,19 @@ .search padding: 0 width: 100% - .github-ribbon - font-size: 1.25em - line-height: 2.25em - height: 2.25em - transform: translate(50%, -50%) rotate(45deg) translateY(5em) - -webkit-transform: translate(50%, -50%) rotate(45deg) translateY(5.5em) - -moz-transform: translate(50%, -50%) rotate(45deg) translateY(5.5em) + // .github-ribbon + // font-size: 1.25em + // line-height: 2.25em + // height: 2.25em + // transform: translate(50%, -50%) rotate(45deg) translateY(5em) + // -webkit-transform: translate(50%, -50%) rotate(45deg) translateY(5.5em) + // -moz-transform: translate(50%, -50%) rotate(45deg) translateY(5.5em) -@media (min-width: 750px) and (max-width: 1200px) +@media (min-width: 750px) and (max-width: 1199px) #main-nav padding-top: 8rem .landing - height: 50% - #heading-wrapper - top: 25% + height: 65em .mc-field-group &:not(:first-of-type) margin-right: 8em @@ -397,7 +406,6 @@ width: 100% .subscribe-wrapper padding-top: 6em - height: 28em .sidebar left: 0 #heading @@ -449,19 +457,21 @@ font-size: 4rem -@media (min-width: 750px) and (max-width: 1200px) and (max-height: 1100px) - .landing - height: 75% - #heading-wrapper - top: 37.5% +@media (min-width: 750px) and (max-width: 1199px) and (max-height: 1099px) + // .landing + // height: 75% + // #heading-wrapper + // top: 37.5% -@media (min-width: 750px) and (max-width: 1200px) and (max-height: 700px) - .landing - height: 100% - #heading-wrapper - top: 50% +@media (min-width: 750px) and (max-width: 1199px) and (max-height: 699px) + // .landing + // height: 100% + // #heading-wrapper + // top: 50% -@media (min-width: 550px) and (max-width: 750px) +@media (min-width: 550px) and (max-width: 749px) + .landing + height: 45em .mc-field-group &:not(:first-of-type) margin-right: 8em @@ -470,9 +480,9 @@ width: 100% .subscribe-wrapper padding-top: 6em - height: 28em + // height: 28em -@media (min-width: 350px) and (max-width: 750px) +@media (min-width: 350px) and (max-width: 749px) .sidebar left: 0 #heading @@ -493,13 +503,13 @@ position: fixed width: 100% -@media (max-width: 350px) - .github-ribbon - display: none - .landing - height: 85% - #heading-wrapper - top: 42.5% +@media (max-width: 349px) + // .github-ribbon + // display: none + // .landing + // height: 85% + // #heading-wrapper + // top: 42.5% #heading font-size: 65% .contact-info-email-container, .contact-info-office-container, .contact-info-meeting-container @@ -548,13 +558,25 @@ input#mc-embedded-subscribe width: 100% -@media (max-width: 350px) and (max-height: 500px) - .landing - height: 100% - #heading-wrapper - top: 50% +@media (max-width: 349px) and (max-height: 499px) + // .landing + // height: 100% + // #heading-wrapper + // top: 50% -@media (max-width: 550px) +@media (max-width: 549px) + .landing + img + height: 10em + h4 + font-size: 2.25em + h5 + font-size: 1.5em + .about + h5 + font-size: 2.4rem + .github-ribbon + display: none .mc-field-group margin-right: 0 width: 100% @@ -565,12 +587,14 @@ height: 40em input#mc-embedded-subscribe vertical-align: middle + h5 + font-size: 2.4rem @media (min-width: 2000px) and (orientation: landscape) - .landing - height: 100% - #heading-wrapper - top: 50% + // .landing + // height: 100% + // #heading-wrapper + // top: 50% #scroll-indicator bottom: 0 #heading diff --git a/_assets/css/_weather.sass b/_assets/css/_weather.sass index 037f1c1ef..ffb686792 100644 --- a/_assets/css/_weather.sass +++ b/_assets/css/_weather.sass @@ -1,7 +1,11 @@ .clouds - position: relative overflow: hidden - height: 100% + position: absolute + height: inherit + top: 0 + left: 0 + height: inherit + width: 100% [class^="cloud-"] position: absolute diff --git a/_assets/css/main.sass b/_assets/css/main.sass index 28558ec6b..99b6cd4a9 100644 --- a/_assets/css/main.sass +++ b/_assets/css/main.sass @@ -115,7 +115,7 @@ $gray: #848484 margin-left: 52% html - font-size: 37.5% + font-size: 50% body font-size: 1.5em @@ -171,7 +171,7 @@ h4 h5 font-size: 1.8rem - letter-spacing: -.05rem + // letter-spacing: -.05rem line-height: 1.5 h6 @@ -197,6 +197,10 @@ h6 p margin-top: 0 +// +// em:not(p>em) +// font-style: initial +// .alert text-align: center @@ -468,16 +472,6 @@ body color: $textColor overflow-x: hidden -html - font-size: 37.5% - -canvas - position: relative - opacity: 0 - width: 100% - height: 100% - z-index: -3 - a &:not(.sidebar) font-weight: 600 @@ -488,12 +482,25 @@ a text-decoration: underline - - +.bold + font-weight: 600 .disabled opacity: 0.5 +.pagination-text + font-size: 0.75em + margin: 0 1ch + color: $gray + font-weight: 400 + position: absolute + height: 2em + bottom: 0 + line-height: 2em + font-weight: 300 + &:hover + color: $textColor + .about a color: white!important @@ -517,37 +524,138 @@ hr text-align: center width: 25% -.category-title h5 - display: inline - text-transform: capitalize +.category-title + a + &:hover, &:visited, &:focus + text-decoration: none + color: $textColor + h5 + display: inline + text-transform: capitalize + &::after + content: "\f105" + font-family: FontAwesome + margin: 0 0.5em + color: $textColor -.category-title h5::after - content: "\f105" - font-family: FontAwesome - margin: 0 0.5em -.github-ribbon - position: absolute - top: 9rem - right: 0 - font-size: 1.5em - background: $oscRed - box-shadow: 0 0 1px 1px rgba(0, 0, 0, 0.25) - color: #f5f5f5 - line-height: 2.5em - text-align: center - width: 20em - height: 2.5em - transform: translate(50%, -50%) rotate(45deg) translateY(7em) - z-index: 3 - -moz-transform: translate(50%, -50%) rotate(45deg) translateY(7em) - -o-transform: translate(50%, -50%) rotate(45deg) translateY(7em) - -ms-transform: translate(50%, -50%) rotate(45deg) translateY(7em) - -webkit-box-shadow: 0 0 1px 1px rgba(0, 0, 0, 0.25) - -moz-box-shadow: 0 0 1px 1px rgba(0, 0, 0, 0.25) - -webkit-transform: translate(50%, -50%) rotate(45deg) translateY(7em) + +@mixin transform($transformations) + -moz-transform: $transformations + -o-transform: $transformations + -ms-transform: $transformations + -webkit-transform: $transformations + transform: $transformations + +$deviation: 2em + +@mixin spork($fa: '\f126', $size: 8em, $gravity: nw, $color: #F5F5F5, $background-color: red, $scale: 2.5, $animation: skew, $rotate: true) + position: relative + display: block + width: $size - $deviation + height: $size - $deviation + overflow: hidden + transition: 0.25s ease + padding: 0 0 $deviation 0 + + &::before, &::after + transition: 0.25s ease + position: absolute + left: 0 + &::before + content: '' + top: 0 + &::after + $withslash: "\"\\#{$fa}\"" + font-family: FontAwesome + font-weight: 400 + color: $color + text-rendering: auto + -webkit-font-smoothing: antialiased + -moz-osx-font-smoothing: grayscale + content: unquote($withslash) + font-size: $scale + em + white-space: nowrap + text-align: center + @if $rotate == true + width: $scale + em + line-height: $scale + em + @else + width: $scale + em + line-height: $scale + em + right: 0 + left: inherit &:hover - background: darken($oscRed, 5%) + text-decoration: none + &::after + @if $animation == scale + font-size: ($scale + 0.5) + em + + @if $gravity == ne + &::before + border-top: 0 solid transparent + border-bottom: $size solid transparent + border-right: $size solid $background-color + border-left: $deviation solid transparent + @if $animation == skew + border-left: ($deviation/2) solid transparent + &::after + @if $rotate == true + width: $scale + em + line-height: $scale + em + @include transform( translate( 50%, -15%) rotate(45deg) ) + &:hover + &::before + @if $animation == skew + border-right: ($size + $deviation) solid darken($background-color, 5%) + border-bottom: ( $size + ($deviation * 2) ) solid transparent + border-left: ($deviation / 2) solid transparent + @if $rotate == true + padding-left: 1em + @if $animation == scale + border-right: ($size + $deviation) solid darken($background-color, 5%) + border-bottom: ($size + $deviation) solid transparent + border-left: 0 solid transparent + @else + border-right: ($size) solid darken($background-color, 5%) + &::after + @if $animation == scale + @if $rotate == true + @include transform( translate( 30%, -15%) rotate(45deg) ) + @if $rotate == true && $animation == skew + @include transform( translate( 50%, -15%) rotate(0deg) ) + +@mixin foo($direction: ne) + position: absolute + width: 12em + height: 12em + + @if $direction == nw + top: 0 + left: 0 + + @if $direction == ne + top: 0 + right: 0 + + @if $direction == sw + bottom: 0 + right: 0 + + @if $direction == sw + bottom: 0 + left: 0 + a + @include spork($fa: '\f09b', $size: 14em, $gravity: ne, $background-color: $gray, $scale: 3,$animation: skew, $rotate: true) + z-index: 3 + + + +.spork + @include foo(ne) + + + .btn, input display: inline font-size: 1em @@ -714,29 +822,39 @@ input padding: 2em 0 6em 0 .posts - li - h1 - font-size: 2.5em - a - font-weight: 400 - .content - margin-top: 2em - a - color: #3498DB - &:hover - color: darken(#3498DB, 10%) - text-decoration: underline - &:visited - color: #7971E6 - ul>li - display: list-item + h1 + font-size: 2.5em + a + font-weight: 400 + h2 + margin-top: 2em + &:not(:first-of-type) + padding-top: 2em + border-top: 1px lighten($gray, 20%) solid + + .tags + color: lighten($gray, 25%) + &::before + font-family: FontAwesome + font-weight: 400 + margin-right: 1ch + color: lighten($gray, 25%) + text-rendering: auto + -webkit-font-smoothing: antialiased + -moz-osx-font-smoothing: grayscale + content: '\f02c' + + .date + display: inline-block + margin-bottom: 2.5em #main-nav padding-top: 6em .pagination - display: inherit + display: block font-size: 200% text-align: center + margin-top: 3em .fa-caret-right &:hover:not(.disabled) background: rgba(75,75,75,0.5) @@ -796,6 +914,11 @@ input font-size: 3em color: $gray img + // -webkit-user-drag: none + -webkit-user-select: none + -moz-user-select: none + -ms-user-select: none + user-select: none margin: 0 auto height: 15em h4 @@ -877,7 +1000,7 @@ span.fa-angle-down padding: 0 !important text-align: center width: 100% - h5 + h1,h2,h3,h4,h5,h6 margin: 3em 0 .about @@ -1005,22 +1128,13 @@ ul.contact-info text-align: left list-style: none li - .content - list-style: initial - li - list-style-type: square + list-style: initial + list-style-type: square + p+ul + margin-left: 2em p text-align: justify - > .container > ul > li - padding-bottom: 2em - padding-top: 2em - &:not(:last-of-type) - border-bottom: 1px solid #CDCDCD - -.section.posts > .container > ul:not(:last-of-type) - border-bottom: 1px solid #CDCDCD - .posts li > h5 + table margin: 0 auto @@ -1037,13 +1151,14 @@ footer text-align: center!important width: 100% height: 4em + display: inline-block .with-love position: absolute bottom: 2em width: 100% span display: block - font-size: 12px + font-size: 1.25em color: #666 text-align: center a @@ -1051,9 +1166,9 @@ footer text-decoration: none // FIXME .fa-heart - font-size: 10px + // font-size: 1em color: $oscRed - margin: 0 3px + margin: 0 1ch #page-content-wrapper.single left: 35rem @@ -1073,12 +1188,9 @@ footer margin-bottom: 4rem .landing - #heading-wrapper - position: absolute - width: 100% - transform: translateY(-50%) - -webkit-transform: translateY(-50%) - -moz-transform: translateY(-50%) + display: flex + justify-content: center + align-items: center [class*='flat'] i line-height: 1.25em diff --git a/_assets/js/_width.coffee b/_assets/js/_width.coffee index 66e3287fb..443439f7b 100644 --- a/_assets/js/_width.coffee +++ b/_assets/js/_width.coffee @@ -1,28 +1,31 @@ -$ -> - setWidth() - -setWidth = -> - if $(window).width() < 1200 - - if $('.sidebar').is('.active') - if $(window).width() < 750 - contentWrapperWidth = $(window).width() - else - contentWrapperWidth = 'inherit' - - else - if $(window).width() < 750 - contentWrapperWidth = $(window).width() - else - contentWrapperWidth = 'inherit' - - else - contentWrapperWidth = $(window).width() - $('.sidebar').width() - - $('#page-content-wrapper').css 'width', contentWrapperWidth - $('.navbar').css 'width', contentWrapperWidth - return - -$(window).resize -> - setWidth() - return +# $ -> +# setWidth() +# +# setWidth = -> +# # if $(window).width() < 1200 +# +# # if $('.sidebar').is('.active') +# if $(window).width() < 750 +# contentWrapperWidth = $(window).width() +# else +# contentWrapperWidth = '' +# # contentWrapperWidth = 'inherit' +# +# # else +# # if $(window).width() < 750 +# # contentWrapperWidth = $(window).width() +# # else +# # contentWrapperWidth = '' +# # # contentWrapperWidth = 'inherit' +# +# # else +# # contentWrapperWidth = $(window).width() - $('.sidebar').width() +# +# if contentWrapperWidth? +# $('#page-content-wrapper').css 'width', contentWrapperWidth +# $('.navbar').css 'width', contentWrapperWidth +# return +# +# $(window).resize -> +# setWidth() +# return diff --git a/_assets/js/main.coffee b/_assets/js/main.coffee index 81bcae276..9c174bee3 100644 --- a/_assets/js/main.coffee +++ b/_assets/js/main.coffee @@ -1,6 +1,6 @@ $(document).ready -> $('#scroll-indicator').addClass('animated bounce').removeClass 'hidden' - $('body').addClass 'js' + # $('body').addClass 'js' $menu = $('.sidebar') $menulink = $('.menu-toggle') $menulink.click -> diff --git a/_config.yml b/_config.yml index de73bec24..2d87d5e9f 100644 --- a/_config.yml +++ b/_config.yml @@ -2,20 +2,26 @@ name: "The Open Source Club" url: "opensource.osu.edu" baseurl: '' next_meeting_date: January 14, 2016 -paginate: 10 +paginate: 20 description: > - The Open Source Club at at the Ohio State University is a registered student - organization composed of members from all around campus and out into the - community who share a common enthusiasm for free, open source software. + The Open Source Club at at the Ohio State University is a + [registered student organization](https://ohiounion.osu.edu/get_involved/student_organizations/directory?org_id=1042) + composed of members from all around campus and out into the community who + share a common enthusiasm for + [free, open source software](https://www.fsf.org/about/what-is-free-software). + Our focus is on building a strong community of open source users and developers + in order to bring the benefits of open development, open standards, and free + software to the university community. paginate_page: index.jade gems: - jekyll-sitemap - jekyll-feed + - jekyll-last-modified-at feed: - path: rss.xml + path: atom.xml defaults: - diff --git a/_includes/jade/core/sidebar.jade b/_includes/jade/core/sidebar.jade index 27ef356ce..42c62b708 100644 --- a/_includes/jade/core/sidebar.jade +++ b/_includes/jade/core/sidebar.jade @@ -29,5 +29,5 @@ ul.sidebar a(href='//github.com/OSUOSC', target='_blank') i.fa.fa-github li.flat-orange - a(href='{{ site.baseurl }}/rss.xml', target='_blank') + a(href='{{ site.baseurl }}/atom.xml', target='_blank') i.fa.fa-rss diff --git a/_includes/jade/index/about.jade b/_includes/jade/index/about.jade index 91c71db61..9df309447 100644 --- a/_includes/jade/index/about.jade +++ b/_includes/jade/index/about.jade @@ -2,9 +2,4 @@ .container .row .two-third.column.value - h5 - | The Open Source Club at the Ohio State University is a   - a(href='https://ohiounion.osu.edu/get_involved/student_organizations/directory?org_id=1042') registered student organization - | composed of members from all around campus and out into the community who share a common enthusiasm for   - a(href='https://www.fsf.org/about/what-is-free-software') free, open source software - | . Our focus is on building a strong community of open source users and developers in order to bring the benefits of open development, open standards, and free software to the university community. + h5 {{ site.description | markdownify }} diff --git a/_includes/jade/index/landing.jade b/_includes/jade/index/landing.jade index eeeac07dc..e74cae391 100644 --- a/_includes/jade/index/landing.jade +++ b/_includes/jade/index/landing.jade @@ -1,6 +1,8 @@ .landing - a(href='//github.com/OSUOSC/open-source-club-website') - .github-ribbon Fork us on Github + + .spork + a(href='//github.com/OSUOSC/open-source-club-website') + .clouds .cloud-1(data-speed='35000') .cloud-2(data-speed='45000', data-delay='15000') diff --git a/_includes/jade/pagination.jade b/_includes/jade/pagination.jade index 3553fe5b8..2b5c3284d 100644 --- a/_includes/jade/pagination.jade +++ b/_includes/jade/pagination.jade @@ -1,21 +1,25 @@ .pagination - | {% if paginator.previous_page %} + {% if paginator.previous_page %} + a.pagination-text(href='{{ site.baseurl }}{{ paginator.previous_page_path }}') previous a.previous(href='{{ site.baseurl }}{{ paginator.previous_page_path }}') i.fa.fa-caret-left - | {% else %} + {% else %} span.previous i.fa.fa-caret-left.disabled - | {% endif %} + {% endif %} span.page_number {{ paginator.page }} of {{ paginator.total_pages }} - | {% if paginator.next_page %} + {% if paginator.next_page %} a.next(href='{{ site.baseurl }}{{ paginator.next_page_path }}') i.fa.fa-caret-right - | {% else %} + a.pagination-text(href='{{ site.baseurl }}{{ paginator.next_page_path }}') next + + + {% else %} span.next i.fa.fa-caret-right.disabled - | {% endif %} + {% endif %} diff --git a/_includes/jade/posts.jade b/_includes/jade/posts.jade index ed0f29db4..20b391b1d 100644 --- a/_includes/jade/posts.jade +++ b/_includes/jade/posts.jade @@ -1,45 +1,53 @@ .section.posts .container + {% if page.is_post %} + .category-title + a(href='{{ site.baseurl }}/{{ post.categories | first }}') + h5 {{ page.tags }} + a(href='{{ site.baseurl }}{{ post.url }}') + h5 {{ page.title }} + {% endif %} + + {% if page.category %} - | {% if page.is_post %} .category-title - h5 {{ page.tags }} - h5 {{ page.title }} - | {% endif %} - - - - | {% for post in paginator.posts %} - ul - li - - | {% if post.categories contains 'volunteering' or post.categories contains 'events' %} - h2 - a(href='{{ site.baseurl }}/{{ post.categories | first }}') {{ post.title }} - - | {% else %} - h2 - a(href='{{ site.baseurl }}{{ post.url }}') {{ post.title }} - | {% endif %} - - span.date posted: {{ post.date | date: "%m-%d-%Y" }} - .content - | {{ post.content }} - | {% endfor %} - - - | {% if page.is_post %} - ul - li - h2 {{ page.title }} - span.date posted: {{ page.date | date: "%m-%d-%Y" }} - .content - | {{ page.content | markdownify }} - | {% endif %} - - - | {% if page.is_post %} - // TODO - | {% else %} - | {% include html/pagination.html %} - | {% endif %} + a(href='{{ site.baseurl }}/') + h5 {{ page.category }} + + {% endif %} + + + {% for post in paginator.posts %} + {% if post.categories contains 'volunteering' or post.categories contains 'events' %} + h2 + a(href='{{ site.baseurl }}/{{ post.categories | first }}') {{ post.title }} + {% else %} + h2 + a(href='{{ site.baseurl }}{{ post.url }}') {{ post.title }} + {% endif %} + + span.date posted: {{ post.date | date: "%m-%d-%Y" }} + + {% unless post.categories contains 'volunteering' or post.categories contains 'events' or post.categories contains 'meetings' or post.categories contains 'history' or post.categories contains 'tutorials' %} + + | {{ post.content }} + + {% endunless %} + + .tags {{ post.tags }} + + {% endfor %} + + + + {% if page.is_post %} + + h2.bold {{ page.title }} + span.date posted: {{ page.date | date: "%m-%d-%Y" }} + .content {{ page.content | markdownify }} + .tags {{ page.tags }} + {% endif %} + + {% unless page.is_post %} + | {% include html/pagination.html %} + {% endunless %} \ No newline at end of file diff --git a/_layouts/jade/default.jade b/_layouts/jade/default.jade index 045162a97..809714c3c 100644 --- a/_layouts/jade/default.jade +++ b/_layouts/jade/default.jade @@ -1,26 +1,30 @@ doctype html -| {% include html/core/head.html %} -| {% include html/core/sidebar.html %} -| {% include html/components/search.html %} -| {% include html/components/back_to_top.html %} -| {% if paginator.previous_page %} + +{% include html/core/head.html %} +{% include html/core/sidebar.html %} +{% include html/components/search.html %} +{% include html/components/back_to_top.html %} + +{% if paginator.previous_page %} // when NOT on the index page -#page-content-wrapper.index(style='width: 100%;') - | {% else %} +#page-content-wrapper.index + {% else %} // on the index page - | {% if page.is_post %} + {% if page.is_post %} // on {{ post.url }} #page-content-wrapper.single - | {% else %} + {% else %} // It is NOT a single post #page-content-wrapper.index.home - | {% include html/index/landing.html %} - | {% include html/index/about.html %} - | {% include html/index/mailchimp.html %} - | {% include html/index/no_script.html %} - | {% include html/index/contact.html %} - | {% endif %} - | {% endif %} - | {% include html/posts.html %} - | {% include html/core/scripts.html %} - | {% include html/core/footer.html %} + {% include html/index/landing.html %} + {% include html/index/about.html %} + {% include html/index/mailchimp.html %} + {% include html/index/no_script.html %} + {% include html/index/contact.html %} + + {% endif %} + {% endif %} + + {% include html/posts.html %} + {% include html/core/scripts.html %} + {% include html/core/footer.html %} diff --git a/_layouts/jade/error.jade b/_layouts/jade/error.jade index a6e6fc97e..f2478e178 100644 --- a/_layouts/jade/error.jade +++ b/_layouts/jade/error.jade @@ -1,12 +1,13 @@ doctype html + {% include html/core/head.html %} {% include html/core/sidebar.html %} {% include html/components/back_to_top.html %} #page-content-wrapper.single .section.posts - .container - {{ content }} + .container {{ content }} + {% include html/components/search.html %} {% include html/core/scripts.html %} {% include html/core/footer.html %} diff --git a/_layouts/jade/secondary/events.jade b/_layouts/jade/secondary/events.jade index 7f07b10c9..4ed29f00b 100644 --- a/_layouts/jade/secondary/events.jade +++ b/_layouts/jade/secondary/events.jade @@ -6,19 +6,21 @@ doctype html #page-content-wrapper.home .section.posts .container + .category-title - h5 {{ page.category }} + a(href='{{ site.baseurl }}/{{ page.category | downcase }}') + h5 {{ page.category }} + {% if site.categories.[page.category] == null %} span There are currently no events planned {% else %} + {% for post in site.categories.[page.category] %} - ul - li - h2 {{ post.title }} - span.date posted: {{ post.date | date: "%m-%d-%Y" }} - .content - {{ post.content }} + h2 {{ post.title }} + span.date posted: {{ post.date | date: "%m-%d-%Y" }} + .content {{ post.content }} {% endfor %} + {% endif %} {% include html/core/scripts.html %} //- {% include html/core/footer.html %} diff --git a/_layouts/jade/secondary/history.jade b/_layouts/jade/secondary/history.jade index de3bd50d8..798136782 100644 --- a/_layouts/jade/secondary/history.jade +++ b/_layouts/jade/secondary/history.jade @@ -6,13 +6,16 @@ doctype html #page-content-wrapper.home .section.posts .container + .category-title - h5 {{ page.category }} + a(href='{{ site.baseurl }}/{{ page.category | downcase }}') + h5 {{ page.category }} + {% for post in site.categories.[page.category] %} - ul - li - h2 - a(href='{{ site.baseurl }}{{ post.url }}') {{ post.title }} + h2 + a(href='{{ site.baseurl }}{{ post.url }}') {{ post.title }} + span.date updated: {% last_modified_at %m-%d-%Y %} {% endfor %} + {% include html/core/scripts.html %} //- {% include html/core/footer.html %} diff --git a/_layouts/jade/secondary/meetings.jade b/_layouts/jade/secondary/meetings.jade index de3bd50d8..8dd4e8bb8 100644 --- a/_layouts/jade/secondary/meetings.jade +++ b/_layouts/jade/secondary/meetings.jade @@ -6,13 +6,16 @@ doctype html #page-content-wrapper.home .section.posts .container + .category-title - h5 {{ page.category }} + a(href='{{ site.baseurl }}/{{ page.category | downcase }}') + h5 {{ page.category }} + {% for post in site.categories.[page.category] %} - ul - li - h2 - a(href='{{ site.baseurl }}{{ post.url }}') {{ post.title }} + h2 + a(href='{{ site.baseurl }}{{ post.url }}') {{ post.title }} + span.date updated: {% last_modified_at %m-%d-%Y %} {% endfor %} + {% include html/core/scripts.html %} //- {% include html/core/footer.html %} diff --git a/_layouts/jade/secondary/tutorials.jade b/_layouts/jade/secondary/tutorials.jade index 243380b80..82189314c 100644 --- a/_layouts/jade/secondary/tutorials.jade +++ b/_layouts/jade/secondary/tutorials.jade @@ -6,18 +6,21 @@ doctype html #page-content-wrapper.home .section.posts .container + .category-title - h5 {{ page.category }} + a(href='{{ site.baseurl }}/{{ page.category | downcase }}') + h5 {{ page.category }} + {% if site.categories.[page.category] == null %} span There are currently no tutorials {% else %} + {% for post in site.categories.[page.category] %} - ul - li - h2 - a(href='{{ site.baseurl }}{{ post.url }}') {{ post.title }} - span.date posted: {{ post.date | date: "%m-%d-%Y" }} + h2 + a(href='{{ site.baseurl }}{{ post.url }}') {{ post.title }} + span.date updated: {% last_modified_at %m-%d-%Y %} {% endfor %} + {% endif %} {% include html/core/scripts.html %} //- {% include html/core/footer.html %} diff --git a/_layouts/jade/secondary/volunteering.jade b/_layouts/jade/secondary/volunteering.jade index 64933751b..8f4050990 100644 --- a/_layouts/jade/secondary/volunteering.jade +++ b/_layouts/jade/secondary/volunteering.jade @@ -1,4 +1,5 @@ doctype html + {% include html/core/head.html %} {% include html/core/sidebar.html %} {% include html/components/search.html %} @@ -6,19 +7,21 @@ doctype html #page-content-wrapper.home .section.posts .container + .category-title - h5 {{ page.category }} + a(href='{{ site.baseurl }}/{{ page.category | downcase }}') + h5 {{ page.category }} + {% if site.categories.[page.category] == null %} span There are currently no volunteering oppertunities {% else %} + {% for post in site.categories.[page.category] %} - ul - li - h2 {{ post.title }} - span.date posted: {{ post.date | date: "%m-%d-%Y" }} - .content - {{ post.content }} + h2 {{ post.title }} + span.date posted: {{ post.date | date: "%m-%d-%Y" }} + .content {{ post.content }} {% endfor %} + {% endif %} {% include html/core/scripts.html %} //- {% include html/core/footer.html %} diff --git a/_posts/2015-09-08-command-line.md b/_posts/2015-09-08-command-line.md index b7a3d3a47..f00d9baf1 100644 --- a/_posts/2015-09-08-command-line.md +++ b/_posts/2015-09-08-command-line.md @@ -22,4 +22,4 @@ This Thursday, September 10 in Caldwell Labs 120, Bobby Reynolds and I will pres Laptops are encouraged but not required, and as always, there will be pizza. - -- Eli + -- Eli Gladman diff --git a/_posts/2015-09-15-lightning-talks.md b/_posts/2015-09-15-lightning-talks.md index ff33e4953..702244390 100644 --- a/_posts/2015-09-15-lightning-talks.md +++ b/_posts/2015-09-15-lightning-talks.md @@ -12,4 +12,4 @@ This Thursday, 2015/09/17 at 7:00PM in Caldwell Labs 120, we will be holding lig Laptops are encouraged but not required, and as always, there will be pizza. - -- Eli + -- Eli Gladman diff --git a/_posts/2015-09-20-opensource-at-facebook.md b/_posts/2015-09-20-opensource-at-facebook.md index 05bf4a488..c126c8d7b 100644 --- a/_posts/2015-09-20-opensource-at-facebook.md +++ b/_posts/2015-09-20-opensource-at-facebook.md @@ -16,4 +16,4 @@ Facebook serves requests for over 1.3 billion people every month. I will give a Laptops are encouraged but not required, and as always, there will be pizza. - -- Eli + -- Eli Gladman diff --git a/_posts/2015-10-01-filesystems.md b/_posts/2015-10-01-filesystems.md index 47c24554d..58a5bb92e 100644 --- a/_posts/2015-10-01-filesystems.md +++ b/_posts/2015-10-01-filesystems.md @@ -19,4 +19,4 @@ For those using COTA, the 18 Kenny/OSU line goes right by Tim Hortons, use stop register [here](https://ohiolinux.org/registration) - -- Eli + -- Eli Gladman diff --git a/_posts/2015-10-22-covermymeds.md b/_posts/2015-10-22-covermymeds.md index 30cddab3b..3f28fb380 100644 --- a/_posts/2015-10-22-covermymeds.md +++ b/_posts/2015-10-22-covermymeds.md @@ -13,4 +13,4 @@ This Thursday at 7:00PM in Caldwell Labs 120, Jay Bobo and Vasanth Pappu from Co Laptops are encouraged but not required, and as always, there will be pizza. --- Eli +-- Eli Gladman diff --git a/_posts/2015-10-23-startup-weekend.md b/_posts/2015-10-23-startup-weekend.md index e6be8c651..641457d1f 100644 --- a/_posts/2015-10-23-startup-weekend.md +++ b/_posts/2015-10-23-startup-weekend.md @@ -11,4 +11,4 @@ Tickets are $100 however if you [email us](mailto:info@opensource.osu.edu) we ca I will be in attendance, I hope to see you there. --- Eli +-- Eli Gladman diff --git a/_posts/2015-10-27-wireless-security-and-penetration-testing.md b/_posts/2015-10-27-wireless-security-and-penetration-testing.md index 6847de593..abc737472 100644 --- a/_posts/2015-10-27-wireless-security-and-penetration-testing.md +++ b/_posts/2015-10-27-wireless-security-and-penetration-testing.md @@ -12,4 +12,4 @@ The intention of this talk is to educate members with respect to securing their Laptops are encouraged but not required, and as always, there will be pizza. ---Eli +-- Eli Gladman diff --git a/_posts/2015-11-18-password-management.md b/_posts/2015-11-18-password-management.md index eb82ff82f..c6ae6a171 100644 --- a/_posts/2015-11-18-password-management.md +++ b/_posts/2015-11-18-password-management.md @@ -16,4 +16,4 @@ It's difficult to strike a comparable balance between convenience and security. Laptops are encouraged but not required, and as always, there will be pizza. ---Eli +-- Eli Gladman diff --git a/_posts/2015-11-20-no-meeting.md b/_posts/2015-11-20-no-meeting.md index e255c73f0..1f2a931bf 100644 --- a/_posts/2015-11-20-no-meeting.md +++ b/_posts/2015-11-20-no-meeting.md @@ -10,4 +10,4 @@ No meeting this Thursday, November 26th. Go home. The club systems will be undergoing scheduled maintenance this weekend, so expect downtime. Our sysadmin, William, will be reverting [Gluster](https://www.gluster.org/). Also, We will be upgrading Stallman's ram from 4GB ram to 12GB, in addition to replacing the power supply. ---Eli +-- Eli Gladman diff --git a/_posts/2015-12-09-meteor.md b/_posts/2015-12-09-meteor.md index 05ae6a1e6..449a28d17 100644 --- a/_posts/2015-12-09-meteor.md +++ b/_posts/2015-12-09-meteor.md @@ -13,4 +13,4 @@ Laptops are encouraged but not required, and as always, there will be pizza. Good luck on exams. ---Eli +-- Eli Gladman diff --git a/_posts/2016-01-10-welcome-back.md b/_posts/2016-01-10-welcome-back.md index a7a81bb55..473799b4f 100644 --- a/_posts/2016-01-10-welcome-back.md +++ b/_posts/2016-01-10-welcome-back.md @@ -11,4 +11,4 @@ attendance. Laptops are encouraged but not required, and as always, there will be pizza. ---Eli +-- Eli Gladman