aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorm-r-r <raybaudroigm@gmail.com>2012-06-09 18:51:54 +0200
committerm-r-r <raybaudroigm@gmail.com>2012-06-09 18:51:54 +0200
commit2950b6abdad62fdd74682880acdec32f9b417420 (patch)
treed943a2c87f93674783224b8a5e2bd836261c9ad5
parentf9c20b4a00027b0e34e7f88069ce6c7e21eb8b37 (diff)
downloadpelican-themes-2950b6abdad62fdd74682880acdec32f9b417420.tar.gz
[dev-random] corrected url bugs
-rw-r--r--dev-random/static/css/main.css29
-rw-r--r--dev-random/static/css/skeleton.css6
-rw-r--r--dev-random/static/img/corner.pngbin3629 -> 3671 bytes
-rw-r--r--dev-random/templates/article.html10
-rw-r--r--dev-random/templates/index.html4
5 files changed, 31 insertions, 18 deletions
diff --git a/dev-random/static/css/main.css b/dev-random/static/css/main.css
index e9df3d2..39d8b62 100644
--- a/dev-random/static/css/main.css
+++ b/dev-random/static/css/main.css
@@ -45,11 +45,32 @@ a {
text-decoration: none;
}
-
a:hover {
text-decoration: underline;
}
+img, table, pre {
+ margin: 1em .5em;
+ padding: .25em;
+ border: thin solid silver;
+ overflow: auto;
+}
+
+figure {
+ display: block;
+ margin: 1em auto;
+ border: thin solid silver;
+ text-align: center;
+ font-size: .9em;
+}
+
+figure img {
+ margin: .1em;
+ padding: .1em;
+ border: none;
+ max-width: 100%;
+ overflow: auto;
+}
pre {
margin: 1em .5em;
@@ -213,7 +234,7 @@ table tr {
// GitHub button
-@media screen and (min-width: 600px) {
+@media screen and (min-width: 800px) {
#github-link {
display: block;
position: absolute;
@@ -226,12 +247,10 @@ table tr {
border: none;
text-decoration: none;
color: transparent;
- font-size: 0px;
- text-decoration: none;
+ font-size: 0;
}
}
-
// Tag list
ul#tagslist {
diff --git a/dev-random/static/css/skeleton.css b/dev-random/static/css/skeleton.css
index bcc9eba..dba964f 100644
--- a/dev-random/static/css/skeleton.css
+++ b/dev-random/static/css/skeleton.css
@@ -38,12 +38,6 @@ body, .page {
float: left;
}
-img, table, pre {
- max-width: 98%;
- margin: 1em 1%;
- overflow: auto;
-}
-
@media screen and (min-width: 800px) {
.page { margin: 5% 10%; }
}
diff --git a/dev-random/static/img/corner.png b/dev-random/static/img/corner.png
index 52e8690..e3f76cc 100644
--- a/dev-random/static/img/corner.png
+++ b/dev-random/static/img/corner.png
Binary files differ
diff --git a/dev-random/templates/article.html b/dev-random/templates/article.html
index 827698f..7255fbc 100644
--- a/dev-random/templates/article.html
+++ b/dev-random/templates/article.html
@@ -23,8 +23,8 @@
</a>
</h1>
<div class="meta">
- Dans «<a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a>»
- par <a href="{{ SITEURL }}/author/{{article.author}}.html">{{ article.author}}</a>
+ Dans «<a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>»
+ par <a href="{{ SITEURL }}/{{ article.author.url }}">{{ article.author}}</a>
{% if article.translations %}
&nbsp;&nbsp; Langues:
<a href="{{ SITEURL }}/{{ article.url }}">{{ article.lang or DEFAULT_LANG }}</a>
@@ -39,9 +39,9 @@
</div>
<footer class="post-footer">
<div class="meta">
- Posté dans «<a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a>»
- par <a href="{{ SITEURL }}/author/{{article.author}}.html">{{ article.author}}</a><br />
- Mots-clés: {% for tag in article.tags %} #<a href="{{ SITEURL }}/tag/{{ tag }}.html">{{ tag }}</a>{% endfor %}
+ Posté dans «<a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>»
+ par <a href="{{ SITEURL }}/{{ article.author.url }}">{{ article.author}}</a><br />
+ Mots-clés: {% for tag in article.tags %} #<a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a>{% endfor %}
</div>
</footer>
{% if DISQUS_SITENAME %}
diff --git a/dev-random/templates/index.html b/dev-random/templates/index.html
index c098ddc..0c27024 100644
--- a/dev-random/templates/index.html
+++ b/dev-random/templates/index.html
@@ -18,8 +18,8 @@
</a>
</h1>
<div class="meta">
- Dans «<a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a>»
- par <a href="{{ SITEURL }}/author/{{article.author}}.html">{{ article.author}}</a>
+ Dans «<a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>»
+ par <a href="{{ SITEURL }}/{{ article.author.url }}">{{ article.author }}</a>
{% if article.translations %}
&nbsp;&nbsp; Langues:
<a href="{{ SITEURL }}/{{ article.url }}">{{ article.lang or DEFAULT_LANG }}</a>