Skip to content

Commit 725c37e

Browse files
justjwheelinjustjwheelin
authored
Merge pull request #151 from RITlug/redesign-fall2018
Redesign Summer 2018
2 parents 3bbf877 + 9a0cdf2 commit 725c37e

File tree

106 files changed

+452
-533
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+452
-533
lines changed

‎_config.yml

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ description: > # this means to ignore newlines until "baseurl:"
1010
url: 'http://ritlug.com'
1111
# Build settings
1212
markdown: kramdown
13+
permalink: pretty # no .html extension needed/wanted
1314

1415
# These allow RITlug's schedule to be updated site-wide from one
1516
# location. They will appear in pages as they are typed, so it

‎_data/footer/linux_resources.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
- name: ArchWiki
2-
link: http://wiki.archlinux.org
3-
2+
link: https://wiki.archlinux.org
3+
44
- name: Kernel Newbies
5-
link: http://kernelnewbies.org
6-
5+
link: https://kernelnewbies.org
6+
77
- name: Linux Subreddit
8-
link: http://reddit.com/r/linux
9-
8+
link: https://reddit.com/r/linux
9+
1010
- name: DistroWatch
11-
link: http://distrowatch.org
11+
link: https://distrowatch.org
1212

13-
- name: RIT Mirror
14-
link: http://mirrors.rit.edu
13+
- name: RIT Linux Mirror
14+
link: https://mirrors.rit.edu

‎_data/footer/rit.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
- name: www.rit.edu
2-
link: http://www.rit.edu
3-
4-
- name: RIT School of Computing
5-
link: http://www.rit.edu/gccis
6-
7-
- name: RIT Club Page
1+
- name: University Website
2+
link: https://www.rit.edu
3+
4+
- name: GCCIS College of Computing
5+
link: https://www.rit.edu/gccis
6+
7+
- name: CampusGroups
88
link: https://campusgroups.rit.edu/student_community?club_id=16071

‎_data/tabs.yml

+12-9
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
11
- name: Home
22
link: /
3-
3+
44
- name: Announcements
55
link: /announcements/
6-
6+
77
- name: Talks
88
link: /talks/
9-
10-
- name: About
11-
link: /about.html
12-
9+
10+
- name: Projects
11+
link: /projects/
12+
13+
#- name: About
14+
# link: /about/
15+
1316
- name: Get Involved
14-
link: /get-involved.html
17+
link: /get-involved/
1518

16-
- name: CampusGroups
17-
link: https://campusgroups.rit.edu/student_community?club_id=16071
19+
#- name: CampusGroups
20+
# link: https://campusgroups.rit.edu/student_community?club_id=16071

‎_includes/footer.html

