Skip to content

Redesign Summer 2018 #151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Jul 22, 2018
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
1 change: 1 addition & 0 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ description: > # this means to ignore newlines until "baseurl:"
url: 'http://ritlug.com'
# Build settings
markdown: kramdown
permalink: pretty # no .html extension needed/wanted
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yaaaasssss! 🔥 🐧 🔥


# These allow RITlug's schedule to be updated site-wide from one
# location. They will appear in pages as they are typed, so it
Expand Down
18 changes: 9 additions & 9 deletions _data/footer/linux_resources.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
- name: ArchWiki
link: http://wiki.archlinux.org
link: https://wiki.archlinux.org

- name: Kernel Newbies
link: http://kernelnewbies.org
link: https://kernelnewbies.org

- name: Linux Subreddit
link: http://reddit.com/r/linux
link: https://reddit.com/r/linux

- name: DistroWatch
link: http://distrowatch.org
link: https://distrowatch.org

- name: RIT Mirror
link: http://mirrors.rit.edu
- name: RIT Linux Mirror
link: https://mirrors.rit.edu
14 changes: 7 additions & 7 deletions _data/footer/rit.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
- name: www.rit.edu
link: http://www.rit.edu
- name: RIT School of Computing
link: http://www.rit.edu/gccis
- name: RIT Club Page
- name: University Website
link: https://www.rit.edu

- name: GCCIS College of Computing
link: https://www.rit.edu/gccis

- name: CampusGroups
link: https://campusgroups.rit.edu/student_community?club_id=16071
21 changes: 12 additions & 9 deletions _data/tabs.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
- name: Home
link: /

- name: Announcements
link: /announcements/

- name: Talks
link: /talks/

- name: About
link: /about.html


- name: Projects
link: /projects/

#- name: About
# link: /about/

- name: Get Involved
link: /get-involved.html
link: /get-involved/

- name: CampusGroups
link: https://campusgroups.rit.edu/student_community?club_id=16071
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it is best to keep CampusGroups in the footer or clearly linked from the website. Even if we are not actively using it, it is still the platform we use for critical club functions, like elections. It will be helpful to keep this visible and present on our website.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's still on both the footer ("RIT Club Page") and on the "get involved" page. I don't want it on the top navbar because it takes up a decent amount of space and we haven't really done much with it. Do you have any suggestions?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, I missed it in the footer. Instead, could you make the footer and "get involved" page more explicit as "CampusGroups" instead of "RIT Club Page"?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

