Skip to content

Commit f1fc51f

Browse files
author
Oscar Shaw
committed
Styling, member list preparation
1 parent c342043 commit f1fc51f

File tree

8 files changed

+70
-45
lines changed

8 files changed

+70
-45
lines changed

Diff for: _config.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ baseurl: "" # the subpath of your site, e.g. /blog/
77
url: "https://dvcoders.com" # the base hostname & protocol for your site
88
twitter_username: dvcoders
99
github_username: dvcoders
10-
facebook_username: dvcoders
11-
footer_note: dvcoders 2017
10+
facebook_username: dvcoders
11+
footer_note: dvcoders 2018
1212
collections:
1313
- projects
1414
exclude:

Diff for: _includes/header-page.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
<div class="page-banner">
3131
<h1>{{ page.title }}</h1>
3232

33-
<div class="page-subtitle-wrapper">
33+
<!-- <div class="page-subtitle-wrapper">
3434
<small>{{ page.subtitle }}</small>
35-
</div>
35+
</div> -->
3636
</div>
3737
</header>

Diff for: _includes/header.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<path fill="#424242" d="M18,13.516C18,14.335,17.335,15,16.516,15H1.484C0.665,15,0,14.335,0,13.516l0,0 c0-0.82,0.665-1.484,1.484-1.484h15.031C17.335,12.031,18,12.696,18,13.516L18,13.516z"/>
1111
</svg>
1212
</a>
13-
13+
1414
<div class="trigger">
1515
{% for page in site.pages %}
1616
{% if page.title %}
@@ -22,7 +22,7 @@
2222
</div>
2323

2424
<section class="banner">
25-
<h2>{{ site.title }}</h2>
25+
<h1>{{ site.title }}</h1>
2626
<p>{{ site.subtitle }}</p>
2727
</section>
2828
</header>

Diff for: _sass/_base.scss

+18-6
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,16 @@ body {
3030
/**
3131
* Set `margin-bottom` to maintain vertical rhythm
3232
*/
33-
h1, h2, h3, h4, h5, h6,
33+
h1, h2, h3, h4, h5, h6 {
34+
margin-bottom: $base-paragraph-spacing;
35+
margin-top: $base-paragraph-spacing * 4;
36+
}
37+
3438
p, blockquote, pre,
3539
ul, ol, dl, figure,
3640
%vertical-rhythm {
37-
margin-bottom: $spacing-unit / 2;
41+
// margin-bottom: $base-paragraph-spacing;
42+
margin-bottom: $spacing-unit / 2;
3843
}
3944

4045

@@ -47,6 +52,10 @@ img {
4752
vertical-align: middle;
4853
}
4954

55+
img.profile {
56+
max-width: 5em;
57+
}
58+
5059

5160

5261
/**
@@ -81,8 +90,10 @@ li {
8190
/**
8291
* Headings
8392
*/
84-
h1, h2, h3, h4, h5, h6 {
85-
font-weight: 300;
93+
h1 {
94+
font-family: $title-font-family !important;
95+
font-style: italic;
96+
font-weight: 600;
8697
}
8798

8899

@@ -213,9 +224,10 @@ pre {
213224
width: 32px;
214225
height: 32px;
215226
vertical-align: middle;
216-
227+
margin: 20px;
228+
217229
path {
218-
fill: #FFFFFF;
230+
fill: #FFFFFF;
219231
}
220232
}
221233
}

Diff for: _sass/_layout.scss

+11-10
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132

133133
.footer-col-wrapper {
134134
font-size: 15px;
135-
color: $grey-color;
135+
color: $grey-color;
136136
@extend %clearfix;
137137
}
138138

@@ -244,19 +244,20 @@
244244
}
245245

