Commit dbdf87dd authored by Michelle Hertzfeld's avatar Michelle Hertzfeld
Browse files

Merge pull request #12 from CodeForTucson/gh-pages

Update master with changes from gh-pages
parents f578c6e6 548db3b8
# Ignore all logfiles and tempfiles.
.DS_Store
_site
\ No newline at end of file
.DS_Store*
_site/
assets/.sass-cache
.sass-cache
\ No newline at end of file
......@@ -3,17 +3,30 @@ Code For Tucson Website
This is the repository for the website for Code for Tucson, the Tucson chapter of the Code for America Brigade program. It is based on the website for [Code for DC](http://www.codefordc.org).
This site is built on Github pages and uses Jekyll for its blog.
This site is built on Github Pages, which uses [Jekyll](http://jekyllrb.com/) as a templating language.
To make changes:
+ We strongly recommend that you set up a local copy of the site and test your changes there before pushing them back to the repository!
##Compiling and publishing changes
We depend on a few Ruby gems:
* `gem install jekyll`
* `gem install kramdown`
We also depend on Sass:
* `gem install sass`
To keep our code updating continuously as we edit, we use `jekyll serve --baseurl '' --watch`. As of Jekyll 2.2.0, [gh-pages compiles Sass natively](https://github.com/blog/1867-github-pages-now-runs-jekyll-2-2-0). You no longer have to watch your Sass files separately from running Jekyll.
###To make changes:
+ You should set up a local copy of the site and test your changes there before pushing them back to the repository to make sure everything is good to go.
+ Work against the Master branch. Master == Staging.
+ The production website is hosted off of the 'gh-pages' branch. You shouldn't work against this, but when you have publication-ready changes in Master, you can pull those across to gh-pages to make them live. The reason for maintaining separate master and gh-pages branches is that it enables people to work against a shared master branch and merge back to it without needing to make the code ready for production first.
Special pages:
<!-- ###Special pages:
+ Press page uses /data/press.csv to populate its press listing (but not the press releases, which are hard-coded)
+ Projects page uses /data/projects.csv to populate the projects listing.
+ Blog pages are built programmatically using Jekyll from the entries in the /blog/_posts directory. There is similar content in the /blog/drafts directory, but these entries are working copies only that are not displayed on teh public website.
+ Blog pages are built programmatically using Jekyll from the entries in the /blog/_posts directory. There is similar content in the /blog/drafts directory, but these entries are working copies only that are not displayed on teh public website. -->
name: Code for Tucson | A Code for America Brigade
markdown: redcarpet
name: Code for Tucson
description: "Code for Tucson is a Code for America Brigade. The Code for America Brigade program is an international network of people committed to using their voices and hands, in collaboration with local governments, to make their cities better. Brigades build participatory power in their cities by holding regular civic hack nights and events, advocating for open data, and deploying apps. Brigades celebrate and share their successes with the Brigade network to further the global civic innovation movement."
markdown: kramdown
highlighter: pygments
owner:
name:
twitter:
facebook:
# For Google Authorship https://plus.google.com/authorship
google_plus:
google_analytics:
google_verify:
sass:
sass_dir: assets/_sass
baseurl: /codefortucson-site
url: http://CodeForTucson.github.io/codefortucson-site
#uncomment when working locally
#url: http://localhost:4000/
kramdown:
parse_block_html: true
\ No newline at end of file
<div class="col-lg-12"><hr class="footer-divider"/></div>
<div class="col-lg-12 footer">
<div class="col-lg-7">
<img src="{{ site.url }}/images/cfa_logo_greyscale.png" alt="Code for America" />
<p>Code for America is a non-partisan, non-political organization working to create low-risk settings for innovation between citizens and government. <a href="http://codeforamerica.org/" target="_blank">Learn more</a> about Code for America's mission and its Fellowship, Brigade, Accelerator, Peer Network and Code for All programs.
</p>
</div>
<div class="col-lg-4">
<p>Banner image: <a href="https://www.flickr.com/photos/phunk/3076205291">Steve Rotman</a></p>
<p>Cactus in logo: <a href="http://thenounproject.com/term/cactus/29212/">Jennifer Cozzette</a></p>
<p>Community icon: <a href="http://thenounproject.com/term/community/5122/#_=_">Michael Rowe</a></p>
</div>
</div>
\ No newline at end of file
<!-- This should be inserted in the page *before* any page-specific JS -->
<script src="/assets/js/jquery.js"></script>
<script src="/bootstrap/js/bootstrap.min.js"></script>
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
ga('create', 'UA-44079248-1', 'codefordc.org');
ga('send', 'pageview');
</script>
<script src="{{ site.baseurl }}/assets/js/jquery.js"></script>
<script src="{{ site.baseurl }}/assets/bootstrap/js/bootstrap.min.js"></script>
<script>
//highlights current page in sitewide nav (_navbar.html)
......
<!-- Basic Page Needs
================================================== -->
<meta charset="utf-8">
<title>{% if page.title %}{{ page.title }} &#8211; {% endif %}{{ site.name }}</title>
<meta name="description" content="{% if page.description %}{{ page.description }}{% else %}{{ site.description }}{% endif %}">
<meta name="author" content="">
<link rel="shortcut icon" href="http://www.codefordc.org/images/favicon.ico" />
<!-- Mobile Specific Metas
================================================== -->
<meta name="HandheldFriendly" content="True">
<meta name="MobileOptimized" content="320">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1">
<!-- CSS
================================================== -->
<link href="{{ site.baseurl }}/assets/bootstrap/css/bootstrap.min.css" rel="stylesheet">
<link href="{{ site.baseurl }}/assets/css/normalize.css" rel="stylesheet">
<link href="{{ site.baseurl }}/assets/css/styles.css" rel="stylesheet">
<!-- JS
================================================== -->
<!--[if IE]>
<script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
\ No newline at end of file
......@@ -6,14 +6,17 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="/index.html"><img src="/images/c4dc-logo-white-30x58.png"/></a>
<a class="navbar-brand" href="{{ site.url }}index.html"><img src="{{ site.url }}/images/codefortucson-mark.png"/ class="mark-50"></a>
<div class="nav-collapse collapse">
<ul class="nav navbar-nav" id="navbar-nav">
<li><a href="/index.html">Get Involved</a></li>
<li><a href="/projects.html">Projects</a></li>
<li><a href="/press.html">Press</a></li>
<li><a href="/blog/">Blog</a></li>
<li><a href="https://twitter.com/CodeforDC"><i class="fa fa-twitter">&nbsp;</i>@CodeforDC</a></li>
<li><a href="{{ site.baseurl }}/index.html">Get Involved</a></li>
<li><a href="https://www.google.com/calendar/embed?src=mu5662uugi97jtr43kajpo2i6k%40group.calendar.google.com&ctz=America/Phoenix" target="_blank">Calendar</a></li>
<li><a href="https://groups.google.com/forum/#!forum/codefortucsonbrigade" target="_blank">Community</a></li>
<li><a href="https://github.com/codefortucson" target="_blank">Projects</a></li>
<!-- <li><a href="{{ site.baseurl }}/projects/">Projects</a></li>
<li><a href="{{ site.baseurl }}/press/">Press</a></li>
<li><a href="{{ site.baseurl }}/blog/">Blog</a></li> -->
<!-- <li><a href="https://twitter.com/CodeforDC"><i class="fa fa-twitter">&nbsp;</i>@CodeforTucson</a> --></li>
</ul>
</div><!--/.nav-collapse -->
</div>
......
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="">
<meta name="author" content="">
<title>Code for Tucson</title>
<link rel="shortcut icon" href="http://www.codefordc.org/images/favicon.ico" />
<!-- Bootstrap core CSS -->
<link href="/bootstrap/css/bootstrap.min.css" rel="stylesheet">
<!-- Custom styles for this template -->
<link href="/css/style.css" rel="stylesheet">
{% include head.html %}
</head>
<body>
{% include _navbar.html %}
{{ content }}
{% include _footer.html %}
{% include navbar.html %}
{{ content }}
</body>
</html>
\ No newline at end of file
......@@ -52,5 +52,5 @@ layout: default
<div class="col-lg-1">
</div>
</div>
{% include _global_js.html %}
{% include _footer.html %}
\ No newline at end of file
{% include global_js.html %}
{% include footer.html %}
\ No newline at end of file
......@@ -12,33 +12,40 @@ body {
.black {
background:black;
color:white;
background:black;
color:white;
}
.blackish {
background:#222;
color:white;
background:#222;
color:white;
}
.light-grey {
background:#eee;
background:#eee;
}
h1.h0 {
font-size:59px;
font-weight:bold;
margin-top:10px;
font-size:59px;
font-weight:bold;
margin-top:10px;
}
.navbar-brand {
padding:10px;
padding:10px;
}
hr.footer-divider {
border-top: 2px solid #ccc;
border-top: 2px solid #ccc;
}
.call-out-img {
height: 100px;
}
.mark-50 {
width: 50px;
}
/***************************/
......@@ -48,97 +55,97 @@ hr.footer-divider {
.hero {
background: url('/images/hero_bg.jpg');
background-size: cover;
min-height: 300px;
min-width: 400px;
padding:0;
background: url('http://CodeForTucson.github.io/codefortucson-site/images/hero_bg.jpg');
background-size: cover;
min-height: 300px;
min-width: 400px;
padding:0;
}
.hero-text{
text-align:left;
padding-left: 15%;
background-color: rgba(0,0,0,0.15);
margin-top:25px;
text-align:left;
padding-left: 15%;
background-color: rgba(0,0,0,0.15);
margin-top:25px;
}
.hero-text img {
height: 200px;
padding: 15px;
height: 200px;
padding: 15px;
}
.hero-text h1 {
display: none;
display: none;
}
.heading-stripe {
margin-top:5px;
padding-left:0;
padding-right:0;
padding-bottom:10px;
margin-top:5px;
padding-left:0;
padding-right:0;
padding-bottom:10px;
}
.heading-stripe h2 {
padding-top:5px;
padding-bottom:5px;
padding-top:5px;
padding-bottom:5px;
}
.announcement-icon {
float:left;
margin-top:15px;
/*margin-left:20px;
margin-right:20px;*/
margin-bottom:20px;
float:left;
margin-top:15px;
/*margin-left:20px;
margin-right:20px;*/
margin-bottom:20px;
}
.announcement-icon img{
/*width: 450px;*/
width:100%;
/*width: 450px;*/
width:100%;
}
.announcement-content {
text-align:justify;
margin-top:20px;
/*margin-left:20px;
margin-right:20px;*/
margin-bottom:20px;
text-align:justify;
margin-top:20px;
/*margin-left:20px;
margin-right:20px;*/
margin-bottom:20px;
}
.stuff-weve-made-stripe {
margin-top:60px;
margin-top:60px;
}
.project-stripe-odd,
.project-stripe-even {
margin-top:20px;
margin-top:20px;
}
.project-stripe-img {
background-color:black;
padding:2px;
margin-bottom:20px;
background-color:black;
padding:2px;
margin-bottom:20px;
}
.project-stripe-img img{
width:100%;
width:100%;
}
.project-stripe-txt {
background-color:white;
margin-bottom:40px;
background-color:white;
margin-bottom:40px;
}
.project-stripe-txt h2 {
margin-top:0;
margin-top:0;
}
img.project-git-human {
width: 50px;
margin-top:5px;
margin-bottom: 5px;
border: 2px solid black;
width: 50px;
margin-top:5px;
margin-bottom: 5px;
border: 2px solid black;
}
/***************************/
......@@ -148,26 +155,26 @@ img.project-git-human {
.project-image,
.project-text {
margin-bottom:40px;
margin-bottom:40px;
}
#project-list h3,
#press-list h3 {
margin-top:0;
margin-bottom:5px;
margin-top:0;
margin-bottom:5px;
}
#project-list,
#press-list {
text-align:center;
text-align:center;
}
.project-icon
{
margin-bottom:10px;
margin-bottom:10px;
}
/***************************/
......@@ -179,31 +186,31 @@ img.project-git-human {
}
.press-item {
background-color: #eee;
/*border: 2px solid black;*/
margin:10px 0 20px 0;
padding:0;
background-color: #eee;
/*border: 2px solid black;*/
margin:10px 0 20px 0;
padding:0;
}
.press-icon {
margin-bottom:10px;
padding:20px 0 20px 0;
background-color:#222;
margin-bottom:10px;
padding:20px 0 20px 0;
background-color:#222;
}
.press-icon img {
width:66%;
max-width:200px;
width:66%;
max-width:200px;
}
.press-text {
padding:0 10px 10px 10px;
padding:0 10px 10px 10px;
}
.press-release-row {
padding-top:10px;
padding-bottom:10px;
padding-top:10px;
padding-bottom:10px;
}
.press-release-row.even {
......@@ -211,19 +218,19 @@ img.project-git-human {
}
.press-release-row.odd {
background-color:#eee;
background-color:#eee;
}
.press-release-row-icon {
margin-bottom:10px;
margin-bottom:10px;
}
.press-release-row-icon img{
width:100px;
width:100px;
}
.press-release-row-text {
text-align:justify;
text-align:justify;
}
/***************************/
......@@ -231,66 +238,66 @@ img.project-git-human {
/***************************/
.blog-hero {
background: url('/images/fiction-parade - posted-bills.jpg');
background-size: cover;
min-height: 300px;
min-width: 400px;
padding:0;
background: url('/images/fiction-parade - posted-bills.jpg');
background-size: cover;
min-height: 300px;
min-width: 400px;
padding:0;
}
.blog-hero .hero-text {
font-size:120px;
margin-top:55px;
font-size:120px;
margin-top:55px;
}
.post {
text-align: left;
text-align: left;
}
.blog-avatar {
float:left;
max-width: 150px;
margin: 4px 15px 10px 0;
background: #000 ;
padding:0px;
border: solid black 0px;
float:left;
max-width: 150px;
margin: 4px 15px 10px 0;
background: #000 ;
padding:0px;
border: solid black 0px;
}
.blog-avatar .blog-avatar-img {
width: 150px;
border: 4px solid black;
width: 150px;
border: 4px solid black;
}
.blog-avatar-content {
padding: 5px;
text-align: center;
color: #CCC;
font-size:90%;
font-weight:bold;
padding: 5px;
text-align: center;
color: #CCC;
font-size:90%;
font-weight:bold;
}
.post-footer {
margin-top: 20px;
margin-top: 20px;
}
.post-footer-previous {
float:left;
float:left;
}
.post-footer-next {
float:right;
float:right;
}
.blog-img-wrapper {
float:right;
padding:10px;
border:2px solid black;
background:#999;
margin: 10px 0 10px 10px;
float:right;
padding:10px;
border:2px solid black;
background:#999;
margin: 10px 0 10px 10px;
}
.blog-img-wrapper img {
width: 200px;
width: 200px;
}
/***************************/
/* blog post stub */
......@@ -298,30 +305,30 @@ img.project-git-human {
.post.stub h2 {
text-align:center;
text-align:center;
}
.post.stub h2 a {
color: black;
color: black;
}
.post.stub h2 a:hover {
text-decoration:none;
color: #999;
text-decoration:none;
color: #999;
}
.post.stub .blog-avatar {
max-width: 100px;
max-width: 100px;
}
.post.stub .blog-avatar .blog-avatar-img {
border: 4px solid black;
width: 100px;
border: 4px solid black;
width: 100px;
}
.post.stub .blog-avatar-content {
font-weight: normal;
font-weight: normal;