From 6f143cc21f6fd4eb2713e6a8156b7ee0dfb3bc61 Mon Sep 17 00:00:00 2001 From: jeena Date: Wed, 10 Jul 2013 11:13:06 +0200 Subject: [PATCH 1/2] nicer admin navigation --- application/view/main.phtml | 4 ++++ public/style/admin.css | 39 ++++++++++++++++++++++++------------- 2 files changed, 30 insertions(+), 13 deletions(-) diff --git a/application/view/main.phtml b/application/view/main.phtml index d60a4d7..a960008 100644 --- a/application/view/main.phtml +++ b/application/view/main.phtml @@ -75,6 +75,10 @@ + + \ No newline at end of file diff --git a/public/style/admin.css b/public/style/admin.css index 64e3219..4f64fa1 100644 --- a/public/style/admin.css +++ b/public/style/admin.css @@ -1,28 +1,41 @@ #adminNavigation { font-family: verdana; - background-color: #90CB93; - position: absolute; - top: 0px; - left: 0px; - width: 689px; + background: #90CB93; + position: fixed; + bottom: 0; + left: 0; list-style-type: none; margin: 0; - padding: 2px; - font-size: 0.8em; - width: 725px; - * width: 729px; + padding: 0 70px; + width: 100%; + -webkit-box-sizing: border-box; /* Safari/Chrome, other WebKit */ + -moz-box-sizing: border-box; /* Firefox, other Gecko */ + box-sizing: border-box; /* Opera/IE 8+ */ } #adminNavigation li { - float: left; - padding: 0 5px; + display: inline; + padding: 0; +} + +#adminNavigation li:first-child { + padding-right: 1em; +} + +#adminNavigation li:last-child { + float: right; } #adminNavigation a { color: white; - background-color: #416843; - padding: 3px 5px; + background: #416843; + padding: 1em; text-decoration: none; + display: inline-block; +} + +#adminNavigation a:hover { + background: #216849; } From 68feb66d08c46fc55e66a9205a6291e55089e57e Mon Sep 17 00:00:00 2001 From: jeena Date: Wed, 10 Jul 2013 12:15:24 +0200 Subject: [PATCH 2/2] fixed admin navigation css --- application/controller/PageController.php | 2 +- application/view/AdminPage/edit.phtml | 53 +---------------------- public/style/admin.css | 8 +++- 3 files changed, 9 insertions(+), 54 deletions(-) diff --git a/application/controller/PageController.php b/application/controller/PageController.php index a2ef433..1452cad 100644 --- a/application/controller/PageController.php +++ b/application/controller/PageController.php @@ -15,7 +15,7 @@ class PageController extends Katharsis_Controller_Abstract { $preview = true; } - $method = substr($method, 0, -6); + $method = substr($method, 0, -6); // remove Action from urlAction $content = $this->_page->render($method, $preview); $content = DidgeridooArtwork_Page_Plugin::render($content); diff --git a/application/view/AdminPage/edit.phtml b/application/view/AdminPage/edit.phtml index 4efd068..7d256a9 100644 --- a/application/view/AdminPage/edit.phtml +++ b/application/view/AdminPage/edit.phtml @@ -1,55 +1,6 @@

Page bearbeiten

- - - - -
@@ -77,9 +28,9 @@
-
Header Bild
+
Headerbild
- + Auswählen | Hochladen
diff --git a/public/style/admin.css b/public/style/admin.css index 4f64fa1..3b2deab 100644 --- a/public/style/admin.css +++ b/public/style/admin.css @@ -11,10 +11,14 @@ -webkit-box-sizing: border-box; /* Safari/Chrome, other WebKit */ -moz-box-sizing: border-box; /* Firefox, other Gecko */ box-sizing: border-box; /* Opera/IE 8+ */ + box-shadow: 0 0 10px rgba(0,0,0,0.5); + border-top: 1px solid #85c188; + z-index: 2; } #adminNavigation li { - display: inline; + display: inline-block; + margin: -1px 0 0 0; padding: 0; } @@ -29,7 +33,7 @@ #adminNavigation a { color: white; background: #416843; - padding: 1em; + padding: 1em 2em; text-decoration: none; display: inline-block; }