246246
.banner {
247-
color: #CCCCCC;
248-
margin: 6em 0 0 0;
247+
margin: auto;
249248
text-align: center;
250249

251-
h2 {
252-
font-size: 3.25em;
250+
h1 {
251+
font-size: 4.60em;
253252
line-height: 1em;
254-
font-weight: 300;
253+
font-weight: 800;
254+
color: $logo-color;
255255
}
256256

257257
p {
258258
font-weight: 100;
259259
font-style: italic;
260+
color: $slogan-color;
260261
}
261262

262263
@include media-query($on-palm) {
@@ -268,8 +269,8 @@
268269
padding: 3.5em;
269270
> h1 {
270271
font-size: 3.45em;
271-
font-weight: 300;
272-
font-family: 'Roboto', sans-serif;
272+
font-weight: 600;
273+
// font-family: 'Roboto', sans-serif;
273274
text-align: center;
274275
color: $page-title-font-color;
275276
}
@@ -308,7 +309,7 @@
308309
border-top: 1px $page-subtitle-line-color solid;
309310
padding-top: 10px;
310311
text-align: center;
311-
font-family: 'Roboto', sans-serif;
312+
// font-family: 'Roboto', sans-serif;
312313
font-style: italic;
313314
}
314315

@@ -319,7 +320,7 @@
319320
}
320321

321322

322-
// Projects
323+
// Projects
323324
.projects {
324325
ul {
325326
margin: 0;

Diff for: about.md

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,24 @@
11
---
22
layout: page
33
title: About
4-
subtitle:
4+
subtitle:
55
permalink: /about/
66
---
7-
#### **Where coders belong**
7+
## **Where coders belong**
88
Come and build software development skills for a lifetime of programming! Whether you are a seasoned developer or just interested in the joy of computer science, this is a place for you. At dvcoders we want you to be comfortable and welcome regardless of your programming experience.
99

10-
#### **Join us**
10+
11+
12+
## **Join us**
1113
Sign up at [apply.dvcoders.com](http://apply.dvcoders.com/)
1214

1315
Join our team chat at [chat.dvcoders.com](http://chat.dvcoders.com)
1416

1517
Already joined? Log in at [dvcoders.slack.com](http://dvcoders.slack.com)
1618

17-
#### **Connect with us**
19+
20+
21+
## **Connect with us**
1822
1923

2024
[orgsync.com](https://orgsync.com/152317/chapter)

Diff for: css/main.scss

+20-16
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,25 @@
33
---
44
@charset "utf-8";
55

6-
6+
$logo-color: #FAEF99;
7+
$slogan-color: #faf6e7;
78

89
// Our variables
9-
$base-font-family: 'Raleway', sans-serif;
10+
$title-font-family: 'Lato', serif;
11+
$base-font-family: 'Avenir', sans-serif;
1012
$base-font-size: 16px;
1113
$small-font-size: $base-font-size * 0.875;
12-
$base-line-height: 1.5;
14+
$base-line-height: 1.3;
1315

14-
$spacing-unit: 30px;
16+
$base-paragraph-spacing: 5px;
17+
$spacing-unit: 20px;
1518

1619
$text-color: #000;
17-
$background-color: #CDC3B8;
18-
$brand-color: #2a7ae2;
20+
$background-color: #FFFFFF;
21+
$wrapper-color: #FFFFFF;
22+
$brand-color: #66d9ef;
1923

20-
$grey-color: #828282;
24+
$grey-color: #66d9ef;
2125
$grey-color-light: lighten($grey-color, 40%);
2226
$grey-color-dark: darken($grey-color, 25%);
2327

@@ -32,22 +36,22 @@ $subtitle-font-size: 22px;
3236
$title-font-color: #FFF;
3337
$subtitle-font-color: #B6B6B6;
3438

35-
$site-title-color: #fff;
36-
$page-link-color: #fff;
37-
$active-page-link-color: #894A29;
39+
$site-title-color: #dcbe7d;
40+
$page-link-color: #dcbe7d;
41+
$active-page-link-color: #000000;
42+
3843

39-
$wrapper-color: #fff;
4044
$page-navbar-color: darken(#F0F0F0, 25%);
4145

4246
$index-title-font-size: 36px;
4347
$index-title-font-color: #000;
4448

45-
$page-title-font-color: #4F310F;
46-
$page-subtitle-font-color: #795E41;
47-
$page-subtitle-line-color: #9B8670;
48-
49-
$navbar-icon-size: 48px;
49+
// Content page headers
50+
$page-title-font-color: #3E3A59;
51+
$page-subtitle-font-color: #3E3A59;
52+
$page-subtitle-line-color: #3E3A59;
5053

54+
$navbar-icon-size: 32px;
5155
$timeline-block-color: #FAFAFA;
5256
// Using media queries with like this:
5357
// @include media-query($on-palm) {

Diff for: announcement.md renamed to sp18.md

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
---
22
layout: page
33
title: Spring 2018
4-
subtitle:
5-
permalink: /spring/
4+
subtitle:
5+
permalink: /sp18/
66
---
7-
#### **Club meetings**
7+
## **Club meetings**
88
Spring 2018 meetings will take place every **Thursday from 5:00PM to 6:30PM at ATC-109**. See you there!
99
This semester, we'll be creating a variety of C++ utility programs and web scrapers as well as working with a local startup, Acutulus Enterprises, to create a web application as a tie-in to one of their projects.
10+
11+
## **Club members**
12+
#### **Your name here**
13+
Write something about yourself! Include a link with this template if you want to: [Link title here](Link address here)

0 commit comments

Comments
 (0)