#- name: CampusGroups
# link: https://campusgroups.rit.edu/student_community?club_id=16071
115 changes: 55 additions & 60 deletions _includes/footer.html
Original file line number Diff line number Diff line change
@@ -1,63 +1,58 @@
</main>
<footer class="mdl-mega-footer">
<div class="mdl-mega-footer--middle-section">
<div class="mdl-mega-footer--drop-down-section">
<input class="mdl-mega-footer--heading-checkbox" type="checkbox" checked>
<h1 class="mdl-mega-footer--heading">Navigate</h1>
<ul class="mdl-mega-footer--link-list">
<!-- site navigation tabs -->
{% for tab in site.data.tabs %}
<li>
<a href="{{ tab.link }}">{{ tab.name }}</a>
</li>
{% endfor %}
</ul>
</div>
<div class="mdl-mega-footer--drop-down-section">
<input class="mdl-mega-footer--heading-checkbox" type="checkbox" checked>
<h1 class="mdl-mega-footer--heading">RIT</h1>
<ul class="mdl-mega-footer--link-list">
<!-- RIT footer links -->
{% for item in site.data.footer.rit %}
<li>
<a href="{{ item.link }}">{{ item.name }}</a>
</li>
{% endfor %}
</ul>
</div>
<div class="mdl-mega-footer--drop-down-section">
<input class="mdl-mega-footer--heading-checkbox" type="checkbox" checked>
<h1 class="mdl-mega-footer--heading">Linux Resources</h1>
<ul class="mdl-mega-footer--link-list">
<!-- linux resources -->
{% for item in site.data.footer.linux_resources %}
<li>
<a href="{{ item.link }}">{{ item.name }}</a>
</li>
{% endfor %}
</ul>
</div>
<div class="mdl-mega-footer--drop-down-section">
<input class="mdl-mega-footer--heading-checkbox" type="checkbox" checked>
<h1 class="mdl-mega-footer--heading">Feeds</h1>
<ul class="mdl-mega-footer--link-list">
<!-- feeds -->
{% for item in site.data.footer.feeds %}
<li>
<a href="{{ item.link }}">{{ item.name }}</a>
</li>
{% endfor %}
</ul>
</div>
<footer class="container-fluid bg-dark">
<div class="container">
<div class="row">
<div class="col-12 col-md-4 col-lg-3">
<p><strong>Navigate</strong></p>
<ul>
<!-- site navigation tabs -->
{% for tab in site.data.tabs %}
<li>
<a href="{{ tab.link }}">{{ tab.name }}</a>
</li>
{% endfor %}
</ul>
</div>
<div class="col-12 col-md-4 col-lg-3">
<p><strong>RIT</strong></p>
<ul>
<!-- RIT footer links -->
{% for item in site.data.footer.rit %}
<li>
<a href="{{ item.link }}">{{ item.name }}</a>
</li>
{% endfor %}
</ul>
</div>
<div class="col-12 col-md-4 col-lg-3">
<p><strong>Linux Resources</strong></p>
<ul>
<!-- linux resources -->
{% for item in site.data.footer.linux_resources %}
<li>
<a href="{{ item.link }}">{{ item.name }}</a>
</li>
{% endfor %}
</ul>
</div>
<div class="col-12 col-md-4 col-lg-3">
<p><strong>Feeds</strong></p>
<ul>
<!-- feeds -->
{% for item in site.data.footer.feeds %}
<li>
<a href="{{ item.link }}">{{ item.name }}</a>
</li>
{% endfor %}
</ul>
</div>
</div>
<div class="mdl-mega-footer--bottom-section">
<div class="mdl-logo">
Site Information
</div>
<ul class="mdl-mega-footer--link-list">
<li>With the exception of posts and talks (whose copyrights are held by their creators and not RITlug), site content is under a CC0 1.0 Universal license.</li>
<li><a href="http://getmdl.io">Material Design Lite Template</a></li>
</ul>
<div class="row">
<div class="col-12">
<p>
<strong>Site Information:</strong><br />
With the exception of posts and talks (whose copyrights are held by their creators and not RITlug), site content is under a CC0 1.0 Universal license.
</p>
</div>
</div>
</footer>
</div>
</footer>
67 changes: 9 additions & 58 deletions _includes/head.html
Original file line number Diff line number Diff line change
@@ -1,67 +1,18 @@
<!doctype html>
<!--
Material Design Lite
Copyright 2015 Google Inc. All rights reserved.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

https://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License
-->
<html lang="en">
<head>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="description" content="{{ site.description }}">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta property="og:image" content="{{ site.url }}/img/ritlug-large.png" />
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<title>{{ page.title }} | {{site.title-abbrev}}</title>
<meta name="description" content="{{ site.description }}">

<!-- Add to homescreen for Chrome on Android -->
<meta name="mobile-web-app-capable" content="yes">
<link rel="icon" sizes="192x192" href="images/android-desktop.png">

<!-- Add to homescreen for Safari on iOS -->
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black">
<meta name="apple-mobile-web-app-title" content="Material Design Lite">
<link rel="apple-touch-icon-precomposed" href="images/ios-desktop.png">

<!-- Tile icon for Win8 (144x144 + tile color) -->
<meta name="msapplication-TileImage" content="images/touch/ms-touch-icon-144x144-precomposed.png">
<meta name="msapplication-TileColor" content="#3372DF">

<!-- favicon -->
<link rel="shortcut icon" href="/img/ritlug.png" />
<meta property="og:image" content="{{ site.url }}/img/ritlug-large.png" />
<link rel="apple-touch-icon" href="/img/ritlug.png">

<!-- SEO: If your mobile URL is different from the desktop URL, add a canonical link to the desktop page https://developers.google.com/webmasters/smartphone-sites/feature-phones -->
<!--
<link rel="canonical" href="http://www.example.com/">
-->

<link href="https://fonts.googleapis.com/css?family=Roboto:regular,bold,italic,thin,light,bolditalic,black,medium&amp;lang=en" rel="stylesheet">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">

<!-- Material Design Lite v1.3.0 -->
<link rel="stylesheet" href="https://code.getmdl.io/1.3.0/material.brown-orange.min.css" />
<script defer src="https://code.getmdl.io/1.3.0/material.min.js"></script>

