# HG changeset patch # User Tero Marttila # Date 1412419299 -10800 # Node ID 70b425280964a3c5b01ee5f27826583ec4ba0858 # Parent f5227f26231b85ce34f1fbc7d92d0c5e12d41cbb move generic site template and static out of qmsk_www project diff -r f5227f26231b -r 70b425280964 qmsk_www/settings/site.py --- a/qmsk_www/settings/site.py Sat Oct 04 13:32:59 2014 +0300 +++ b/qmsk_www/settings/site.py Sat Oct 04 13:41:39 2014 +0300 @@ -17,11 +17,19 @@ # https://docs.djangoproject.com/en/1.7/howto/static-files/ STATIC_URL = '/static/' STATICFILES_DIRS = ( + # django project files './qmsk_www/static', + + # shared between django projects + './static', ) ## Site templates TEMPLATE_DIRS = ( + # django project files './qmsk_www/templates', + + # shared between django projects + './templates', ) diff -r f5227f26231b -r 70b425280964 qmsk_www/static/link.png Binary file qmsk_www/static/link.png has changed diff -r f5227f26231b -r 70b425280964 qmsk_www/static/style.css --- a/qmsk_www/static/style.css Sat Oct 04 13:32:59 2014 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,163 +0,0 @@ -/* - * Debootstrap - */ -a:hover { - color: inherit; -} - -code { - color: inherit; - background-color: inherit; -} - -/* - * Top header - */ -div#header { - padding: 30px; - - border-bottom: 1px dashed #a5a5a5; -} - -div#header h1 { - font-size: 48pt; - font-weight: bold; -} - -div#header a:hover { - text-decoration: none; -} - -/* - * Main navigation menu - */ -#nav { - margin: 20px 0px; -} - -#nav ul { - -} - -#nav ul ul { - -} - -#nav li a { - -} - -#nav li a:hover { - background-color: #d0d0d0; - text-decoration: none; -} - -#nav li.page-tree-active { - background-color: #808080; -} - -/* - * Content - */ -div#content { - -} - -div#breadcrumb { - display: none; - font-size: x-small; -} - -/* - * Footer - */ -div#footer { - padding: 20px 0px; - - border-top: 1px dashed #a5a5a5; - - font-size: x-small; - font-style: italic; -} - -div#footer-left { - float: left; -} - -.page-footer-modified { - float: right; - text-align: right; -} - -div#footer-center { - text-align: center; -} - -/* - * General styles - */ -a { - color: black; - text-decoration: none; - font-weight: bold; -} - -a:hover { - text-decoration: underline; -} - -h1 { - font-size: xx-large; - - text-align: center; -} - -h2 { - font-size: large; - - margin-left: 0px; - padding: 5px; - width: 100%; - - background-color: #e5e5e5; - - border: 1px dashed #c5c5c5; -} - -h3 { - font-size: medium; - font-style: italic; -} - -#content p { - margin-left: 0.5em; -} - -#content li { - padding: 2px; -} - -#content a { - padding-right: 13px; - - background: transparent url(/static/link.png) no-repeat center right; -} - -dt { - font-size: large; -} - -dd { - margin: 1em auto 1em 5em; -} - -/* Inline code */ - -/* Code block */ -pre { - display: block; - margin: 8px; - padding: 8px; - - border: 1px dotted #b5b5b5; -} diff -r f5227f26231b -r 70b425280964 qmsk_www/templates/site.html --- a/qmsk_www/templates/site.html Sat Oct 04 13:32:59 2014 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,61 +0,0 @@ -{% load staticfiles %} - - - - - {% block title %}{% endblock %} - - - - - - - - - - {% block head %} - - {% endblock %} - - -
- - -
- -
- {% block content %} - - {% endblock %} -
-
- -
- - - - - - - - {% block body %} - - {% endblock %} - - diff -r f5227f26231b -r 70b425280964 static/link.png Binary file static/link.png has changed diff -r f5227f26231b -r 70b425280964 static/style.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/static/style.css Sat Oct 04 13:41:39 2014 +0300 @@ -0,0 +1,163 @@ +/* + * Debootstrap + */ +a:hover { + color: inherit; +} + +code { + color: inherit; + background-color: inherit; +} + +/* + * Top header + */ +div#header { + padding: 30px; + + border-bottom: 1px dashed #a5a5a5; +} + +div#header h1 { + font-size: 48pt; + font-weight: bold; +} + +div#header a:hover { + text-decoration: none; +} + +/* + * Main navigation menu + */ +#nav { + margin: 20px 0px; +} + +#nav ul { + +} + +#nav ul ul { + +} + +#nav li a { + +} + +#nav li a:hover { + background-color: #d0d0d0; + text-decoration: none; +} + +#nav li.page-tree-active { + background-color: #808080; +} + +/* + * Content + */ +div#content { + +} + +div#breadcrumb { + display: none; + font-size: x-small; +} + +/* + * Footer + */ +div#footer { + padding: 20px 0px; + + border-top: 1px dashed #a5a5a5; + + font-size: x-small; + font-style: italic; +} + +div#footer-left { + float: left; +} + +.page-footer-modified { + float: right; + text-align: right; +} + +div#footer-center { + text-align: center; +} + +/* + * General styles + */ +a { + color: black; + text-decoration: none; + font-weight: bold; +} + +a:hover { + text-decoration: underline; +} + +h1 { + font-size: xx-large; + + text-align: center; +} + +h2 { + font-size: large; + + margin-left: 0px; + padding: 5px; + width: 100%; + + background-color: #e5e5e5; + + border: 1px dashed #c5c5c5; +} + +h3 { + font-size: medium; + font-style: italic; +} + +#content p { + margin-left: 0.5em; +} + +#content li { + padding: 2px; +} + +#content a { + padding-right: 13px; + + background: transparent url(/static/link.png) no-repeat center right; +} + +dt { + font-size: large; +} + +dd { + margin: 1em auto 1em 5em; +} + +/* Inline code */ + +/* Code block */ +pre { + display: block; + margin: 8px; + padding: 8px; + + border: 1px dotted #b5b5b5; +} diff -r f5227f26231b -r 70b425280964 templates/site.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/templates/site.html Sat Oct 04 13:41:39 2014 +0300 @@ -0,0 +1,61 @@ +{% load staticfiles %} + + + + + {% block title %}{% endblock %} + + + + + + + + + + {% block head %} + + {% endblock %} + + +
+ + +
+ +
+ {% block content %} + + {% endblock %} +
+
+ +
+ + + + + + + + {% block body %} + + {% endblock %} + +