summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Baines <mail@cbaines.net>2014-06-15 18:25:01 +0100
committerChristopher Baines <mail@cbaines.net>2014-06-15 18:25:01 +0100
commitf0b914b88509fefc4ba7198d086fae06fcfa9640 (patch)
treec1c7f6e1c1c595fb563bd30613135ea7613c5e40
parentdd82f6fe6228abb25450ec09bfa70ef5690aa8ba (diff)
downloadcbaines.net-f0b914b88509fefc4ba7198d086fae06fcfa9640.tar
cbaines.net-f0b914b88509fefc4ba7198d086fae06fcfa9640.tar.gz
Improve the style and sidebar
-rw-r--r--about.mdwn2
-rw-r--r--contact.mdwn2
-rw-r--r--local.css68
-rw-r--r--posts.mdwn2
-rw-r--r--projects.mdwn2
-rw-r--r--sidebar-img.jpegbin0 -> 3874 bytes
-rw-r--r--sidebar.mdwn12
7 files changed, 64 insertions, 24 deletions
diff --git a/about.mdwn b/about.mdwn
index a7583f1..395dcf6 100644
--- a/about.mdwn
+++ b/about.mdwn
@@ -1,5 +1,3 @@
[[!meta title="About"]]
-#About Me
-
I am a Undergraduate studying Computer Science at the University of Southampton.
diff --git a/contact.mdwn b/contact.mdwn
index 27412df..027aff5 100644
--- a/contact.mdwn
+++ b/contact.mdwn
@@ -1,7 +1,5 @@
[[!meta title="Contact"]]
-#Contact Details
-
<style>
#contact
{
diff --git a/local.css b/local.css
index d1341ad..1b0e6db 100644
--- a/local.css
+++ b/local.css
@@ -12,9 +12,16 @@ h1, h2, h3, h4, h5, h6 {
/* Basic layout */
-body {
- margin: 1em auto 0 auto;
+html, body {
+ height: 100%;
+ margin: 0;
padding: 0;
+}
+
+.page {
+ height: 100%;
+ min-height: 100%;
+ margin: 0 auto 0 auto;
width: 65em;
max-width: 98%;
text-align: justify;
@@ -32,6 +39,11 @@ li {
padding: 0;
}
+#sidebar-text p {
+ font-size: 0.9em;
+ text-align: right;
+}
+
/* Typography */
/* 6pt = 0.375em
@@ -81,13 +93,13 @@ a:visited {
color: rgb(0, 136, 204);
}
-div.pageheader {
- padding-left: 10px;
+div.pageheader {
+ padding-top: 20px;
min-height: 60px;
- float: left;
+ float: right;
font-size: 0.9em;
- width: 160px;
+ width: 58.5em;
}
.actions ul {
@@ -96,21 +108,34 @@ div.pageheader {
div.sidebar {
float: left;
- clear:left;
width: 160px;
margin: auto;
background: none;
+ padding-top: 10px;
padding-left: 10px;
}
+div.sidebar table {
+ margin-left: auto;
+ margin-right: auto;
+}
+
+div.sidebar table caption {
+ font-size: 1.5em;
+ line-height: 1.4;
+}
+
+div.sidebar table img {
+ border-radius: 15px;
+}
+
#pagebody {
+ margin: 0 auto 0 180px;
border-left: 1px solid rgb(222, 222, 220);
- margin-left: 180px;
height: 100%;
- padding-left: 20px;
- min-height: 200px;
+ padding: 60px 0 0 20px;
}
.pageheader .actions ul {
@@ -122,23 +147,34 @@ div.sidebar {
}
div.sidebar a {
- border-top: 1px solid rgb(222, 222, 220);
- border-bottom: medium none;
+ border-bottom: 1px solid rgb(222, 222, 220);
display: block;
}
div.sidebar span {
- border-top: 1px solid rgb(222, 222, 220);
- border-bottom: medium none;
+ border-bottom: 1px solid rgb(222, 222, 220);
display: block;
color: rgb(0, 136, 204);
}
.inlinepage {
border: 0px;
+ clear: right;
}
-
#pageinfo {
- border-top: 1px solid rgb(222, 222, 220);
+ display: none;
+}
+
+.trails {
+ display: none;
+}
+
+.feedbutton {
+ margin-top: 0;
+}
+
+.feedlink {
+ float: right;
+ clear: right;
}
diff --git a/posts.mdwn b/posts.mdwn
index 79497a2..7e5e666 100644
--- a/posts.mdwn
+++ b/posts.mdwn
@@ -1,5 +1,3 @@
[[!meta title="Posts"]]
-# Posts
-
[[!inline pages="page(./posts/*) and !*/Discussion" archive=yes feedshow=10 quick=yes trail=yes]]
diff --git a/projects.mdwn b/projects.mdwn
index 6f8e69f..97560b8 100644
--- a/projects.mdwn
+++ b/projects.mdwn
@@ -1,5 +1,3 @@
[[!meta title="Projects"]]
-# Projects
-
[[!map pages="projects/* and !projects/*/*/*" show=title]]
diff --git a/sidebar-img.jpeg b/sidebar-img.jpeg
new file mode 100644
index 0000000..df19ad7
--- /dev/null
+++ b/sidebar-img.jpeg
Binary files differ
diff --git a/sidebar.mdwn b/sidebar.mdwn
index 983084a..bab0db1 100644
--- a/sidebar.mdwn
+++ b/sidebar.mdwn
@@ -1,3 +1,15 @@
+[[!img sidebar-img.jpeg alt="Christopher Baines" link=no caption="Christopher Baines"]]
+
+<div id="sidebar-text">
+<p>
+Living in the UK, studying Computer Science.
+</p>
+
+<p>
+I enjoy cats, coding and good company.
+</p>
+</div>
+
[[Home|index]]
[[Posts]]
[[Projects]]