tweak layout

rande · rande · commit 505d200411e2 · 2014-04-08T19:36:31.000-04:00
diff --git a/element/resources/templates/base.html b/element/resources/templates/base.html
@@ -9,9 +9,9 @@
 
         <!-- Loading Bootstrap -->
         {% block element_css %}
-            <link href="{{ asset('css/custom.css') }}" rel="stylesheet">
-            <link href="{{ asset('vendor/bootstrap/dist/css/bootstrap.min.css') }}" rel="stylesheet">
             <link href="{{ asset('vendor/flatui/css/flat-ui.css') }}" rel="stylesheet">
+            <link href="{{ asset('vendor/bootstrap/dist/css/bootstrap.min.css') }}" rel="stylesheet">
+            <link href="{{ asset('css/custom.css') }}" rel="stylesheet">
         {% endblock %}
 
         {% block element_head_favicon %}
diff --git a/element/standalone/skeleton/config/config.yml b/element/standalone/skeleton/config/config.yml
@@ -48,29 +48,6 @@ element.plugins.security:
         - { path: ^/(admin|api),        role: ROLE_ADMIN }
         - { path: ^/.*,                 role: ['IS_AUTHENTICATED_ANONYMOUSLY'] }
 
-
-element.plugins.action:
-
-element.plugins.blog:
-
-element.plugins.contact:
-
-element.plugins.errors:
-
-element.plugins.feed:
-
-element.plugins.media:
-
-element.plugins.node:
-
-element.plugins.page:
-
-element.plugins.static:
-
-element.plugins.ngadmin:
-
-element.plugins.api:
-
 element.plugins.seo:
     title_pattern: "%seo.title_pattern%"
 
@@ -94,14 +71,23 @@ ioc.extra.tornado:
     #static_folder:      '%project.root_folder%/resources/static'
     template_folder:    'templates'
 
-ioc.extra.event:
+element.plugins.action:
+element.plugins.blog:
+element.plugins.contact:
+element.plugins.errors:
+element.plugins.feed:
+element.plugins.media:
+element.plugins.node:
+element.plugins.page:
+element.plugins.static:
+element.plugins.ngadmin:
+element.plugins.api:
+element.plugins.websocket:
 
+ioc.extra.event:
 ioc.extra.stats:
-
 ioc.extra.command:
-
 ioc.extra.jinja2:
-
 ioc.extra.mailer:
     host:       smtp.localhost
     port:       
diff --git a/element/standalone/skeleton/resources/element/templates/base.html b/element/standalone/skeleton/resources/element/templates/base.html
@@ -11,10 +11,12 @@
 
         <!-- Loading Bootstrap -->
         {% block element_head_css %}
-            <link href="{{ asset('css/custom.css') }}" rel="stylesheet">
             <link href="{{ asset('vendor/bootstrap/dist/css/bootstrap.min.css') }}" rel="stylesheet">
             <link href="{{ asset('vendor/flatui/css/flat-ui.css') }}" rel="stylesheet">
             <link href="{{ asset('vendor/flatui/css/demo.css') }}" rel="stylesheet">
+
+            <link href="{{ asset('css/custom.css') }}" rel="stylesheet">
+
         {% endblock %}
 
         {% block element_head_favicon %}
diff --git a/element/standalone/skeleton/resources/static/css/custom.css b/element/standalone/skeleton/resources/static/css/custom.css
@@ -1,3 +1,16 @@
-* {
-    line-height: 24px;
+h1, .h1 {
+    font-size: 1.4em;
+}
+
+h2, .h2 {
+    font-size: 1.3em;
+}
+
+
+h3, .h3 {
+    font-size: 1.2em;
+}
+
+h1, h2, h3 {
+    margin-top: 15px;
 }