+55-60
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,58 @@
1-
</main>
2-
<footer class="mdl-mega-footer">
3-
<div class="mdl-mega-footer--middle-section">
4-
<div class="mdl-mega-footer--drop-down-section">
5-
<input class="mdl-mega-footer--heading-checkbox" type="checkbox" checked>
6-
<h1 class="mdl-mega-footer--heading">Navigate</h1>
7-
<ul class="mdl-mega-footer--link-list">
8-
<!-- site navigation tabs -->
9-
{% for tab in site.data.tabs %}
10-
<li>
11-
<a href="{{ tab.link }}">{{ tab.name }}</a>
12-
</li>
13-
{% endfor %}
14-
</ul>
15-
</div>
16-
<div class="mdl-mega-footer--drop-down-section">
17-
<input class="mdl-mega-footer--heading-checkbox" type="checkbox" checked>
18-
<h1 class="mdl-mega-footer--heading">RIT</h1>
19-
<ul class="mdl-mega-footer--link-list">
20-
<!-- RIT footer links -->
21-
{% for item in site.data.footer.rit %}
22-
<li>
23-
<a href="{{ item.link }}">{{ item.name }}</a>
24-
</li>
25-
{% endfor %}
26-
</ul>
27-
</div>
28-
<div class="mdl-mega-footer--drop-down-section">
29-
<input class="mdl-mega-footer--heading-checkbox" type="checkbox" checked>
30-
<h1 class="mdl-mega-footer--heading">Linux Resources</h1>
31-
<ul class="mdl-mega-footer--link-list">
32-
<!-- linux resources -->
33-
{% for item in site.data.footer.linux_resources %}
34-
<li>
35-
<a href="{{ item.link }}">{{ item.name }}</a>
36-
</li>
37-
{% endfor %}
38-
</ul>
39-
</div>
40-
<div class="mdl-mega-footer--drop-down-section">
41-
<input class="mdl-mega-footer--heading-checkbox" type="checkbox" checked>
42-
<h1 class="mdl-mega-footer--heading">Feeds</h1>
43-
<ul class="mdl-mega-footer--link-list">
44-
<!-- feeds -->
45-
{% for item in site.data.footer.feeds %}
46-
<li>
47-
<a href="{{ item.link }}">{{ item.name }}</a>
48-
</li>
49-
{% endfor %}
50-
</ul>
51-
</div>
1+
<footer class="container-fluid bg-dark">
2+
<div class="container">
3+
<div class="row">
4+
<div class="col-12 col-md-4 col-lg-3">
5+
<p><strong>Navigate</strong></p>
6+
<ul>
7+
<!-- site navigation tabs -->
8+
{% for tab in site.data.tabs %}
9+
<li>
10+
<a href="{{ tab.link }}">{{ tab.name }}</a>
11+
</li>
12+
{% endfor %}
13+
</ul>
14+
</div>
15+
<div class="col-12 col-md-4 col-lg-3">
16+
<p><strong>RIT</strong></p>
17+
<ul>
18+
<!-- RIT footer links -->
19+
{% for item in site.data.footer.rit %}
20+
<li>
21+
<a href="{{ item.link }}">{{ item.name }}</a>
22+
</li>
23+
{% endfor %}
24+
</ul>
25+
</div>
26+
<div class="col-12 col-md-4 col-lg-3">
27+
<p><strong>Linux Resources</strong></p>
28+
<ul>
29+
<!-- linux resources -->
30+
{% for item in site.data.footer.linux_resources %}
31+
<li>
32+
<a href="{{ item.link }}">{{ item.name }}</a>
33+
</li>
34+
{% endfor %}
35+
</ul>
36+
</div>
37+
<div class="col-12 col-md-4 col-lg-3">
38+
<p><strong>Feeds</strong></p>
39+
<ul>
40+
<!-- feeds -->
41+
{% for item in site.data.footer.feeds %}
42+
<li>
43+
<a href="{{ item.link }}">{{ item.name }}</a>
44+
</li>
45+
{% endfor %}
46+
</ul>
47+
</div>
5248
</div>
53-
<div class="mdl-mega-footer--bottom-section">
54-
<div class="mdl-logo">
55-
Site Information
56-
</div>
57-
<ul class="mdl-mega-footer--link-list">
58-
<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>
59-
<li><a href="http://getmdl.io">Material Design Lite Template</a></li>
60-
</ul>
49+
<div class="row">
50+
<div class="col-12">
51+
<p>
52+
<strong>Site Information:</strong><br />
53+
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.
54+
</p>
55+
</div>
6156
</div>
62-
</footer>
6357
</div>
58+
</footer>

‎_includes/head.html

+9-58
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,18 @@
11
<!doctype html>
2-
<!--
3-
Material Design Lite
4-
Copyright 2015 Google Inc. All rights reserved.
5-
6-
Licensed under the Apache License, Version 2.0 (the "License");
7-
you may not use this file except in compliance with the License.
8-
You may obtain a copy of the License at
9-
10-
https://www.apache.org/licenses/LICENSE-2.0
11-
12-
Unless required by applicable law or agreed to in writing, software
13-
distributed under the License is distributed on an "AS IS" BASIS,
14-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15-
See the License for the specific language governing permissions and
16-
limitations under the License
17-
-->
182
<html lang="en">
19-
<head>
3+
<head>
204
<meta charset="utf-8">
215
<meta http-equiv="X-UA-Compatible" content="IE=edge">
22-
<meta name="description" content="{{ site.description }}">
23-
<meta name="viewport" content="width=device-width, initial-scale=1">
24-
<meta property="og:image" content="{{ site.url }}/img/ritlug-large.png" />
6+
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
257
<title>{{ page.title }} | {{site.title-abbrev}}</title>
8+
<meta name="description" content="{{ site.description }}">
269

27-
<!-- Add to homescreen for Chrome on Android -->
28-
<meta name="mobile-web-app-capable" content="yes">
29-
<link rel="icon" sizes="192x192" href="images/android-desktop.png">
30-
31-
<!-- Add to homescreen for Safari on iOS -->
32-
<meta name="apple-mobile-web-app-capable" content="yes">
33-
<meta name="apple-mobile-web-app-status-bar-style" content="black">
34-
<meta name="apple-mobile-web-app-title" content="Material Design Lite">
35-
<link rel="apple-touch-icon-precomposed" href="images/ios-desktop.png">
36-
37-
<!-- Tile icon for Win8 (144x144 + tile color) -->
38-
<meta name="msapplication-TileImage" content="images/touch/ms-touch-icon-144x144-precomposed.png">
39-
<meta name="msapplication-TileColor" content="#3372DF">
40-
10+
<!-- favicon -->
4111
<link rel="shortcut icon" href="/img/ritlug.png" />
12+
<meta property="og:image" content="{{ site.url }}/img/ritlug-large.png" />
13+
<link rel="apple-touch-icon" href="/img/ritlug.png">
4214

