Skip to content

Commit

Permalink
Initial Commit. Main page ready.
Browse files Browse the repository at this point in the history
  • Loading branch information
NanoSmasher committed Dec 25, 2015
0 parents commit 44adb06
Show file tree
Hide file tree
Showing 88 changed files with 9,558 additions and 0 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
_site
.sass-cache
9 changes: 9 additions & 0 deletions .htaccess
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
ErrorDocument 404 /404.html
RewriteEngine on
RewriteCond %{REQUEST_FILENAME} !-d
RewriteCond %{REQUEST_FILENAME}\.html -f
RewriteRule ^([^/]+)/$ $1.html
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteCond %{REQUEST_URI} !(\.[a-zA-Z0-9]{1,5}|/)$
RewriteRule (.*)$ /$1/ [R=301,L]
21 changes: 21 additions & 0 deletions LICENSE_materialize
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
The MIT License (MIT)

Copyright (c) 2014-2015 Materialize

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
44 changes: 44 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
MSE Club Website theme
======================

A website inspired from two differnt ideas: the paper-like [Google material design](https://www.google.com/design/spec/material-design/introduction.html) (like all new sites are popping up with) and the vibrant tiled [Smallpdf](http://smallpdf.com)

I used [materialize](http://materializecss.com) as a framework for this website. It was a nice structure to work with but I was having trouble with coloring certain things. Also the card feature (which is 99% of why I picked material design) Is a real pain to work with. Nevertheless, the website will be running for the [UofT MSE Club]. Take a look.

Managing the website
--------------------

This website was built with Jekyll. Jekyll is a static site builder that uses:

- Liquid Templating System
- Markdown Post Rendering
- Leagues Of Legends (lol)

For an example, let's look at inde.html:

**index.html** for example will have the html start building from **_layouts/default.html**. As you can see in the file, there is a {{ include }} liquid tag. That means it will pull all the data from the filename found in the **_include** folder. But here's the catch; since you are still reading it from the **/index.html** the base path is "**/**" and not **_layouts** or **_includes**. Take a look at **_site/index.html** to see the built file that is actually served to the user.

The **about.html** page starts at **_layouts/page.html**, while all of the tournament threads read from **_layouts/post.html**. Hierarchy of this site looks like this: *layout file* > *include files* > *actual files(html/css/js)* > *variables*.

### Editing the site

Uhhhh

### Setting up is as easy as 1, 2, 3!

1. Install Ruby, RubyDevKit, and Jekyll. Windows users can just download [Portable Jekyll](https://github.com/madhur/PortableJekyll/releases) and run setpath.cmd. (Some zip programs have problems extracting so make sure to cross check with the repository)
2. Go to the root folder where **index.html** is found and type in:

```shell
jekyll build
```
3. FTP (or manually copy files one by one) everything in the **_site** folder to wherever you want. It wil most likely be the **/public_html** folder.

Materialize
-----------

I used materialize for the css.
Changes in the materialize files can be found at **\_sass\components\CHANGES.txt**.
README can be found at **README_materialize.md**.

Voila! Thanks for reading ~ Nanosmasher
52 changes: 52 additions & 0 deletions README_materialize.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
![alt tag](https://raw.github.com/dogfalo/materialize/master/images/materialize.gif)
===========

[![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/Dogfalo/materialize?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
Materialize, a CSS Framework based on material design

### Current Version : v0.97.0

## Sass Requirements:
- Ruby Sass 3.3+, LibSass 0.6+

## Supported Browsers:
Chrome 35+, Firefox 31+, Safari 7+, IE 10+

## Changelog
- v0.97.0 (June 21, 2015)
- **Documentation changed to use Official Google Icon web font**
- **Input errors added**
- Flicker on Firefox on dropdowns fixed
- Pagination made more responsive
- Modal now prevents scrolling
- Modal animation added
- Support for multiple modals added
- Programmatic control of FAB to open/close added
- Programmatic control of slider to play/pause added
- Plus many more bug fixes
- v0.96.1 (April 6, 2015)
- Dropdown Fixes
- Materialize functions fixed for Meteor
- v0.96.0 (April 1, 2015)
- **Toasts, transitions, scrollfire added under Materialize namespace**
- **Dropdown is now created as a child of its parent**
- Collapsibles supports nesting
- Modal Bottom Sheet added
- Indeterminate Checkboxes added
- New Checkbox Style Added
- Text Inputs supports placeholder/readonly
- Google Inbox-like Collapsible added
- Text Character Counter added
- Waves no longer breaks on SVG's

- v0.95.3 (Feb 25, 2015)
- Parallax image loading / responsiveness fixes
- Date picker supports month/year as dropdown
- Dismissable collection items
- Avatar collection items
- Pagination Added
- ScrollFire fixes


## Contributing
[Please read CONTRIBUTING.md for more information](CONTRIBUTING.md)
75 changes: 75 additions & 0 deletions _config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
# Global settings
title: MSE Club
email: mse@mse.skule.ca
senpai: Henry Lu
project: https://github.com/nanosmasher/mse.skule.ca

address:
- WB39 Wallberg building
- 200 College Street
- Toronto Ontario, Canada
- M56 3E5

social:
facebook: #
twitter: #
instagram: #

# Build settings
markdown: kramdown
permalink: '/news/:short_year:month:day/'
relative_permalinks: false
#include: [.htaccess]
excerpt_separator: "<!-- more -->"

# Text
keywords: ['Materials','Science','Engineering','Club','MSE','MSEClub','UofT','Academic','Anti-Calendar','Guide','Courses','Buckyball']
description: 'The Materials Science and Engineering Club (MSE Club) at the University of Toronto represents the interests of over 200 MSE undergraduate students in the Faculty of Applied Science and Engineering. The club excecutives organize events like barbeques, smokers, tournaments, movie nights, sports, and the annual MSE dinner dance. They provide services such as locker rentals, common room cleanups, and anouncement boards for the community.'

color:
primary: 'blue'
accent: 'purple'

apps:
- name: 'News'
icon: 'receipt'
color: 'blue darken-4'
url: '/news/'
- name: 'Events'
icon: 'event'
color: 'blue darken-3'
url: '/events/'
- name: 'Sports'
icon: 'football'
svg: 'yes'
color: 'blue darken-2'
url: '/sports/'
- name: 'MSE Shop'
icon: 'shopping_basket'
color: 'blue darken-1'
url: '/shop/'
- name: 'Study Rooms'
icon: 'schedule'
color: 'blue'
url: '/study/'
- name: 'What is MSE?'
icon: 'book'
color: 'blue lighten-1'
url: '/guide/'
- name: 'Courses'
icon: 'school'
color: 'blue lighten-2'
url: '/courses/'
- name: 'Pictures'
icon: 'photo_library'
color: 'blue lighten-3'
url: '/pics/'
- name: 'Useful Links'
icon: 'link-variant'
svg: 'yes'
color: 'blue accent-1'
url: '/links/'
- name: 'Club Execs'
icon: 'face'
color: 'blue accent-2'
url: '/club/'
21 changes: 21 additions & 0 deletions _includes/apps.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{% if include.size == "large" %}
{% assign d='90px' %}{% assign s='5' %}
{% else %}
{% assign d='60px' %}{% assign s='6' %}
{% endif %}
<div class="row center-align">
{% for i in site.apps limit:include.limit offset:include.offset %}
<div class="none col {{ include.grid }} {{ i.color }} box hoverable">
<a href="{{ i.url }}">
<div>
{% if i.svg == "yes" %}
<img class="cicon" src="/img/svg/{{i.icon}}.svg" height="{{d}}" width="{{d}}" />
{% else %}
<i class="{{ include.size }} material-icons">{{ i.icon }}</i>
{% endif %}
<h{{s}} class="app-title">{{ i.name }}</h5>
</div>
</a>
</div>
{% endfor %}
</div>
41 changes: 41 additions & 0 deletions _includes/footer.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<!-- Javascript -->
<script type="text/javascript" src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
<script>window.jQuery || document.write('<script src={{ "/js/jquery-2.1.1.min.js" | prepend: site.url }}>\x3C/script>')</script>
<script type="text/javascript" src="{{ '/js/materialize.min.js' | prepend: site.url }}"></script>
<script type="text/javascript" src="{{ '/js/custom.js' | prepend: site.url }}"></script>

<!-- Mail Modal -->
<div id="modalmail" class="modal modal-fixed-footer">
<div class="modal-content">
<h3>Send an email!</h3>
<p>Yo, this feature isn't finished yet. Give it a few weeks</p>
</div>
<div class="modal-footer">
<a href="#!" class=" modal-action modal-close waves-effect waves-{{site.color.primary}} btn-flat">Okay</a>
</div>
</div>

<!-- Footer -->
<footer class="page-footer">
<div class="row container">
<div class="col l6 s12">
<h5 class="white-text">{{ site.title }}</h5>
<p class="grey-text text-lighten-4">{{ site.description }}</p>
</div>
<div class="col l4 offset-l2 s12">
<h5 class="white-text">Contact</h5>
<p class="grey-text text-lighten-4">You can contact us by completing our email form or visiting the club office:</p>
<p class="grey-text text-lighten-4">MSE Club office</p>
<p class="grey-text text-lighten-4">{% for line in site.address %}{{ line }}<br />{% endfor %}</p>
<div class="center footer-button">
<a class="btn-floating btn-large waves-effect waves-light {{site.color.accent}} accent-1 modal-trigger" href="#modalmail"><i class="material-icons">email</i></a>
</div>
</div>

</div>
<div class="footer-copyright">
<div class="container">
Crafted by <a class="grey-text text-lighten-3" href="{{site.project}}"> {{ site.senpai }} </a>
</div>
</div>
</footer>
15 changes: 15 additions & 0 deletions _includes/head.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width initial-scale=1" />
<meta http-equiv="X-UA-Compatible" content="IE=edge">

<title>{{ site.title }}{% if page.title %} - {{ page.title }}{% endif %}</title>
<meta name="description" content="{{ site.description }}">
<link rel="shortcut icon" href="{{ '/img/icon.png' | prepend: site.baseurl }}">

<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
<link href="{{ '/css/icon.css' | prepend: site.url }}" rel="stylesheet">
<link type="text/css" rel="stylesheet" href="{{ '/css/materialize.css' | prepend: site.url }}" media="screen,projection"/>
<link href="{{ '/css/style.css' | prepend: site.url }}" rel="stylesheet">
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
</head>
43 changes: 43 additions & 0 deletions _includes/header.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<header>
<!-- Mobile Nav-->
<a href="#" data-activates="mobile-nav" class="button-collapse btn-large hide-on-med-and-up"><i class="material-icons">menu</i></a>
<a href="/" class="center-align hide-on-med-and-up logo"><img src="/img/logo.png" /></a>
<div class="side-nav" id="mobile-nav">
<div class="input-field">
<i class="material-icons prefix" style="font-size: 3em; ">search</i>
<input placeholder="Search" id="search" type="text" class="validate">
</div>
<ul class="collapsible z-depth-0" data-collapsible="accordion">
<li>
<div class="collapsible-header" style="padding:20px 0;">Information</div>
<div class="collapsible-body">{% include apps.html limit="3" size="medium" grid="s6" %}</div>
</li>
<li>
<div class="collapsible-header" style="padding:20px 0;">Club services</div>
<div class="collapsible-body">{% include apps.html offset="3" limit="2" size="medium" grid="s6" %}</div>
</li>
<li>
<div class="collapsible-header" style="padding:20px 0;">Resources</div>
<div class="collapsible-body">{% include apps.html offset="5" size="medium" grid="s6" %}</div>
</li>
</ul>
<div class="center">
<a class='btn-floating waves-effect waves-light' href='site.social.facebook'> <img src="/img/svg/facebook.svg" /></a>
<a class='btn-floating waves-effect waves-light' href='site.social.twitter'> <img src="/img/svg/twitter.svg" /></a>
<a class='btn-floating waves-effect waves-light' href='site.social.instagram'> <img src="/img/svg/instagram.svg" /></a>
</div>
</div>
<!-- Desktop/Tablet Nav-->
<div class="container" style="padding-top: 10px;">
<a href="/" class="hide-on-small-only"><img src="/img/logo.png" /></a>
<div class="right center-align hide-on-small-only">
<a class='btn-floating waves-effect waves-light' href='#'> <img src="/img/svg/facebook.svg" /></a>
<a class='btn-floating waves-effect waves-light' href='#'> <img src="/img/svg/twitter.svg" /></a>
<a class='btn-floating waves-effect waves-light' href='#'> <img src="/img/svg/instagram.svg" /></a>
<a class='dropdown-button btn-floating waves-effect waves-light' href='#' data-activates='dropdown1'><i class="material-icons">apps</i></a>
<div id='dropdown1' class='dropdown-content'>
{% include apps.html size="medium" grid="m6" %}
</div>
</div>
</div>
</header>
11 changes: 11 additions & 0 deletions _layouts/default.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<!DOCTYPE html>
<html>
{% include head.html %}
<body>
{% include header.html %}
<div class="container">
{{ content }}
</div>
{% include footer.html %}
</body>
</html>
17 changes: 17 additions & 0 deletions _posts/news/2015-08-12-new-site.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
categories: news
img: a.jpg
tab: Brand New
title: MSE Club's New website!
---

This is the New MSE club website...ya it's not much.

The Materials Science and Engineering Club (MSE Club) at the University of Toronto represents the interests of over 200 MSE undergraduate students in the Faculty of Applied Science and Engineering. The club excecutives organize events like barbeques, smokers, tournaments, movie nights, sports, and the annual MSE dinner dance. They provide services such as locker rentals, common room cleanups, and anouncement boards for the community.

<!-- more -->

Please wait as we get everything set up:
The gallery will likely be the first one up, followed by the store.
Sometime during the semester, we will have our guide to MSE slowly appear on the page.
The study spaces will likely be one of the last things we will get on the website.
24 changes: 24 additions & 0 deletions _sass/components/CHANGES.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
Changes to v0.97.0 of materialize:
(Or at the very least, stuff I remembered I changed)

_grid.scss
container size normalization:
90% -> 85%
85% -> 85%
70% -> 85%

_modal.scss
.modal
width: 55% -> width: 30%

_sideNav.scss
.sidenav a
height: 64px -> removed;
padding: 0 $sidenav-padding-right; -> removed
display: block; -> removed

_variables.scss
$primary-color: color("blue", "lighten-2") !default;
> from materialize-red
$secondary-color: color("purple", "accent-1") !default;
> from teal, lighten-1
Loading

0 comments on commit 44adb06

Please sign in to comment.