Skip to content

Commit 2f340d2

Browse files
committed
Update site styles and templates.
1 parent a4783a0 commit 2f340d2

File tree

9 files changed

+75
-15
lines changed

9 files changed

+75
-15
lines changed

CNAME

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1+
programmation.com.au

_config.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ name: Programmation Pty Limited
99
description: Mobile Development - Sydney, Australia
1010

1111
# URL of your avatar or profile pic (you could use your GitHub profile pic)
12-
# avatar: https://raw.githubusercontent.com/barryclark/jekyll-now/master/images/jekyll-logo.png
12+
#avatar: https://raw.githubusercontent.com/programmation/jekyll-now/master/images/logo.png
13+
avatar: ./images/logo.png
1314

1415
#
1516
# Flags below are optional
@@ -37,7 +38,7 @@ google_analytics:
3738

3839
# Your website URL (e.g. http://barryclark.github.io or http://www.barryclark.co)
3940
# Used for Sitemap.xml and your RSS feed
40-
url: http://programmation.github.io
41+
url: http://programmation.com.au
4142

4243
# If you're hosting your site at a Project repository on GitHub pages
4344
# (http://yourusername.github.io/repository-name)
@@ -49,12 +50,14 @@ baseurl: ""
4950
# !! You don't need to change any of the configuration flags below !!
5051
#
5152

52-
markdown: kramdown
53+
markdown: redcarpet
54+
redcarpet:
55+
extensions: ["no_intra_emphasis", "fenced_code_blocks", "autolink", "tables", "with_toc_data"]
5356
highlighter: pygments
5457
permalink: /:title/
5558

5659
# The release of Jekyll Now that you're using
57-
version: v1.0.0
60+
#version: v1.0.0
5861

5962
# Set the Sass partials directory, as we're using @imports
6063
sass:

_layouts/default.html

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,11 @@
2424
<div class="wrapper-masthead">
2525
<div class="container">
2626
<header class="masthead clearfix">
27+
<!--
2728
<a href="{{ site.baseurl }}/" class="site-avatar"><img src="{{ site.avatar }}" /></a>
28-
29+
-->
30+
<a href="{{ site.baseurl }}/" class="site-avatar"><img src="/images/logo.png" /></a>
31+
2932
<div class="site-info">
3033
<h1 class="site-name"><a href="{{ site.baseurl }}/">{{ site.name }}</a></h1>
3134
<p class="site-description">{{ site.description }}</p>

_scss/_highlights.scss

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
/***********************/
55

66
.highlight {
7-
/* background-color: $darkerGray; */
8-
background-color: #EFEFEF;
7+
background-color: $lightLightGray;
8+
/* background-color: #EFEFEF; */
99
padding: 5px 10px;
10+
line-height: 1;
1011
margin: 10px 0;
1112
}
1213

@@ -18,8 +19,16 @@
1819

1920
code {
2021
font-family: 'Courier', monospace;
21-
font-size: 14px;
22-
color: $black
22+
//font-size: 14px;
23+
font-size: 90%;
24+
color: $black;
25+
background-color: $lightLightGray;
26+
}
27+
28+
pre {
29+
background-color: $lightLightGray;
30+
//padding: 5px 10px;
31+
margin: 10px 0;
2332
}
2433

2534
// Solarized Light Pygments

_scss/_variables.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ $darkerGray: #222;
1212
$darkGray: #333;
1313
$gray: #666;
1414
$lightGray: #eee;
15+
$lightLightGray: #efefef;
1516
$white: #fff;
1617

1718
// Font stacks

images/logo.svg

Lines changed: 22 additions & 0 deletions
Loading

images/logo@2x.png

9.28 KB
Loading

images/logo@3x.png

15.5 KB
Loading

style.scss

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ html {
1919

2020
body {
2121
background: $white;
22-
font: 18px/1.4 $helvetica;
22+
font: 18px/1.4 $georgia;
2323
color: $darkGray;
2424
}
2525

2626
.container {
2727
margin: 0 auto;
28-
max-width: 740px;
28+
max-width: 1040px;
2929
padding: 0 10px;
30-
width: 100%;
30+
width: 90%;
3131
}
3232

3333
h1, h2, h3, h4, h5, h6 {
@@ -64,6 +64,28 @@ h4 {
6464
color: $gray;
6565
}
6666

67+
table {
68+
padding: 2px;
69+
}
70+
71+
table, th, td {
72+
border: 1px solid $darkGray;
73+
}
74+
75+
th {
76+
background-color: $gray;
77+
color: #fff;
78+
padding: 5px 15px;
79+
}
80+
81+
td {
82+
padding: 5px 15px;
83+
}
84+
85+
tr {
86+
background-color: $lightLightGray;
87+
}
88+
6789
p {
6890
margin: 15px 0;
6991
}
@@ -160,9 +182,9 @@ img {
160182

161183
.site-avatar {
162184
float: left;
163-
width: 70px;
185+
width: 50px;
164186
height: 70px;
165-
margin-right: 15px;
187+
margin-right: 5px;
166188

167189
@include mobile {
168190
float: none;

0 commit comments

Comments
 (0)