projects / monospace.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5fb6389)
updated css master
authorLeander Hutton <leander@one-button.org>
Thu, 4 Aug 2022 13:41:15 +0000 (09:41 -0400)
committerLeander Hutton <leander@one-button.org>
Thu, 4 Aug 2022 13:41:15 +0000 (09:41 -0400)
12 files changed:
static/css/main.css patch | blob | history
templates/article.html patch | blob | history
templates/base.html patch | blob | history
templates/base.html.old [deleted file] patch | blob | history
templates/categories.html patch | blob | history
templates/index.html patch | blob | history
templates/landing.html patch | blob | history
templates/landing.html.old [deleted file] patch | blob | history
templates/page.html patch | blob | history
templates/portfolio.html [deleted file] patch | blob | history
templates/portfolio.html.old [deleted file] patch | blob | history
templates/tags.html patch | blob | history

diff --git a/static/css/main.css b/static/css/main.css
index ab7e46de2285f6c2d3a124f081578365cd46a77f..2716d81d3adbf9e56f165ea04037784607ed3d0d 100644 (file)
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -1,5 +1,5 @@
 @import url("pygment.css");
-body { margin:0px; padding:20px 0px; text-align:center; font-family:"Times New Roman", Times, serif; color:#000000; }
+body { margin:0px; padding:20px 0px; text-align:center; font-family: Sans-Serif; color:#000000; }
 a, a:visited { text-decoration:none; color:#1d2a78; }
 a:hover { text-decoration:underline; }
 h1, h2, h3, h4, h5, h6, h7 { margin:0px; line-height: 1.1em; }
@@ -10,15 +10,16 @@ blockquote cite { display:block; padding:10px 20px 0 0; text-align:right; }
 input, textarea { padding:5px; border:1px solid #8A8A8A; background:#EAEAEA; }
 input:hover, textarea:hover, blockquote:hover { background:#E5E5E5; }
 
-#wrap { margin:0px auto; text-align:left; line-height: 1.4; }
-#container { float:right; }
-#sidebar { overflow:hidden; clear:left; text-align:right; width:200px; height:auto; padding:0px 15px 0px 0px; border-right:1px dotted #C8C8C8; }
+#wrap { margin:0px auto; text-align:left; line-height: 1.4; width: 100%; }
+#container { float: right; width: 70% }
+#sidebar { overflow:hidden; clear:left; text-align:right; width:25%; height:auto; padding:0px 15px 0px 0px; border-right:1px dotted #C8C8C8; }
+#sidebar .description { display:block; font-size: 1.1em; width:100%; height:auto; margin:0px 0px 10px 0px; }
 #sidebar li { list-style-type:none; font-size: 1.2em; line-height: 1.3em; font-weight: bold; }
 #sidebar > li { margin:20px 0px; }
 #sidebar h1 { border-bottom:1px dotted #C8C8C8; }
 #sidebar .description { display:block; font-size: 1.1em; width:100%; height:auto; margin:0px 0px 10px 0px; }
 #landing img { display:block; border:1px solid #000000 !important; margin-left: auto; margin-right: auto; max-height: 100%; max-width: 100%; }
-#landing p { text-align: center; font-size: 1.4em; }
+#landing p { text-align: center; font-size: 1.2em; }
 
 
 ul.sub-menu, ul.children { margin:0px 10px 0px 0px; }
@@ -47,7 +48,7 @@ ul.sub-menu, ul.children { margin:0px 10px 0px 0px; }
 @media screen and (max-width: 600px) { .pcolumn { flex: 100%; max-width: 100%; } }
 
 
-.entry { font-size: 1.15em; padding-right: 1.0em; max-width:1024px; }
+.entry { font-size: 1.1em; padding-right: 1.0em; max-width:1024px; }
 .entry h2, h3, h4, h5 { margin:30px 0px 10px 0px; }
 
 .entry img { display:block; border:1px solid #000000 !important; margin-left: auto; margin-right: auto; max-height: 100%; max-width: 100%; }
diff --git a/templates/article.html b/templates/article.html
index 684500d623b7c63263e9a2b0549ce196660a82d3..56c4244d67b8c9b4b79c5569db32e9cac13edff2 100644 (file)
--- a/templates/article.html
+++ b/templates/article.html
@@ -1,8 +1,8 @@
 {% extends "base.html" %}
 {% block title %}{{ super() }} : {{ article.title }}{% endblock %}
 {% block content %}        
-<div id="wrap" style="width:100%">
-<div id="container" style="width:70%">
+<div id="wrap">
+<div id="container">
 <div class="entry">
 <header>
 <h1><a href="{{ SITEURL }}" id="site-title"> {#{{ SITENAME }}#} {% if SITESUBTITLE %} <strong>{{ SITESUBTITLE }}</strong>{% endif %}</a> {#:#}
diff --git a/templates/base.html b/templates/base.html
index e0da4d72d65640f617a2ccc9b801ba8af77202fd..ea1696eb3897133c2db6bc23dcd765ba665f9fc4 100644 (file)
--- a/templates/base.html
+++ b/templates/base.html
@@ -26,7 +26,7 @@
 {% block content %}
 {% endblock %}
 
-        <div id="sidebar" style="width:25%">
+        <div id="sidebar">
             <h1><a href="{{ SITEURL }} " title="title">{{ SITENAME }}</a></h1>
             <span class="description">{{ DESCRIPTION }} </span>
             <nav>
diff --git a/templates/base.html.old b/templates/base.html.old
deleted file mode 100644 (file)
index 92c1e6a..0000000
--- a/templates/base.html.old
+++ /dev/null
@@ -1,85 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-        <title>{% block title %}{{ SITENAME }}{%endblock%}</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="{{ SITEURL }}/theme/css/{{ CSS_FILE }}" type="text/css" />
-        <link href="{{ SITEURL }}/{{ FEED_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} ATOM Feed" />
-        {% if FEED_RSS %}
-        <link href="{{ SITEURL }}/{{ FEED_RSS }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" />
-        {% endif %}
-
-        <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="{{ SITEURL }}/css/ie.css"/>
-                <script src="{{ SITEURL }}/js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="{{ SITEURL }}/css/ie6.css"/><![endif]-->
-
-</head>
-
-<body>
-       <div id="wrap" style="width:100%">
-           <div id="container" style="width:70%">
-            <div class="entry">
-                {% block content %}
-                {% endblock %}
-            </div>
-        </div>
-
-
-        <div id="sidebar" style="width:25%">
-            <h1><a href="{{ SITEURL }} " title="title">{{ SITENAME }}</a></h1>
-            <span class="description">{{ DESCRIPTION }} </span>
-            <nav>
-                <ul>
-                    <li><a href="{{ SITEURL }}/index.html">Home</a></li>
-                    <li><a href="{{ SITEURL }}/posts.html">Articles</a></li>
-                    <li><a href="{{ SITEURL }}/portfolio.html">Photography</a></li>
-                    <li><a href="{{ SITEURL }}/about.html">About</a></li>
-                    <li><a href="{{ SITEURL }}/recommendations.html">Recommendations</a></li>
-                    {% if categories|length > 1 %}
-                  <!--  <li><a href="{{ SITEURL }}/categories.html">Categories</a></li>
-                {% endif %}
-                {% if tags|length > 1 %}
-                    <li><a href="{{ SITEURL }}/tags.html">Tags</a></li>
-                {% endif %} -->
-                    <br />
-<!--
-                    <li>Galleries:</li>
-                    {% for page in pages %}
-                    {% if page.title != "About" and page.title !="Welcome" %}
-                                    <li><a href="{{ SITEURL }}/{{ page.url }}">{{ page.title }}</a>{% if not loop.last %}{% endif %}</li>
-                    {% endif %}
-                   {% endfor %}
-                   <br />
--->
-                   <li>{{ LINKS_WIDGET_NAME | default('links') }}</li>
-                   {% for name, link in LINKS %}
-                        <li><a href="{{ link }}">{{ name }}</a></li>
-                  {% endfor %}
-                </ul>
-            </nav>
-
-            <span class="feed"><a href="{{ SITEURL }}/{{ FEED_RSS }}">RSS</a> | <a href="{{ SITEURL }}/{{ FEED_ATOM }}">Atom</a></span>
-        </div>
-
-        <div id="footer">
-
-            <div id="credits">
-                <span>Powered by <a href="https://www.debian.org/" target="_blank">Debian GNU/Linux</a> and <a href="https://blog.getpelican.com/" target="_blank">Pelican</a>.</span>
-            </div>
-                
-        </div>
-
-    {% include 'analytics.html' %}
-    {% include 'piwik.html' %}
-    {% include 'disqus_script.html' %}
-
-    </div>
-
-</body>
-</html>
diff --git a/templates/categories.html b/templates/categories.html
index 7a5e0d3f4cd0e5dd80ef22916e7e1cfe869a026f..f3bd403d99f9baa47ef31b4e9a4badb96b3537ea 100644 (file)
--- a/templates/categories.html
+++ b/templates/categories.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% block content %}
-<div id="wrap" style="width:100%">
-<div id="container" style="width:70%">
+<div id="wrap">
+<div id="container">
 <div class="entry">
 <ul>
 {% for category, articles in categories %}
diff --git a/templates/index.html b/templates/index.html
index f764e00c5ceb85ce9a4fddc10b79190e80e6d49d..1f6a175a3d81f371cfba19743c828f20976f9d34 100644 (file)
--- a/templates/index.html
+++ b/templates/index.html
@@ -1,8 +1,8 @@
 {% extends "base.html" %}
 {% block content_title %}{% endblock %}
 {% block content %}        
-<div id="wrap" style="width:100%">
-<div id="container" style="width:70%">
+<div id="wrap">
+<div id="container">
 <div class="entry">
 {% if articles %}
 
diff --git a/templates/landing.html b/templates/landing.html
index a926840b6100d6799633caf4ebe40e50209fdb11..46720ef4457a40bcc48654bec701b1691fba5c4d 100644 (file)
--- a/templates/landing.html
+++ b/templates/landing.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% block content %}
-       <div id="wrap" style="width:100%">
-           <div id="container" style="width:70%">
+       <div id="wrap">
+           <div id="container">
             <div id="landing" class="entry">
                {{ page.content }}
             </div>
diff --git a/templates/landing.html.old b/templates/landing.html.old
deleted file mode 100644 (file)
index e17a2da..0000000
--- a/templates/landing.html.old
+++ /dev/null
@@ -1,83 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-        <title>{% block title %}{{ SITENAME }}{%endblock%}</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="{{ SITEURL }}/theme/css/{{ CSS_FILE }}" type="text/css" />
-        <link href="{{ SITEURL }}/{{ FEED_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} ATOM Feed" />
-        {% if FEED_RSS %}
-        <link href="{{ SITEURL }}/{{ FEED_RSS }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" />
-        {% endif %}
-
-        <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="{{ SITEURL }}/css/ie.css"/>
-                <script src="{{ SITEURL }}/js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="{{ SITEURL }}/css/ie6.css"/><![endif]-->
-
-</head>
-
-<body>
-       <div id="wrap" style="width:100%">
-           <div id="container" style="width:70%">
-            <div id="landing" class="entry">
-               {{ page.content }}
-            </div>
-        </div>
-
-
-        <div id="sidebar" style="width:25%">
-            <h1><a href="{{ SITEURL }} " title="title">{{ SITENAME }}</a></h1>
-            <span class="description">{{ DESCRIPTION }} </span>
-            <nav>
-                <ul>
-                    <li><a href="index.html">Home</a></li>
-                    <li><a href="posts.html">Articles</a></li>
-                    <li><a href="portfolio.html">Photography</a></li>
-                    <li><a href="about.html">About</a></li>
-                    {% if categories|length > 1 %}
-                  <!--  <li><a href="{{ SITEURL }}/categories.html">Categories</a></li>
-                {% endif %}
-                {% if tags|length > 1 %}
-                    <li><a href="{{ SITEURL }}/tags.html">Tags</a></li>
-                {% endif %} -->
-                    <br />
-<!--
-                    <li>Galleries:</li>
-                    {% for page in pages %}
-                    {% if page.title != "About" and page.title !="Welcome" %}
-                                    <li><a href="{{ SITEURL }}/{{ page.url }}">{{ page.title }}</a>{% if not loop.last %}{% endif %}</li>
-                    {% endif %}
-                   {% endfor %}
-                   <br />
--->                   <li>{{ LINKS_WIDGET_NAME | default('links') }}</li>
-                   {% for name, link in LINKS %}
-                        <li><a href="{{ link }}">{{ name }}</a></li>
-                  {% endfor %}
-                </ul>
-            </nav>
-            
-               <span class="feed"><a href="{{ SITEURL }}/{{ FEED_RSS }}">RSS</a> | <a href="{{ SITEURL }}/{{ FEED_ATOM }}">Atom</a></span>
-
-        </div>
-
-        <div id="footer">
-
-            <div id="credits">
-                <span>Powered by <a href="https://www.debian.org/" target="_blank">Debian GNU/Linux</a> and <a href="https://blog.getpelican.com/" target="_blank">Pelican</a>.</span>
-            </div>
-                
-        </div>
-
-    {% include 'analytics.html' %}
-    {% include 'piwik.html' %}
-    {% include 'disqus_script.html' %}
-
-    </div>
-
-</body>
-</html>
diff --git a/templates/page.html b/templates/page.html
index 9ac4565213f3970a045514d2154894dbba5b5114..b6650b12fb36717c32ae94b0f6a3c9c9603a0b46 100644 (file)
--- a/templates/page.html
+++ b/templates/page.html
@@ -1,8 +1,8 @@
 {% extends "base.html" %}
 {% block title %}{{ page.title }}{% endblock %}
 {% block content %}        
-<div id="wrap" style="width:100%">
-<div id="container" style="width:70%">
+<div id="wrap">
+<div id="container">
 <div class="entry">
 
 <header>
diff --git a/templates/portfolio.html b/templates/portfolio.html
deleted file mode 100644 (file)
index 97d4310..0000000
--- a/templates/portfolio.html
+++ /dev/null
@@ -1,13 +0,0 @@
-{% extends "base.html" %}
-{% block title %}{{ page.title }}{% endblock %}
-{% block content %}        
-<div id="wrap" style="width:100%">
-<div id="container" style="width:70%">
-<div class="entry">
-
-<article>    
-    {{ page.content }}
-</article>
-</div>
-</div>
-{% endblock %}
diff --git a/templates/portfolio.html.old b/templates/portfolio.html.old
deleted file mode 100644 (file)
index c0912b5..0000000
--- a/templates/portfolio.html.old
+++ /dev/null
@@ -1,84 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-        <title>{% block title %}{{ SITENAME }}{%endblock%}</title>
-        <meta charset="utf-8" />
-        <link rel="stylesheet" href="{{ SITEURL }}/theme/css/{{ CSS_FILE }}" type="text/css" />
-        <link href="{{ SITEURL }}/{{ FEED_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} ATOM Feed" />
-        {% if FEED_RSS %}
-        <link href="{{ SITEURL }}/{{ FEED_RSS }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" />
-        {% endif %}
-
-        <!--[if IE]>
-                <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
-        <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="{{ SITEURL }}/css/ie.css"/>
-                <script src="{{ SITEURL }}/js/IE8.js" type="text/javascript"></script><![endif]-->
-
-        <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="{{ SITEURL }}/css/ie6.css"/><![endif]-->
-
-</head>
-
-<body>
-       <div id="wrap" style="width:100%">
-           <div id="container" style="width:70%">
-            <div class="portfolio">
-               {{ page.content }}
-            </div>
-        </div>
-
-
-        <div id="sidebar" style="width:25%">
-            <h1><a href="{{ SITEURL }} " title="title">{{ SITENAME }}</a></h1>
-            <span class="description">{{ DESCRIPTION }} </span>
-            <nav>
-                <ul>
-                    <li><a href="index.html">Home</a></li>
-                    <li><a href="posts.html">Articles</a></li>
-                    <li><a href="portfolio.html">Photography</a></li>
-                    <li><a href="about.html">About</a></li>
-                    {% if categories|length > 1 %}
-                  <!--  <li><a href="{{ SITEURL }}/categories.html">Categories</a></li>
-                {% endif %}
-                {% if tags|length > 1 %}
-                    <li><a href="{{ SITEURL }}/tags.html">Tags</a></li>
-                {% endif %} -->
-                    <br />
-<!--
-                    <li>Photo Portfolio:</li>
-                    {% for page in pages %}
-                    {% if page.title != "About" and page.title !="Welcome" and page.title !="Portfolio" %}
-                                    <li><a href="{{ SITEURL }}/{{ page.url }}">{{ page.title }}</a>{% if not loop.last %}{% endif %}</li>
-                    {% endif %}
-                   {% endfor %}
-                   <br />
---> 
-                  <li>{{ LINKS_WIDGET_NAME | default('links') }}</li>
-                   {% for name, link in LINKS %}
-                        <li><a href="{{ link }}">{{ name }}</a></li>
-                  {% endfor %}
-                </ul>
-            </nav>
-            
-               <span class="feed"><a href="{{ SITEURL }}/{{ FEED_RSS }}">RSS</a> | <a href="{{ SITEURL }}/{{ FEED_ATOM }}">Atom</a></span>
-
-        </div>
-
-        <div id="footer">
-
-            <div id="credits">
-                <span>Powered by <a href="https://www.debian.org/" target="_blank">Debian GNU/Linux</a> and <a href="https://blog.getpelican.com/" target="_blank">Pelican</a>.</span>
-            </div>
-                
-        </div>
-
-    {% include 'analytics.html' %}
-    {% include 'piwik.html' %}
-    {% include 'disqus_script.html' %}
-
-    </div>
-
-</body>
-</html>
diff --git a/templates/tags.html b/templates/tags.html
index af1a406253fd331063151438d5db23db92870860..418e090832d2fe0fec87967d471058edf8ef0e9b 100644 (file)
--- a/templates/tags.html
+++ b/templates/tags.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% block content %}
-<div id="wrap" style="width:100%">
-<div id="container" style="width:70%">
+<div id="wrap">
+<div id="container">
 <div class="entry">
 <ul>
 {% for tag, articles in tags %}
Unnamed repository; edit this file 'description' to name the repository.