Commit ebb171ab authored by David Haynes's avatar David Haynes 🙆
Browse files

Merge branch '29-masonstrap' into 'master'

Resolve "Adopt Masonstrap"

Closes #29

See merge request srctweb!33
parents b117adcc 09c2ef69
srctweb:
image: jekyll/jekyll
command: jekyll serve -s './srctweb' -d './srctweb/_site' --trace --watch --incremental
ports:
- 4000:4000
volumes:
- .:/srv/jekyll
image: jekyll/jekyll
command: jekyll serve -s './srctweb' -d './srctweb/_site' --trace --watch --incremental
ports:
- 4000:4000
volumes:
- .:/srv/jekyll
<div id="banner">
<div class="container">
<div class="row">
<div class="col-lg-12 page-header">
<div class="col-lg-12">
<h1><strong>{{ page.title }}</strong></h1>
<p class="lead">{{ page.description }}</p>
<p class="text-muted">{{ page.description }}</p>
</div>
</div>
</div>
......
......@@ -33,32 +33,4 @@
</div>
</div>
</small>
</div>
<script src="/assets/js/bootstrap.min.js"></script>
<script>
/*
@licstart The following is the entire license notice for the
JavaScript code in this page.
Copyright (C) 2014 Mason SRCT
The JavaScript code in this page is free software: you can
redistribute it and/or modify it under the terms of the GNU
General Public License (GNU GPL) as published by the Free Software
Foundation, either version 3 of the License, or (at your option)
any later version. The code is distributed WITHOUT ANY WARRANTY;
without even the implied warranty of MERCHANTABILITY or FITNESS
FOR A PARTICULAR PURPOSE. See the GNU GPL for more details.
As additional permission under GNU GPL version 3 section 7, you
may distribute non-source (e.g., minimized or compacted) forms of
that code without the copy of the GNU GPL normally required by
section 4, provided you include this license notice and a URL
through which recipients can access the Corresponding Source.
@licend The above is the entire license notice
for the JavaScript code in this page.
*/
</script>
\ No newline at end of file
</div>
\ No newline at end of file
......@@ -26,11 +26,7 @@
<meta name="twitter:image" content="{{ site.url }}/assets/img/SRCT_sq_white_shadow.png">
<!-- Load stylesheets -->
<link href="/assets/css/bootstrap.min.css" rel="stylesheet" media="screen">
<link href="/assets/css/bootstrap-theme.min.css" rel="stylesheet">
<link href="/assets/css/font-awesome.min.css" rel="stylesheet">
<link rel="stylesheet" href="https://srct.gmu.io/masonstrap/css/masonstrap.min.css" />
<link href="/assets/css/style.css" rel="stylesheet">
<!-- Load favicon -->
<link rel="icon" href="/assets/img/favicon.ico">
<script src="/assets/js/jquery-2.0.3.min.js"></script>
\ No newline at end of file
......@@ -2,13 +2,9 @@
<div class="jumbotron jumbostyle">
<div class="container">
<div class="row">
<div class="col-lg-offset-3 col-lg-2 col-md-offset-3 col-md-3 col-sm-offset-2 col-sm-3 col-xs-offset-2 col-xs-4">
<img src="/assets/img/SRCT_sq_white_shadow.png" class="img-responsive" alt="SRCT's logo"/>
</div>
<div class="col-md-5">
<p class="xolonium srct-title">Student-Run<br />Computing&nbsp;+<br />Technology</p>
</div>
<div class="d-flex justify-content-center flex-wrap" id="srct-logo-home">
<img src="/assets/img/SRCT_sq_white_shadow.png" class="srct-logo" alt="SRCT's logo"/>
<p class="xolonium srct-title">Student-Run<br />Computing&nbsp;+<br />Technology</p>
</div>
</div>
</div>
\ No newline at end of file
</div>
<nav class="navbar navbar-inverse navbar-fixed-top">
<!-- Navbar -->
<nav class="navbar fixed-top navbar-expand-lg navbar-dark bg-primary">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand xolonium" href="/"><img src="/assets/img/SRCT_square.svg" width=24 height=24 alt=""/>&nbsp;&nbsp;Mason SRCT</a>
</div>
<div class="navbar-right collapse navbar-collapse navbar-ex1-collapse">
<ul class="nav navbar-nav">
<!-- Brand -->
<a class="navbar-brand my-2 my-lg-0 xolonium" href="/">
<img src="/assets/img/SRCT_square.svg" width="30" height="30" class="d-inline-block align-top" alt="Mason SRCT">
&nbsp;Mason SRCT&nbsp;
</a>
<!-- Collapse button -->
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#collapse"
aria-controls="collapse" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<!-- Collapse -->
<div class="collapse navbar-collapse" id="collapse">
<ul class="navbar-nav ml-auto">
{% for link in site.data.navigation.main %}
{% if link.children == null %}
<li><a href="{{ link.url }}">{{ link.title }}</a></li>
<li class="nav-item">
<a class="nav-link" href="{{ link.url }}">{{ link.title }}</a>
</li>
{% else %}
<li class="dropdown">
<a id="drop1" href="#" role="button" class="dropdown-toggle" data-toggle="dropdown">{{ link.title }} <b class="caret"></b></a>
<ul class="dropdown-menu" role="menu" aria-labelledby="drop1">
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" id="dropdown-link"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
{{ link.title }}
</a>
<div class="dropdown-menu">
{% for childLink in link.children %}
<li role="presentation"><a role="menuitem" tabindex="-1" href="{{ childLink.url }}">{{ childLink.title }}</a></li>
<a class="dropdown-item" href="{{ childLink.url }}">{{ childLink.title }}</a>
{% endfor %}
</ul>
</div>
</li>
{% endif %}
{% endfor %}
</ul>
</div>
</div>
</nav>
</nav>
\ No newline at end of file
<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.11.0/umd/popper.min.js" integrity="sha384-b/U6ypiBEHpOf/4+1nzFpr53nxSS+GLCkfwBdFNTxtclqqenISfwAzpKaMNFNmj4" crossorigin="anonymous"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/js/bootstrap.min.js" integrity="sha384-h0AbiXch4ZDo7tp9hKZ4TsHbi047NrKGLO3SEJAg45jXxnGIfYzk4Si90RDIqNm1" crossorigin="anonymous"></script>
......@@ -17,9 +17,11 @@
<div class="container">
{{ content }}
</div>
<div id="footer">
{% include footer.html %}
</div>
</body>
<div id="footer">
{% include footer.html %}
</div>
{% include scripts.html %}
</html>
......@@ -54,7 +54,7 @@ permalink: /documents/terms_of_service/
<div class="col-md-12">
<h2>Your account, privacy, and rights</h2>
<p><strong>A full Mason account</strong></p>
<p><strong>A Full Mason Account</strong></p>
<p>Your account is based off of your Mason student account, including
your Mason password. We strongly encourage you,
<a href="http://tsd.gmu.edu/services/strongpassword/">just like
......
......@@ -9,10 +9,9 @@ jumbotron: true
<div class="row smidge">
<div class="col-md-12 text-center">
<h4>
<span class="label label-default">
<i class="fa fa-gavel fa-fw"></i>&nbsp;<strong>Next Meeting</strong>
</span>&nbsp;&nbsp;
<span id="meetingDate">Please wait while we fetch the upcoming meeting information...</span>
<i class="fa fa-gavel fa-fw"></i>&nbsp;<strong>Next Meeting</strong>
&nbsp;
<span id="meetingDate">Please wait while we fetch the upcoming meeting information...</span>
</h4>
</div>
</div>
......@@ -34,9 +33,9 @@ jumbotron: true
<div class="row smidge">
<legend><i class="fa fa-child fa-fw"></i>&nbsp;<strong>Initiatives</strong></legend>
<div class="col-lg-3 col-lg-push-9 col-md-offset-0 col-md-4 col-md-push-8 col-sm-offset-3 col-sm-6 col-xs-offset-3 col-xs-6 smidge">
<img src="/assets/img/openhatch.jpg" alt="Renfred and Daniel assist Heather, a student attending our Openhatch workshop in 2014." class="img-circle img-responsive center-block">
</div>
<!-- Projects & Infrastructure Responsive Image -->
<img src="/assets/img/openhatch.jpg" alt="Renfred and Daniel assist Heather, a student attending our Openhatch workshop in 2014." class="index-image d-md-none d-flex mx-auto">
<div class="col-lg-9 col-lg-pull-3 col-md-8 col-md-pull-4 col-sm-12 col-xs-12 smidge">
<h4><strong>Projects & Infrastructure</strong></h4>
<p>Our primary purpose is improving life at Mason by developing and hosting
......@@ -65,15 +64,12 @@ jumbotron: true
your idea to fruition and deployment.</p>
</div>
<div class="col-xs-offset-2 col-xs-8 smidge">
<hr />
</div>
<div class="col-xs-2">
</div>
<!-- Projects & Infrastructure Image -->
<img src="/assets/img/openhatch.jpg" alt="Renfred and Daniel assist Heather, a student attending our Openhatch workshop in 2014." class="index-image d-none d-lg-block">
<div class="col-lg-3 col-lg-push-9 col-md-offset-0 col-md-4 col-md-push-8 col-sm-offset-3 col-sm-6 col-xs-offset-3 col-xs-6 smidge">
<img src="/assets/img/bitcamp.jpg" alt="Michel and Ben compete at Bitcamp, a hackathon held at the university of Maryland, in 2014." class="img-circle img-responsive center-block">
</div>
<!-- Events & Workshops Responsive Image -->
<img src="/assets/img/bitcamp.jpg" alt="Michel and Ben compete at Bitcamp, a hackathon held at the university of Maryland, in 2014." class="index-image d-md-none d-flex mx-auto">
<div class="col-lg-9 col-lg-pull-3 col-md-8 col-md-pull-4 col-sm-12 col-xs-12 smidge">
<h4><strong>Events & Workshops</strong></h4>
<p>We work to offer opportunities for Mason students to strengthen their skills and
......@@ -99,15 +95,12 @@ jumbotron: true
or to the next release.</p>
</div>
<div class="col-xs-offset-2 col-xs-8 smidge">
<hr />
</div>
<div class="col-xs-2">
</div>
<!-- Events & Workshops Image -->
<img src="/assets/img/bitcamp.jpg" alt="Michel and Ben compete at Bitcamp, a hackathon held at the university of Maryland, in 2014." class="index-image d-none d-lg-block">
<div class="col-lg-3 col-lg-push-9 col-md-offset-0 col-md-4 col-md-push-8 col-sm-offset-3 col-sm-6 col-xs-offset-3 col-xs-6 smidge">
<img src="/assets/img/org-fair.jpg" alt="Chris, Melissa, and Luca stand at our table for Student Involvement's Get Connected student org fair in the beginning of fall 2014." class="img-circle img-responsive center-block">
</div>
<!-- Outreach & Community Responsive Image -->
<img src="/assets/img/org-fair.jpg" alt="Chris, Melissa, and Luca stand at our table for Student Involvement's Get Connected student org fair in the beginning of fall 2014." class="index-image d-md-none d-flex mx-auto">
<div class="col-lg-9 col-lg-pull-3 col-md-8 col-md-pull-4 col-sm-12 col-xs-12 smidge">
<h4><strong>Outreach & Community</strong></h4>
<p>We believe in returning the skills we've learned together back to our community.
......@@ -131,16 +124,20 @@ jumbotron: true
possible. Women and students from minority groups are welcomed and encouraged to
participate and join. And if you're in CS 101, come say hello!</p>
</div>
<!-- Outreach & Community Image -->
<img src="/assets/img/org-fair.jpg" alt="Chris, Melissa, and Luca stand at our table for Student Involvement's Get Connected student org fair in the beginning of fall 2014." class="index-image d-none d-lg-block">
</div>
<div class="row smidge">
<legend><i class="fa fa-laptop fa-fw"></i>&nbsp;<strong>Getting Involved</strong></legend>
<div class="col-lg-4">
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title text-center"><i class="fa fa-comments-o fa-fw"></i> Get In Touch</h3>
<div class="card border-primary index-card">
<div class="card-header text-white bg-primary">
<h4 class="card-title text-center"><i class="fa fa-comments-o fa-fw"></i> Get In Touch</h4>
</div>
<div class="panel-body">
<div class="card-body">
<p>
We communicate and organize primarily on <a href="https://slack.com/is">Slack</a>.
Slack is a communication app for teams. If you've used
......@@ -170,11 +167,11 @@ jumbotron: true
</div>
<div class="col-lg-4">
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title text-center"><i class="fa fa-heart-o fa-fw"></i> Stop On By</h3>
<div class="card border-primary index-card">
<div class="card-header text-white bg-primary">
<h4 class="card-title text-center"><i class="fa fa-heart-o fa-fw"></i> Stop On By</h4>
</div>
<div class="panel-body">
<div class="card-body">
<p>
There are a couple of opportunities to come and say hello. During the semester,
we hold weekly meetings, where we run
......@@ -203,24 +200,28 @@ jumbotron: true
</div>
<div class="col-lg-4">
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title text-center"><i class="fa fa-files-o fa-fw"></i> Additional Resources</h3>
<div class="card border-primary index-card">
<div class="card-header text-white bg-primary">
<h4 class="card-title text-center"><i class="fa fa-files-o fa-fw"></i> Additional Resources</h4>
</div>
<div class="panel-body">
<ul class="nav nav-pills nav-justified smidgen small" role="tablist">
<li role="presentation" class="active">
<a href="#code" aria-controls="code" role="tab" data-toggle="tab"><strong>Code</strong></a>
</li>
<li role="presentation">
<a href="#design" aria-controls="design" role="tab" data-toggle="tab"><strong>Design</strong></a>
</li>
<li role="presentation">
<a href="#infra" aria-controls="infra" role="tab" data-toggle="tab"><strong>Infrastructure</strong></a>
</li>
</ul>
<div class="tab-content">
<div role="tabpanel" class="tab-pane fade in active" id="code">
<br />
<div class="row d-flex">
<ul class="nav nav-pills mx-auto">
<li role="presentation" class="nav-item">
<a class="nav-link active" href="#code" aria-controls="code" role="tab" data-toggle="pill"><strong>Code</strong></a>
</li>
<li role="presentation" class="nav-item">
<a class="nav-link" href="#design" aria-controls="design" role="tab" data-toggle="pill"><strong>Design</strong></a>
</li>
<li role="presentation" class="nav-item">
<a class="nav-link" href="#infra" aria-controls="infra" role="tab" data-toggle="pill"><strong>Infrastructure</strong></a>
</li>
</ul>
</div>
<br />
<div class="tab-content container">
<div role="tabpanel" class="tab-pane fade show active" id="code">
<p>
Version control lets developers keep an organized history of their changes.
This means you can fearlessly try out your ideas and allows multiple people
......
body{padding-top:45px}
#banner{border-bottom:none}
.page-header h1{font-size:4em}
.bs-docs-section{margin-top:8em}
footer{margin:5em 0}footer li{float:left;margin-right:1.5em;margin-bottom:1.5em}
footer p{clear:left;margin-bottom:0}
.splash{background-color:#1c2533;background:-webkit-linear-gradient(70deg, #080f1f 30%, #2b4b5a 87%, #435e67 100%);background:-o-linear-gradient(70deg, #080f1f 30%, #2b4b5a 87%, #435e67 100%);background:-ms-linear-gradient(70deg, #080f1f 30%, #2b4b5a 87%, #435e67 100%);background:-moz-linear-gradient(70deg, #080f1f 30%, #2b4b5a 87%, #435e67 100%);background:linear-gradient(20deg, #080f1f 30%, #2b4b5a 87%, #435e67 100%);background-attachment:fixed;padding:6em 0 2em;color:#fff;text-align:center}.splash .alert{margin:4em 0 2em}
.splash h1{font-size:4em}
.splash #social{margin-top:6em}
.section-tout{padding:4em 0 3em;border-top:1px solid rgba(255,255,255,0.1);border-bottom:1px solid rgba(0,0,0,0.1);background-color:#eaf1f1}.section-tout .fa{margin-right:.5em}
.section-tout p{margin-bottom:3em}
.section-preview{padding:4em 0 4em}.section-preview .preview{margin-bottom:4em;background-color:#eaf1f1;border:1px solid rgba(0,0,0,0.1);border-radius:6px}.section-preview .preview .image{padding:5px}.section-preview .preview .image img{border:1px solid rgba(0,0,0,0.1)}
.section-preview .preview .options{text-align:center;padding:0 2em 2em}.section-preview .preview .options p{margin-bottom:2em}
.section-preview .dropdown-menu{text-align:left}
.section-preview .lead{margin-bottom:2em}
@media (max-width:767px){.section-preview .image img{width:100%}}
.bsa .one .bsa_it_ad{border:none !important;background-color:transparent !important}.bsa .one .bsa_it_ad .bsa_it_t,.bsa .one .bsa_it_ad .bsa_it_d{color:inherit !important}
.bsa .one .bsa_it_p{display:none}
This diff is collapsed.
This diff is collapsed.
......@@ -29,11 +29,19 @@ a[name] {
.xolonium {
font-family: Xolonium;
}
#srct-logo-home {
padding-top: 1rem;
}
.srct-logo {
height: 10rem;
width: 10rem;
}
.srct-title {
color: white;
font-size: 1.72em;
text-shadow: 1px 1px 6px #333;
}
font-size: 2rem;
padding-top: 0.35rem;
padding-left: 0.5rem;
text-shadow: 1px 1px 6px #333;}
.jumbostyle {
background: url(/assets/img/meeting.jpg) no-repeat;
background-size: cover;
......@@ -41,6 +49,7 @@ a[name] {
box-shadow: inset 0px 0px 20px #333;
padding-top: 100px;
padding-bottom: 100px;
border-radius: unset;
}
.srctlogo {
width: 10px;
......@@ -67,6 +76,17 @@ a[name] {
padding-left:15px;
}
}
.index-card {
margin-bottom: 1rem;
}
.index-image {
border-radius: 50%;
height: 15rem;
margin-bottom: 1rem;
}
/**
* A cool little hack I found to try to allow a responsive Google Cal:
* http://themeloom.com/2013/02/tips-embed-google-maps-and-calendars-in-a-responsive-wordpress-theme/
......@@ -107,7 +127,7 @@ a[name] {
}
.project-link:hover, .project-link:active, .project-link:focus {
text-decoration: none;
outline:0;
outline: 0;
}
.project-icon-stacked {
font-size:55px;
......@@ -127,12 +147,11 @@ a[name] {
padding-bottom:15px;
}
#banner {
/*background:#FBFCCA;*/
padding-top: 5rem;
background: #e4e6d7;
/*background: #ffcc33;*/
/*background: #27AE60;*/
width: 100%;
margin-bottom: 15px;
font-size: 22.5px;
}
.page-header {
margin-top:0;
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment