Add a third size scale, style .meta and .box the same

This commit is contained in:
str4d
2015-05-31 02:37:44 +00:00
parent dfdb1aa7cc
commit ccc3598c81
4 changed files with 21 additions and 18 deletions

View File

@@ -13,6 +13,7 @@
<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='styles/' + g.theme + '/default.css') }}" media="screen, handheld, print, projection" /> <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='styles/' + g.theme + '/default.css') }}" media="screen, handheld, print, projection" />
<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='styles/' + g.theme + '/mobile.css') }}" media="screen and (min-device-width:320px) and (max-width:767px)" /> <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='styles/' + g.theme + '/mobile.css') }}" media="screen and (min-device-width:320px) and (max-width:767px)" />
<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='styles/' + g.theme + '/desktop.css') }}" title="{{ g.theme }}" media="screen and (min-device-width:768px) and (min-width:768px), print, projection" /> <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='styles/' + g.theme + '/desktop.css') }}" title="{{ g.theme }}" media="screen and (min-device-width:768px) and (min-width:768px), print, projection" />
<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='styles/' + g.theme + '/widescreen.css') }}" title="{{ g.theme }}" media="screen and (min-device-width:1120px) and (min-width:1120px), print, projection" />
<!--[if IEMobile]> <!--[if IEMobile]>
<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='styles/' + g.theme + '/mobile.css') }}" media="screen" /> <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='styles/' + g.theme + '/mobile.css') }}" media="screen" />
<![endif]--> <![endif]-->
@@ -67,8 +68,9 @@
</aside> </aside>
{%- endif %} {%- endif %}
<article class="content-inner">
{% if self.lastupdated() or self.accuratefor() -%} {% if self.lastupdated() or self.accuratefor() -%}
<div class="meta lastupdated"> <div class="meta">
<!-- <!--
{% block lastupdated %}{% endblock %} {% block lastupdated %}{% endblock %}
{% block accuratefor %}{% endblock %} {% block accuratefor %}{% endblock %}
@@ -89,7 +91,6 @@
</div> </div>
{%- endif %} {%- endif %}
<article class="content-inner">
{% block content %}{% endblock %} {% block content %}{% endblock %}
</article> </article>
</div> </div>

View File

@@ -175,8 +175,6 @@ div#content .inner:before {
div#content .inner .fluid { div#content .inner .fluid {
background: white; background: white;
border-left: 2px solid #abcc71;
border-right: 2px solid #abcc71;
} }
div#content .sidebar { div#content .sidebar {
@@ -203,16 +201,16 @@ div#content .sidebar nav ul {
padding-left: 0.5em; padding-left: 0.5em;
} }
div#content .meta { div#content .inner .meta,
div#content .inner .box {
background-color: #ffffdd; background-color: #ffffdd;
border: 1px dashed; border: 1px dashed;
padding: 0.5em 1em; padding: 0.5em 1em;
position: relative; position: relative;
text-align: center;
} }
div#content .lastupdated { div#content .inner .meta {
margin: 1em 2em; text-align: center;
} }
div#content .content-inner { div#content .content-inner {

View File

@@ -240,7 +240,8 @@ div#content .aside:first-child {
*/ */
div#content .inner .fluid { div#content .inner .fluid {
margin: 0 30% 0 0.625rem; border-left: 2px solid #abcc71;
margin-left: 0.625rem;
} }
div#content .inner .sidebar { div#content .inner .sidebar {
@@ -250,15 +251,6 @@ div#content .inner .sidebar {
width: 250px; width: 250px;
} }
div#content .inner .meta {
border: 1px dashed;
position: absolute;
left: 72%;
margin: 1em 0;
right: 2%;
text-align: left;
}
div#content .content-inner { div#content .content-inner {
margin-left: 252px; margin-left: 252px;
} }

View File

@@ -0,0 +1,12 @@
div#content .inner .fluid {
border-right: 2px solid #abcc71;
margin-right: 30%;
}
div#content .inner .meta {
position: absolute;
left: 72%;
margin: 1em 0;
right: 2%;
text-align: left;
}