<link href="https://fonts.googleapis.com/css?family=Overpass|Roboto:400,700" rel="stylesheet">
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.1/css/bootstrap.min.css" integrity="sha384-WskhaSGFgHYWDcbwN70/dfYBj47jz9qbsMId/iRN3ewGhXQFZCSftd1LZCfmhktB" crossorigin="anonymous">
<link rel="stylesheet" href="/css/styles.css">
<style>
#view-source {
position: fixed;
display: block;
right: 0;
bottom: 0;
margin-right: 40px;
margin-bottom: 40px;
z-index: 900;
}
</style>
</head>
</head>
43 changes: 28 additions & 15 deletions _includes/header.html
Original file line number Diff line number Diff line change
@@ -1,16 +1,29 @@
<header class="mdl-layout__header mdl-layout__header--scroll mdl-color--primary">
<a href="https://github.com/ritlug/ritlug.github.io"><img class="mdl-layout--large-screen-only" style="z-index: 10; position: absolute; top: 0; right: 0; border: 0;" src="https://camo.githubusercontent.com/652c5b9acfaddf3a9c326fa6bde407b87f7be0f4/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f6f72616e67655f6666373630302e706e67" alt="Fork me on GitHub" data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_right_orange_ff7600.png"></a>
<div class="mdl-layout--large-screen-only mdl-layout__header-row mdl-color--black" style="height: 80px;">
<img src="/img/ritlug-banner.png" alt="{{title}}" style="height: 64px;" />
</div>
<div class="mdl-layout__tab-bar mdl-js-ripple-effect mdl-color-text--white" style="background-color: #f36e21" >
{% for tab in site.data.tabs %}
{% if page.url == tab.link %}
<a href="{{ tab.link }}" class="mdl-layout__tab is-active">{{ tab.name }}</a>
{% else %}
<a href="{{ tab.link }}" class="mdl-layout__tab">{{ tab.name }}</a>
{% endif %}
{% endfor %}
</div>
<header>
<nav class="navbar navbar-expand-lg navbar-light">
<a class="navbar-brand" href="/">
<img src="/img/ritlug-banner.png" alt="Home" class="d-inline-block align-top" style="height:64px;" />
</a>

<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>

<div class="collapse navbar-collapse" id="navbarNav">
<ul class="navbar-nav">
{% for tab in site.data.tabs %}
{% if page.url == tab.link %}
<li class="nav-item active">
{% else %}
<li class="nav-item">
{% endif %}
<a class="nav-link" href="{{ tab.link }}">{{ tab.name }}</a>
</li>
{% endfor %}
</ul>
</div>
</nav>

<a href="https://github.com/ritlug/ritlug.github.io" class="d-none d-lg-block">
<img style="z-index: 10; position: absolute; top: 0; right: 0; border: 0;" src="https://camo.githubusercontent.com/652c5b9acfaddf3a9c326fa6bde407b87f7be0f4/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f6f72616e67655f6666373630302e706e67" alt="Fork me on GitHub" data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_right_orange_ff7600.png">
</a>
</header>

18 changes: 8 additions & 10 deletions _layouts/default.html
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
{% include head.html %}
<body class="mdl-demo mdl-color--grey-100 mdl-color-text--grey-700 mdl-base">
<div class="mdl-layout mdl-js-layout mdl-layout--fixed-header">
{% include head.html %}
<body class="bg-light">

{% include header.html %}

<main class="mdl-layout__content" style="flex: 1 0 auto;">
<div class="mdl-layout__tab-panel is-active mdl-color--grey-200">

<main>
{{ content }}

</div>
</main>

{% include footer.html %}

</body>

<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.1/js/bootstrap.min.js" integrity="sha384-smHYKdLADwkXOn1EmN1qk/HfnUcbVRZyYmZ4qpPea6sjB/pTJ0euyQp0Mk8ck+5T" crossorigin="anonymous"></script>
</body>
</html>
11 changes: 0 additions & 11 deletions _layouts/page-sidebar.html

This file was deleted.

12 changes: 6 additions & 6 deletions _layouts/page.html
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
---
layout: default
---
<section class="section--center mdl-grid mdl-grid--no-spacing">
<div class="mdl-cell mdl-cell--12-col">
<h4>{{ page.title }}</h4>
{{ content }}
</div>
</section>
<article class="container card">
<div class="card-body">
<h1 class="card-title">{{ page.title }}</h1>
{{ content }}
</div>
</article>
Loading