Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

VictorL - Standardized site theming and updated styles.

  • Loading branch information...
commit 36a057604aaa926c09d5ee5e4ff5ca27cc832c9f 1 parent 373ed24
@Blisse authored
View
16 _data/classmates.yaml
@@ -1,12 +1,16 @@
-
+ name: "Christian De Angelis"
+ github: "cdeange"
+ homepage: "www.deange.ca"
+-
+ name: "Joshua Kalpin"
+ github: "Kapin"
+ homepage: "www.joshuakalp.in"
+-
name: "Stephen Li"
github: "Trinovantes"
- homepage: "stephenli.ca"
+ homepage: "www.stephenli.ca"
-
name: "Victor Lai"
github: "Blisse"
- homepage: "laivictor.com"
--
- name: "Joshua Kalpin"
- github: "Kapin"
- homepage: "joshuakalp.in"
View
8 _data/links.yaml
@@ -4,5 +4,9 @@
desc: "Check enrollment status and schedules for classes"
-
name: "Quest Login"
- url: "https://quest.pecs.uwaterloo.ca/psp/SS/"
- desc: "Quest UWaterloo login"
+ desc: "Quest UWaterloo login"
+-
+ name: "UWaterloo Book Store"
+ url: "fortuna.uwaterloo.ca/cgi-bin/cgiwrap/rsic/book#"
+ desc: "UWaterloo Book Store"
View
18 _layouts/default.html
@@ -9,7 +9,6 @@
<link rel="stylesheet" href="/assets/css/main.css">
-->
<link rel="stylesheet/less" href="/assets/less/main.less">
- <link rel="stylesheet/less" href="/assets/less/icomoon.less">
<link href='http://fonts.googleapis.com/css?family=Open+Sans:400,700' rel='stylesheet' type='text/css'>
<script type="text/javascript" src="/assets/js/less.js"></script>
@@ -23,21 +22,18 @@
<nav class="grid">
<ul class="row">
<li class="col-4">
- <a href="/">
- <span class="menu-icon icon-home"></span>
- HOME
+ <a href="/" class="menu-icon icon-home">
+ Home
</a>
</li>
<li class="col-4">
- <a href="/schedule.html">
- <span class="menu-icon icon-table"></span>
- COURSES
+ <a href="/schedule.html" class="menu-icon icon-schedule">
+ Courses
</a>
</li>
<li class="col-4">
- <a href="/links.html">
- <span class="menu-icon icon-link"></span>
- LINKS
+ <a href="/links.html" class="menu-icon icon-link">
+ Links
</a>
</li>
</ul>
@@ -50,7 +46,7 @@
<footer class="copyright">
<div class="grid">
- <p class="col-12">Copyright &copy; 2013 &mdash; <a href="/">se2016.com</a></p>
+ <p class="col-12">Copyright &copy; 2013&mdash;2014 &nbsp;<a href="/">www.se2016.com</a>&nbsp; All Rights Reserved</p>
</div>
</footer>
View
BIN  assets/img/calendar.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
6 assets/img/calendar.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generated by IcoMoon.io -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="120" height="120" viewBox="0 0 120 120">
+ <path d="M37.5 45h15v15h-15zM60 45h15v15h-15zM82.5 45h15v15h-15zM15 90h15v15h-15zM37.5 90h15v15h-15zM60 90h15v15h-15zM37.5 67.5h15v15h-15zM60 67.5h15v15h-15zM82.5 67.5h15v15h-15zM15 67.5h15v15h-15zM97.5 0v7.5h-15v-7.5h-52.5v7.5h-15v-7.5h-15v120h112.5v-120h-15zM105 112.5h-97.5v-82.5h97.5v82.5z" fill="#000000" />
+</svg>
View
BIN  assets/img/github.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
6 assets/img/github.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generated by IcoMoon.io -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="120" height="120" viewBox="0 0 120 120">
+ <path d="M60 0c-33.137 0-60 26.863-60 60s26.863 60 60 60 60-26.863 60-60-26.863-60-60-60zM95.632 95.632c-4.631 4.631-10.021 8.265-16.020 10.803-1.524 0.645-3.072 1.21-4.641 1.698v-8.992c0-4.727-1.621-8.203-4.863-10.43 2.031-0.195 3.896-0.469 5.596-0.82s3.496-0.859 5.391-1.523 3.594-1.455 5.098-2.373 2.949-2.109 4.336-3.574 2.549-3.125 3.486-4.98 1.68-4.082 2.227-6.68 0.82-5.459 0.82-8.584c0-6.055-1.973-11.211-5.918-15.469 1.797-4.688 1.601-9.785-0.586-15.293l-1.465-0.176c-1.016-0.117-2.842 0.312-5.479 1.289s-5.596 2.578-8.877 4.805c-4.648-1.289-9.473-1.934-14.473-1.934-5.039 0-9.844 0.645-14.414 1.934-2.070-1.406-4.033-2.568-5.889-3.486-1.856-0.918-3.34-1.543-4.453-1.875s-2.149-0.537-3.105-0.615-1.572-0.098-1.846-0.059-0.469 0.078-0.586 0.117c-2.187 5.547-2.383 10.645-0.586 15.293-3.945 4.258-5.918 9.414-5.918 15.469 0 3.125 0.274 5.986 0.82 8.584s1.289 4.824 2.227 6.68 2.1 3.516 3.486 4.98 2.832 2.656 4.336 3.574 3.203 1.709 5.098 2.373 3.691 1.172 5.391 1.523 3.564 0.625 5.596 0.82c-3.203 2.187-4.805 5.664-4.805 10.43v9.168c-1.769-0.527-3.513-1.149-5.227-1.874-5.999-2.538-11.389-6.172-16.020-10.803-4.631-4.631-8.266-10.021-10.803-16.020-2.625-6.206-3.956-12.804-3.956-19.611s1.331-13.405 3.956-19.611c2.538-5.999 6.172-11.389 10.803-16.020s10.021-8.266 16.020-10.803c6.206-2.625 12.804-3.956 19.611-3.956s13.405 1.331 19.611 3.956c6 2.538 11.389 6.172 16.020 10.803 4.631 4.631 8.265 10.021 10.803 16.020 2.625 6.206 3.956 12.804 3.956 19.611s-1.331 13.405-3.956 19.611c-2.538 5.999-6.172 11.389-10.803 16.020z" fill="#000000" />
+</svg>
View
BIN  assets/img/home.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
6 assets/img/home.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generated by IcoMoon.io -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="120" height="120" viewBox="0 0 120 120">
+ <path d="M120 69.193l-60-46.573-60 46.574v-18.989l60-46.573 60 46.574zM105 67.5v45h-30v-30h-30v30h-30v-45l45-33.75z" fill="#000000" />
+</svg>
View
BIN  assets/img/link.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
6 assets/img/link.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generated by IcoMoon.io -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="120" height="120" viewBox="0 0 120 120">
+ <path d="M111.726 8.747l-0.472-0.474c-11.033-11.031-29.085-11.031-40.116 0l-25.559 25.563c-11.031 11.031-11.031 29.083 0 40.114l0.472 0.472c0.918 0.92 1.892 1.749 2.899 2.515l9.357-9.357c-1.090-0.644-2.124-1.415-3.060-2.351l-0.474-0.474c-5.99-5.988-5.99-15.735 0-21.725l25.562-25.56c5.99-5.99 15.735-5.99 21.725 0l0.474 0.472c5.988 5.99 5.988 15.737 0 21.725l-11.565 11.565c2.008 4.958 2.959 10.242 2.876 15.514l17.883-17.883c11.031-11.032 11.031-29.083-0-40.115zM73.95 45.578c-0.918-0.918-1.892-1.749-2.899-2.512l-9.357 9.355c1.090 0.644 2.124 1.415 3.060 2.351l0.474 0.473c5.99 5.99 5.99 15.735 0 21.725l-25.562 25.563c-5.99 5.989-15.735 5.989-21.725 0l-0.474-0.474c-5.988-5.991-5.988-15.735 0-21.725l11.565-11.565c-2.008-4.958-2.959-10.242-2.876-15.514l-17.883 17.883c-11.032 11.031-11.032 29.083 0 40.116l0.472 0.473c11.033 11.031 29.085 11.031 40.117 0l25.56-25.561c11.031-11.031 11.031-29.085 0-40.116l-0.472-0.472z" fill="#000000" />
+</svg>
View
36 assets/less/icomoon.less
@@ -1,36 +0,0 @@
-@font-face {
- font-family: 'icomoon';
- src:url('/assets/fnts/icomoon.eot');
- src:url('/assets/fnts/icomoon.eot?#iefix') format('embedded-opentype'),
- url('/assets/fnts/icomoon.woff') format('woff'),
- url('/assets/fnts/icomoon.ttf') format('truetype'),
- url('/assets/fnts/icomoon.svg#icomoon') format('svg');
- font-weight: normal;
- font-style: normal;
-}
-
-[class^="icon-"], [class*=" icon-"] {
- font-family: 'icomoon';
- speak: none;
- font-style: normal;
- font-weight: normal;
- font-variant: normal;
- text-transform: none;
- line-height: 1;
-
- /* Better Font Rendering =========== */
- -webkit-font-smoothing: antialiased;
- -moz-osx-font-smoothing: grayscale;
-}
-
-.icon-home:before {
- content: "\e600";
-}
-
-.icon-table:before {
- content: "\e601";
-}
-
-.icon-link:before {
- content: "\e602";
-}
View
331 assets/less/main.less
@@ -1,30 +1,47 @@
@grid-width: 1220px;
@mobile-width: 960px;
-@text-color: #333;
-@blue: #314c9c;
-@grey: rgb(155,161,168);
-@border-color: #eee;
+
+// Base Colors
+@softengblue: #314c9c;
+@softenggray: rgb(155,161,168);
+
+@darkgray: #333;
+@lightgray: #eee;
+
+// Display Colors
+@text-color: @darkgray;
+@link-color: @softengblue;
+@bg-hl-color: @lightgray;
+
+@header-color: @darkgray;
+@border-color: @lightgray;
+
+// Fonts
+@basic-font-stack: "Open Sans", sans-serif;
+
+// Elements
@border: 1px solid @border-color;
@import 'normalize.less';
@import 'onepcssgrid.less';
-//------------------------------------------------------------------------------- General
+//-------------------------------------------------------------------------------
+//General
body{
- color:@text-color;
- font-size:1em;
- font-family: 'Open Sans', sans-serif;
- line-height:2em;
+ color :@text-color;
+ font-size :1em;
+ font-family : @basic-font-stack;
+ line-height :2em;
}
a{
- color:@blue;
+ color :@softengblue;
}
h1{
- margin-top:40px;
+ margin-top :48px;
}
table{
@@ -32,13 +49,13 @@ table{
transition:0.5s;
&:hover{
- background:lighten(@border-color, 5%);
+ background :lighten(@border-color, 5%);
}
td{
- border:@border;
- padding:20px;
- vertical-align:top;
+ border :@border;
+ padding :20px;
+ vertical-align :top;
&:not(:first-child){
width:15%;
@@ -54,16 +71,17 @@ table{
}
span{
- font-size:13px;
- line-height:20px;
+ font-size:12px;
+ line-height:18px;
}
}
}
}
ul{
- list-style:none;
- padding:0;
+ list-style-type : none;
+ padding : 0;
+ margin : 0;
li{
border-top:@border;
@@ -73,79 +91,103 @@ ul{
}
a{
- color:lighten(@text-color, 30%);
- display:block;
- padding:20px 40px;
- text-decoration:none;
- transition:0.5s;
-
- strong,
- span,
- p {
+ color :lighten(@text-color, 20%);
+ display :block;
+ padding :15px 10px;
+ text-decoration :none;
+ transition :0.5s;
+
+ .link-title,
+ .link-url,
+ .link-desc{
display:block;
}
- strong {
+ .link-title{
font-size:24px;
- margin-bottom:5px;
+ font-weight: bold;
+ margin-bottom:4px;
}
- span {
- color:@blue;
- font-size:13px;
- font-style:normal;
- line-height:1em;
+ .link-url{
+ color :@softengblue;
+ font-size :11px;
+ font-style :normal;
+ line-height :1em;
}
- p {
- margin:10px 0 0;
- padding-left:20px;
+ .link-desc{
+ margin : 10px 0 0;
+ padding-left : 5px;
+ font-size: 16px;
}
&:hover{
- background:@border-color;
- color:@text-color;
+ background : @bg-hl-color;
+ color : @text-color;
}
}
}
}
-//------------------------------------------------------------------------------- Menu
+//-------------------------------------------------------------------------------
+//Menu
.menu{
border-bottom:@border;
- ul {
+ ul{
margin:0;
- li {
+ li{
border:none;
- a {
- display:block;
- font-weight:bold;
- font-size: 1em;
- color:@blue;
+ a{
+ &.icon-home{
+ background-image :url(/assets/img/home.png);
+ background-image :url(/assets/img/home.svg);
+ }
+
+ &.icon-schedule{
+ background-image :url(/assets/img/calendar.png);
+ background-image :url(/assets/img/calendar.svg);
+ }
+
+ &.icon-link{
+ background-image :url(/assets/img/link.png);
+ background-image :url(/assets/img/link.svg);
+ }
+
+ display :block;
+ font-weight :bold;
+ font-size : 1em;
+ color :@header-color;
- outline:none;
- padding: 10px 0 0 0;
- text-align:center;
+ padding-top : 116px;
+ text-align :center;
+ text-transform : uppercase;
- .menu-icon {
- display: block;
- text-align:center;
+ height : 50px;
- padding: 0 5px;
- font-size: 5em;
+ &.menu-icon{
+ background-size: 100% 50px;
+ background-position: center 50px;
+ background-repeat: no-repeat;
}
- }
- @media (max-width:@mobile-width){
- a {
- .menu-icon {
- display: none;
+ @media (max-width:@mobile-width){
+ height: 32px;
+
+ &.menu-icon{
+ background: none;
+ padding-top: 0;
}
}
+
+ &:hover {
+
+ }
+
}
}
}
@@ -156,68 +198,163 @@ ul{
border-top:@border;
p{
- color:@grey;
- font-size:13px;
- padding:20px 0;
- text-align:center;
+ color :@text-color;
+ font-size :13px;
+ padding :20px 0;
+ text-align :center;
}
}
-//------------------------------------------------------------------------------- Homepage
+//-------------------------------------------------------------------------------
+//Homepage
-.intro{
+.home{
margin:80px 0;
- h1.inseption{
- background:no-repeat center;
- background-size:100% auto;
- background-image:url(../img/inseption.png);
- background-image:url(../img/inseption.svg);
- margin:auto;
- margin-bottom:40px;
- width:100%; height:130px;
- text-indent:-9999px;
+ h1.home-inseptionlogo{
+ background :no-repeat center;
+ background-image :url(/assets/img/inseption.png);
+ background-image :url(/assets/img/inseption.svg);
+ margin :auto;
+ margin-bottom :40px;
+
+ height : 200px;
+
+ background-size : 100% auto;
+ text-indent :-9999px;
+ }
+
+ @media (max-width:@mobile-width){
+ h1.home-inseptionlogo{
+ height: 135px;
+ }
}
- h2{
- color:rgb(155,161,168);
- margin:0;
- text-align:center;
+ p.home-description{
+ color : @text-color;
+ margin :0;
+ text-align :center;
}
}
-//------------------------------------------------------------------------------- Schedule
+//-------------------------------------------------------------------------------
+//Schedule
.schedule{
table{
+ width: 100%;
+
tr{
td{
&.elective{
}
+
+ overflow:hidden;
+ padding: 6px 8px;
+
+ &.course-code,
+ &.course-title{
+
+ @media (max-width:@mobile-width){
+ float : none;
+ }
+ }
+
+ &.course-code{
+ font-weight : bold;
+ white-space: nowrap;
+ padding: 8px;
+ }
+
+ &.course-title{
+ text-overflow : ellipsis;
+ padding: 5px;
+ width: 100%;
+ }
}
}
}
+}
- ul{
- li{
- overflow:hidden;
- padding:5px 0;
+//-------------------------------------------------------------------------------
+//Link
+
+table.member-list{
+ width: 100%;
+
+ tr > td{
+
+ padding: 0;
+ margin: 0;
+ border: none;
+
+ a{
+ display :block;
+
+ color :lighten(@text-color, 20%);
+ text-decoration :none;
+ transition :0.5s;
+
+ width: 100%;
+ height: 100%;
+
+ .link-title{
+ font-size:24px;
+ font-weight: bold;
+ margin-bottom:10px;
+ }
+
+ .link-url{
+ color :@softengblue;
+ font-size :11px;
+ font-style :normal;
+ line-height :1em;
+ }
+
+ .link-desc{
+ margin : 10px 0 0;
+ padding-left : 5px;
+ font-size: 16px;
+ }
- strong,
- span{
- display:inline-block;
+ &:hover{
+ background : @bg-hl-color;
+ color : @text-color;
+ }
+ }
- @media (max-width:@mobile-width){
- display:inline;
- float:none;
- }
+ &.link-site a{
+ margin: 0;
+ padding: 20px;
+ width: 100%;
+ }
+
+ &.link-github a{
+ background : no-repeat center;
+ background-image : url(/assets/img/github.png);
+ background-image : url(/assets/img/github.svg);
+ opacity:0.8;
+
+ margin : 0;
+ padding: 0;
+
+ background-size : 50% auto;
+ height : 75px;
+ width : 75px;
+ text-indent : -9999px;
+
+ vertical-align: center;
+ text-align: center;
+
+ &:hover {
+ opacity:0.3;
}
+ }
- strong{
- text-align:right;
- padding-right:5px;
- width:90px;
+ @media (max-width:@mobile-width){
+ a{
}
}
+
}
-}
View
8 index.html
@@ -3,11 +3,13 @@
title: UWaterloo Software Engineering Class of 2016
---
-<article class="intro">
+<article class="home">
<div class="row">
<div class="col-12">
- <h1 class="inseption">inSEption</h1>
- <h2>This is the class homepage of University of Waterloo's Software Engineering Class of 2016.</h2>
+ <h1 class="home-inseptionlogo">inSEption</h1>
+ <p class="home-description">
+ Homepage for University of Waterloo's Software Engineering Class of 2016.
+ </p>
</div>
</div>
</article>
View
52 links.html
@@ -6,38 +6,50 @@
<article class="links">
<div class="row">
- <section class="col-12">
+ <section class="col-8">
<h1>Useful Links</h1>
<ul>
{% for link in site.data.links %}
<li>
- <a href="http://{{ link.url }}">
- <strong>{{ link.name }}</strong>
- <span>{{ link.url }}</span>
- <p>{{ link.desc }}</p>
+ <a href="https://{{ link.url }}">
+ <span class="link-title">
+ {{ link.name }}
+ </span>
+ <span class="link-url">
+ https://{{ link.url }}
+ </span>
+ <span class="link-desc">
+ {{ link.desc }}
+ </span>
</a>
</li>
{% endfor %}
</ul>
</section>
- </div>
-
- <div class="row">
- <section class="col-12">
- <h1>Student Sites</h1>
- </section>
- <section>
- <ul>
+ <section class="col-4">
+ <h1>Members</h1>
+ <table class="member-list">
{% for contact in site.data.classmates %}
- <li class="col-4">
- <a href="http://{{ contact.homepage }}">
- <strong>{{ contact.name }}</strong>
- <span>{{ contact.homepage }}</span>
- </a>
- </li>
+ <tr>
+ <td class="link-site">
+ <a href="http://{{ contact.homepage }}">
+ <span class="link-title">
+ {{ contact.name }}
+ </span>
+ <span class="link-url">
+ {{ contact.homepage }}
+ </span>
+ </a>
+ </td>
+ <td class="link-github">
+ <a href="https://www.github.com/{{ contact.github }}">
+ Github
+ </a>
+ </td>
+ </tr>
{% endfor %}
- </ul>
+ </table>
</section>
</div>
View
12 schedule.html
@@ -66,14 +66,14 @@
{% if category.notes != null %}
<p>{{ category.notes }}</p>
{% endif %}
- <ul>
+ <table>
{% for course in category.electives %}
- <li>
- <strong>{{ course.department }} {{ course.code }}</strong>
- <span>{{ course.name }}</span>
- </li>
+ <tr>
+ <td class="course-code">{{ course.department }} {{ course.code }}</td>
+ <td class="course-title">{{ course.name }}</td>
+ </tr>
{% endfor %}
- </ul>
+ </table>
</aside>
{% cycle '', '</div>' %}
{% endfor %}
Please sign in to comment.
Something went wrong with that request. Please try again.