diff --git a/idre/settings.py b/idre/settings.py index 173d6c8..a039d53 100644 --- a/idre/settings.py +++ b/idre/settings.py @@ -61,7 +61,7 @@ DATABASES = { # Internationalization # https://docs.djangoproject.com/en/1.7/topics/i18n/ -LANGUAGE_CODE = 'fr-FR' +LANGUAGE_CODE = 'en-UK' TIME_ZONE = 'Europe/Paris' USE_I18N = True USE_L10N = True diff --git a/news/static/news/css/news.css b/news/static/news/css/news.css index 1873d9f..0bf412d 100644 --- a/news/static/news/css/news.css +++ b/news/static/news/css/news.css @@ -1,22 +1,17 @@ -#news article .title { +.article .header .title { font-size: 1.2em; font-weight: bold; } -#news article .author, -#news article .date { - font-style: oblique; +.article .content { + text-align: justify; } -#news hr { +hr { border-color: #929292 -moz-use-text-color -moz-use-text-color; border-right: 0px none; border-style: solid none none; border-width: 1px 0px 0px; margin-bottom: 20px; margin-top: 20px; - -moz-border-bottom-colors: none; - -moz-border-left-colors: none; - -moz-border-right-colors: none; - -moz-border-top-colors: none; } diff --git a/news/templates/news/news.html b/news/templates/news/news.html index 6665c73..f20b8a9 100644 --- a/news/templates/news/news.html +++ b/news/templates/news/news.html @@ -12,17 +12,26 @@
{% for article in articles %} -
-

- {{ article.title }} - {{ article.author }}, - {{ article.date }} -

- {% autoescape off %} - {{ article.content }} - {% endautoescape %} +
+
+
+ {{ article.title }} +
+
+ By {{ article.author }}, + {{ article.date }} +
+
+ +
+ {% autoescape off %} + {{ article.content }} + {% endautoescape %} +
- {% if not forloop.last %}
{% endif %} + {% if not forloop.last %} +
+ {% endif %} {% endfor %}
diff --git a/static/css/base.css b/static/css/base.css index e0f607a..9cbd32b 100644 --- a/static/css/base.css +++ b/static/css/base.css @@ -17,7 +17,6 @@ body { } - /* Header */ header { @@ -32,7 +31,6 @@ header img { } - /* Nav bar */ nav { @@ -57,7 +55,6 @@ nav .link:nth-child(4):hover { background-color: #ab9df2; } nav .link:nth-child(5):hover { background-color: #78dce8; } - /* Content */ #content { @@ -89,8 +86,7 @@ nav .link:nth-child(5):hover { background-color: #78dce8; } } - -/* Extra */ +/* Extras */ .grayscale { /* Firefox 10+ (& Android) */