diff options
| -rw-r--r-- | SoMA2/static/css/main.css | 48 | ||||
| -rw-r--r-- | SoMA2/templates/base.html | 23 | ||||
| -rw-r--r-- | SoMA2/templates/categories.html | 7 |
3 files changed, 58 insertions, 20 deletions
diff --git a/SoMA2/static/css/main.css b/SoMA2/static/css/main.css index f642799..be4b116 100644 --- a/SoMA2/static/css/main.css +++ b/SoMA2/static/css/main.css @@ -11,7 +11,7 @@ body { background:url("../images/body-bg.jpg"); color: #000305; font-size: 87.5%; /* Base font size: 14px */ - font-family: 'Trebuchet MS', Trebuchet, 'Lucida Sans Unicode', 'Lucida Grande', 'Lucida Sans', Arial, sans-serif; + font-family: 'Avenir Next', Avenir, 'Helvetica Neue', Helvetica, sans-serif; line-height: 1.429; margin: 0; padding: 0; @@ -19,18 +19,19 @@ body { } /* Headings */ -h1 {font-size: 2em } -h2 {font-size: 1.714em; margin-bottom: .333em;} /* 22px */ -h3 {font-size: 1.429em} /* 20px */ -h4 {font-size: 1.286em} /* 18px */ -h5 {font-size: 1.143em} /* 16px */ -h6 {font-size: 1em} /* 14px */ +/* Actual sizes are 8/5 the stated. */ +h1 {font-size: 3.2em } +h2 {font-size: 2.7424em; margin-bottom: .333em;} /* 22px */ +h3 {font-size: 2.2864em} /* 20px */ +h4 {font-size: 2.0576em} /* 18px */ +h5 {font-size: 1.8288em} /* 16px */ +h6 {font-size: 1.6em} /* 14px */ h1, h2, h3, h4, h5, h6 { - font-weight: 400; + /* font-weight: 400; */ line-height: 1.1; margin-bottom: .8em; - font-family: 'Vollkorn', serif; + font-family: Helvetica, sans-serif; } h3, h4, h5, h6 { margin-top: .8em; } @@ -56,7 +57,7 @@ h1 a:hover { } /* Paragraphs */ -p {margin-bottom: 1.143em; color: #666; font-size:15px} +p {margin-bottom: 1.143em; color:#333 ; font-size:1.6em} strong, b {font-weight: bold; color: #333;} em, i {font-style: italic;} @@ -81,7 +82,6 @@ ol { float:right; } .LaunchyardDetail { - font-family: 'vollkorn'; font-size: 1.5em; position: fixed; left: 4%; @@ -91,13 +91,31 @@ ol { .LaunchyardDetail p { margin:0; + margin-bottom: 7em; text-align: center; font-size:.9em; } -.LaunchyardDetail a:first-child { +.LaunchyardDetail ul { + list-style: none; + margin:0; + padding-left:20px; +} +.LaunchyardDetail li { + font-size: 0.95em; + font-family: Helvetica, sans-serif; + font-weight: 700; + color: #333; + margin-bottom: 0.5em; +} + + +.LaunchyardDetial li a { +} + +.LaunchyardDetail a#sitesubtitle { text-decoration: none; - position: absolute; - margin: 28% 38%; + font-size: 1.5em; + color: black; } .post-info { width: 100%; @@ -424,7 +442,7 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;} li:last-child .hentry, #content > .hentry {border: 0; margin: 0;} #content > .hentry {padding: 1em 0;} .hentry img{display : none ;} -.entry-title {font-size: 2.5em; margin-bottom: 0px; margin-top: 0; } +.entry-title {font-size: 4em; margin-bottom: 0px; margin-top: 0; } .entry-title a:link, .entry-title a:visited {text-decoration: none; color: #333;} .entry-title a:visited {background-color: #fff;} diff --git a/SoMA2/templates/base.html b/SoMA2/templates/base.html index 55ddff1..442a45b 100644 --- a/SoMA2/templates/base.html +++ b/SoMA2/templates/base.html @@ -30,16 +30,29 @@ <body id="index" class="home"> {% include 'github.html' %} - <!-- <header id="banner" class="body"> - <h1><a href="{{ SITEURL }}/"><img src="http://www.launchyard.com/images/logo.png" />{% if SITESUBTITLE %}<strong>{{ SITESUBTITLE }}</strong>{% endif %}</a></h1> - </header> --> + <!-- <header id="banner" class="body"> --> + <!-- <h1><a href="{{ SITEURL }}/"><img src="http://www.launchyard.com/images/logo.png" />{% if SITESUBTITLE %}<strong>{{ SITESUBTITLE }}</strong>{% endif %}</a></h1> --> + <!-- </header> --> <!-- /#banner --> - <div class="LaunchyardDetail"><p><a href="{{ SITEURL }}/">{% if SITESUBTITLE %}{{ SITESUBTITLE }}{% endif %}</a><img src="{{ SITEURL }}/theme/images/blue-pin.png" width="100" height="100" alt="Graph icon"><br/>scottkensell.com<br/><a href="https://github.com/skensell" >github</a></p></div> + <div class="LaunchyardDetail"> + <p> + <img src="{{ SITEURL }}/theme/images/blue-pin.png" width="100" height="100" alt="Graph icon"> + <br/> + <a id="sitesubtitle" href="{{ SITEURL }}/">{% if SITESUBTITLE %}{{ SITESUBTITLE }}{% endif %}</a> + <br/> + <!-- This belongs in the about page --> + <!-- {% for name, link in SOCIAL %} --> + <!-- <a href="{{ link }}">{{ name }}</a> --> + <!-- <br/> --> + <!-- {% endfor %} --> + </p> + +{% include 'categories.html' %} + </div> {% block content %} {% endblock %} <section id="extras" > - </section><!-- /#extras --> diff --git a/SoMA2/templates/categories.html b/SoMA2/templates/categories.html new file mode 100644 index 0000000..c520511 --- /dev/null +++ b/SoMA2/templates/categories.html @@ -0,0 +1,7 @@ +{% block content %} +<ul> +{% for category, articles in categories %} + <li><a href="{{ SITEURL }}/{{ category.url }}">{{ category }}</a></li> +{% endfor %} +</ul> +{% endblock %} |