Skip to content

Commit

Permalink
lots of style tweaks! ooooh
Browse files Browse the repository at this point in the history
  • Loading branch information
@keflavich
keflavich committed Mar 30, 2013
1 parent 9f2990c commit 5bc552c
Show file tree
Hide file tree
Showing 2 changed files with 123 additions and 23 deletions.
37 changes: 33 additions & 4 deletions mine/static/css/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,13 @@ body {
font-size : 100% ;
/* background-color : white ;
color : #111 ; */
width : 80% ;
/*width : 80% ;*/
margin-left: auto;
margin-right: auto;
margin-top: 2%;
margin-bottom: 2%;
min-width : 400px ;
max-width : 120ex;
min-width : 80ex ;
min-height : 200px ;
padding : 1em ;
/*margin : 5% 10% ;*/
Expand Down Expand Up @@ -111,10 +112,15 @@ a.navbar:before {content:'['; display:inline; font-size:25pt; color:white; posit
a.navbar:after {content:']'; display:inline; font-size:25pt; color:white; position:relative; right:-3px; top:3.5px}

nav a:link { color:#AAAAFF; text-decoration:none;
background-color: #292929;
padding: 5px 0; white-space:nowrap; font-size:15px;}
nav a:visited { color:#AAAAFF; }
nav a:visited { color:#AAAAFF;
background-color: #292929;
}
nav a:hover { color:#CCCCCC; background:#444488; }
nav a:active { color:grey; }
nav a:active { color:grey;
background-color: #292929;
}
nav li {padding:2px; font-size:15px; display:inline;}

nav a:before {content:'['; display:inline; font-size:35px; position:relative; top:4px; left:-3px; color:white;}
Expand Down Expand Up @@ -211,6 +217,29 @@ a.norm:active { color:#FF3300; }
.sidebar {
font-size: 15px;
}
#sidebar {
float: right;
padding: 20px 30px 10px 0;
text-align: right;
width: 150px;
border-left:solid #AAAAAA;
}
/* *** Sidebar Styles *** */

#sidebar h3 {
font-size: 24px;
font-weight: normal;
}

#sidebar ul {
line-height: 1.8em;
list-style: none;
padding-bottom: 20px;
}

#sidebar ul a {
text-decoration: none;
}

.sectionHeader {
color: white;
Expand Down
109 changes: 90 additions & 19 deletions mine/templates/base.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,29 +33,100 @@
</head>

<body id="index" class="home">
<header id="banner" class="body" >
<div id="header" style='background-image: url("{{ SITEURL }}/static/{{ BGIMAGE }}"); background-position:left; min-heigt: 200px; background-repeat: no-repeat; max-width: 80%;'>
<h1 style="color: #C4C4C4;"><a class="header" href="{{ SITEURL }}">{{ SITENAME }} <strong>{{ SITESUBTITLE }}</strong></a></h1>
</div>
</header><!-- /#banner -->
<nav id="menu"><ul>
{% for title, link in MENUITEMS %}
<li><a href="{{ link }}">{{ title }}</a></li>
{% endfor %}
{% if DISPLAY_PAGES_ON_MENU %}
{% for p in PAGES %}
<li{% if p == page %} class="active"{% endif %}><a href="{{ SITEURL }}/{{ p.url }}">{{ p.title }}</a></li>
{% endfor %}
{% else %}
{% for cat, null in categories %}
<li{% if cat == category %} class="active"{% endif %}><a href="{{ SITEURL }}/{{ cat.url }}">{{ cat }}</a></li>
{% endfor %}
{% endif %}
</ul></nav><!-- /#menu -->


<header id="banner" class="body" >
<div id="header" style='background-image: url("{{ SITEURL }}/static/{{ BGIMAGE }}"); background-position:left; min-heigt: 200px; background-repeat: no-repeat; max-width: 80%;'>
<h1 style="color: #C4C4C4;"><a class="header" href="{{ SITEURL }}">{{ SITENAME }} <strong>{{ SITESUBTITLE }}</strong></a></h1>

<nav id="menu"><ul id="menulist">
{% for title, link in MENUITEMS %}
<li><a href="{{ link }}">{{ title }}</a></li>
{% endfor %}
{% if DISPLAY_PAGES_ON_MENU %}
{% for p in PAGES %}
<li{% if p == page %} class="active"{% endif %}><a href="{{ SITEURL }}/{{ p.url }}">{{ p.title }}</a></li>
{% endfor %}
{% else %}
{% if not SUPPRESS_CATEGORIES_ON_MENU %}
{% for cat, null in categories %}
<li{% if cat == category %} class="active"{% endif %}><a href="{{ SITEURL }}/{{ cat.url }}">{{ cat }}</a></li>
{% endfor %}
{% endif %}
{% endif %}
</ul></nav><!-- /#menu -->
</div>
</header><!-- /#banner -->

<div id="sidebar">
<ul>
{% if DISPLAY_PAGES_ON_MENU %}
<li>
<h3>Pages</h3>
<ul>
{% for page in PAGES %}
<li><a href="{{ SITEURL }}/{{ page.url }}">{{ page.title }}</a></li>
{% endfor %}
</ul>
</li>
{% endif %}
{% if not SUPPRESS_CATEGORIES_ON_MENU %}
<li>
<h3>Categories</h3>
<ul>
{% for cat, null in categories %}
<li {% if cat == category %}class="active"{% endif %}><a href="{{ SITEURL }}/{{ cat.url }}">{{ cat }}</a></li>
{% endfor %}
</ul>
</li>
{% endif %}
{% if LINKS %}
<li>
<h3>Blogroll</h3>
<ul>
{% for name, link in LINKS %}
<li><a href="{{ link }}">{{ name }}</a></li>
{% endfor %}
</ul>
</li>
{% endif %}
{% if SOCIAL %}
<li>
<h3>Social</h3>
<ul>
{% if FEED_ATOM %}
<li><a href="{{ SITEURL }}/{{ FEED_ATOM }}" rel="alternate">Atom feed</a></li>
{% endif %}
{% if FEED_RSS %}
<li><a href="{{ SITEURL }}/{{ FEED_RSS }}" rel="alternate">Flux Rss</a></li>
{% endif %}
{% for name, link in SOCIAL %}
<li><a href="{{ link }}">{{ name }}</a></li>
{% endfor %}
</ul>
</li><!-- /.social -->
{% endif %}
{% if tags %}
<li>
<h3>Tags</h3>
<ul>
{% for tag, articles in tags %}
<li><a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a></li>
{% endfor %}
</ul>
</li>
{% endif %}
</ul>
</div><!-- end #sidebar -->

{% block content %}
{% endblock %}
<footer id="contentinfo" class="body">
</footer><!-- /#contentinfo -->




</body>
</html>

0 comments on commit 5bc552c

Please sign in to comment.