43-
<!-- 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 -->
44-
<!--
45-
<link rel="canonical" href="http://www.example.com/">
46-
-->
47-
48-
<link href="https://fonts.googleapis.com/css?family=Roboto:regular,bold,italic,thin,light,bolditalic,black,medium&amp;lang=en" rel="stylesheet">
49-
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
50-
51-
<!-- Material Design Lite v1.3.0 -->
52-
<link rel="stylesheet" href="https://code.getmdl.io/1.3.0/material.brown-orange.min.css" />
53-
<script defer src="https://code.getmdl.io/1.3.0/material.min.js"></script>
54-
15+
<link href="https://fonts.googleapis.com/css?family=Overpass|Roboto:400,700" rel="stylesheet">
16+
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.1/css/bootstrap.min.css" integrity="sha384-WskhaSGFgHYWDcbwN70/dfYBj47jz9qbsMId/iRN3ewGhXQFZCSftd1LZCfmhktB" crossorigin="anonymous">
5517
<link rel="stylesheet" href="/css/styles.css">
56-
<style>
57-
#view-source {
58-
position: fixed;
59-
display: block;
60-
right: 0;
61-
bottom: 0;
62-
margin-right: 40px;
63-
margin-bottom: 40px;
64-
z-index: 900;
65-
}
66-
</style>
67-
</head>
18+
</head>

‎_includes/header.html

+28-15
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,29 @@
1-
<header class="mdl-layout__header mdl-layout__header--scroll mdl-color--primary">
2-
<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>
3-
<div class="mdl-layout--large-screen-only mdl-layout__header-row mdl-color--black" style="height: 80px;">
4-
<img src="/img/ritlug-banner.png" alt="{{title}}" style="height: 64px;" />
5-
</div>
6-
<div class="mdl-layout__tab-bar mdl-js-ripple-effect mdl-color-text--white" style="background-color: #f36e21" >
7-
{% for tab in site.data.tabs %}
8-
{% if page.url == tab.link %}
9-
<a href="{{ tab.link }}" class="mdl-layout__tab is-active">{{ tab.name }}</a>
10-
{% else %}
11-
<a href="{{ tab.link }}" class="mdl-layout__tab">{{ tab.name }}</a>
12-
{% endif %}
13-
{% endfor %}
14-
</div>
1+
<header>
2+
<nav class="navbar navbar-expand-lg navbar-light">
3+
<a class="navbar-brand" href="/">
4+
<img src="/img/ritlug-banner.png" alt="Home" class="d-inline-block align-top" style="height:64px;" />
5+
</a>
6+
7+
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
8+
<span class="navbar-toggler-icon"></span>
9+
</button>
10+
11+
<div class="collapse navbar-collapse" id="navbarNav">
12+
<ul class="navbar-nav">
13+
{% for tab in site.data.tabs %}
14+
{% if page.url == tab.link %}
15+
<li class="nav-item active">
16+
{% else %}
17+
<li class="nav-item">
18+
{% endif %}
19+
<a class="nav-link" href="{{ tab.link }}">{{ tab.name }}</a>
20+
</li>
21+
{% endfor %}
22+
</ul>
23+
</div>
24+
</nav>
25+
26+
<a href="https://github.com/ritlug/ritlug.github.io" class="d-none d-lg-block">
27+
<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">
28+
</a>
1529
</header>
16-

‎_layouts/default.html

+8-10
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
1-
{% include head.html %}
2-
<body class="mdl-demo mdl-color--grey-100 mdl-color-text--grey-700 mdl-base">
3-
<div class="mdl-layout mdl-js-layout mdl-layout--fixed-header">
1+
{% include head.html %}
2+
<body class="bg-light">
43

54
{% include header.html %}
65

7-
<main class="mdl-layout__content" style="flex: 1 0 auto;">
8-
<div class="mdl-layout__tab-panel is-active mdl-color--grey-200">
9-
6+
<main>
107
{{ content }}
11-
12-
</div>
8+
</main>
139

1410
{% include footer.html %}
1511

16-
</body>
17-
12+
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
13+
<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>
14+
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.1/js/bootstrap.min.js" integrity="sha384-smHYKdLADwkXOn1EmN1qk/HfnUcbVRZyYmZ4qpPea6sjB/pTJ0euyQp0Mk8ck+5T" crossorigin="anonymous"></script>
15+
</body>
1816
</html>

‎_layouts/page-sidebar.html

-11
This file was deleted.

‎_layouts/page.html

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
---
22
layout: default
33
---
4-
<section class="section--center mdl-grid mdl-grid--no-spacing">
5-
<div class="mdl-cell mdl-cell--12-col">
6-
<h4>{{ page.title }}</h4>
7-
{{ content }}
8-
</div>
9-
</section>
4+
<article class="container card">
5+
<div class="card-body">
6+
<h1 class="card-title">{{ page.title }}</h1>
7+
{{ content }}
8+
</div>
9+
</article>

0 commit comments

Comments
 (0)