<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>net_nemein_dasboard/static/img/list-add22x22.png</filename>
    </added>
    <added>
      <filename>net_nemein_dasboard/static/img/preferences-system-windows22x22.png</filename>
    </added>
    <added>
      <filename>net_nemein_dasboard/static/img/preferences-system22x22.png</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -4,38 +4,49 @@ body #toolbar
     top: 0;
     left: 0;
     color: #fff;
-    width: 80%;
+    width: 110%;
     z-index: 100;
+    font: 16px &quot;Lucida Grande&quot;, &quot;Trebuchet MS&quot;, Verdana, sans-serif;
 }
 
-body #toolbar #toolbar\:actions,
 body #toolbar #toolbar\:tabs
 {
-    background-color: #000;
+    background-color: #222;
     width: 95%;
 }
 
 body #toolbar\:toggle
 {
-    background: #000 url('../img/MidgardToolbar.png') no-repeat top left;
+    background: #222 url('../img/MidgardToolbar.png') no-repeat center center;
     width: 32px;
     height: 32px;
     display: block;
     float: left;
+    -moz-border-radius: 5px;
+    -webkit-border-radius: 5px;
+    position: absolute;
+    padding: 0.5em 0.5em 0em;
+}
+
+body #toolbar\:toggle.active
+{
+    border-bottom: 1px solid #111;
+    -moz-border-radius: 0px;
+    -webkit-border-radius: 0px;
 }
 
 body #toolbar\:tabs
 {
     float: left;
-    margin: 0;
+    margin: 0 0 0 40px;
     padding: 0;
-    border-bottom: 1px solid #333;
+    border-bottom: 1px solid #111;
 }
 
 body #toolbar\:tabs li
 {
     float: left;
-    height: 31px;
+    height: 40px;
 }
 
 body #toolbar\:tabs li
@@ -45,37 +56,71 @@ body #toolbar\:tabs li
 
 body #toolbar\:tabs li a
 {
-    background-color: #222;
     display: inline-block;
-    padding: 0.2em 0.5em 0.25em;
-    margin-top: 0.4em;
-    color: #fff;
+    padding: 0.6em 0.75em 0.55em 2.35em;
+    margin-top: 0.5em;
+    color: #777;
+    background-color: #222;
     text-decoration: none;
+    font-size: 0.875em;
+    text-transform: capitalize;
+    margin-left: 0.5em;
+    background-position: 8px 5px;
+    background-repeat: no-repeat;
+}
+
+/* Icons */
+body #toolbar\:tabs a#toolbar_items_link
+{
+    background-image: url('../img/preferences-system-windows22x22.png');
+}
+
+body #toolbar\:tabs a#toolbar_create_link
+{
+    background-image: url('../img/list-add22x22.png');
 }
 
-body #toolbar\:tabs li a:first
+body #toolbar\:tabs a#toolbar_system_link
 {
-    border-left: 1px solid #333;
+    background-image: url('../img/preferences-system22x22.png');
+}
+
+body #toolbar\:tabs li a:hover
+{
+    color: #fff;
+}
+
+body #toolbar\:tabs li a:focus
+{
+    border: none;
+    outline: none;
 }
 
-body #toolbar\:tabs li a:hover,
 body #toolbar\:tabs li a.selected
 {
-    background-color: #000;
-    border-right: 1px solid #333;
-    border-left: 1px solid #333;
-    border-top: 1px solid #333;
+    color: #fff;
+    background-color: #333 !important;
+    -moz-border-radius-topright: 5px;    
+    -moz-border-radius-topleft: 5px;
+    -webkit-border-top-left-radius: 5px;
+    -webkit-border-top-right-radius: 5px;
+    border-bottom: 1px solid #333;
+    -moz-border-bottom-colors: #111;
 }
 
 body #toolbar\:actions
 {
-    padding-left: 32px;
+    width: 95%;
+    padding-left: 40px;
+    background-color: #333;
+    border-top: 1px solid #444;
+    clear: left;
 }
 
 body #toolbar\:actions div
 {
-    clear: left;
-    padding: 5px;
+    padding: 1em;
+    background-color: #333;
 }
 
 body #toolbar\:actions a
@@ -86,6 +131,8 @@ body #toolbar\:actions a
     width: 200px;
     display: inline-block;
     overflow: hidden;
+    color: #fff;
+    font-size: 0.75em;
 }
 
 body #toolbar\:actions a.midgard_page</diff>
      <filename>net_nemein_dasboard/static/css/toolbar.css</filename>
    </modified>
    <modified>
      <diff>@@ -20,13 +20,13 @@ jQuery(function($) {
             $.getScript(opts.static_url+'/js/toolbar.highlight.js');
             
             
-            $root = $('&lt;div /&gt;').attr('id', 'toolbar').append(&quot;&lt;div id='toolbar:toggle'&gt;&lt;/div&gt;&lt;ul id='toolbar:tabs'&gt;&lt;li&gt;&lt;a href='#toolbar_items'&gt;items&lt;/a&gt;&lt;/li&gt;&lt;/ul&gt;&lt;div id='toolbar:actions'&gt;&lt;div id='toolbar_items'&gt;&lt;/div&gt;&lt;/div&gt;&quot;).hide();
+            $root = $('&lt;div /&gt;').attr('id', 'toolbar').append(&quot;&lt;div id='toolbar:toggle'&gt;&lt;/div&gt;&lt;ul id='toolbar:tabs'&gt;&lt;li&gt;&lt;a href='#toolbar_items' id='toolbar_items_link'&gt;items&lt;/a&gt;&lt;/li&gt;&lt;/ul&gt;&lt;div id='toolbar:actions'&gt;&lt;div id='toolbar_items'&gt;&lt;/div&gt;&lt;/div&gt;&quot;).hide();
             $('body').append($root);
             
             $toolbar = $('#toolbar');
             var $toggler = $('#toolbar\\:toggle').fadeTo(0, 0.25);
             $tab_container = $('#toolbar\\:tabs').hide();
-            $action_container = $(&quot;#toolbar\\:actions&quot;);
+            $action_container = $(&quot;#toolbar\\:actions&quot;).hide();
             $actions = $(&quot;#toolbar\\:actions &gt; div&quot;).hide();
             $editing = $actions.filter('#toolbar_items');
             $tabs = $('#toolbar\\:tabs li a');
@@ -66,7 +66,7 @@ jQuery(function($) {
                 for (key in json.categories)
                 {
                     $('&lt;li&gt;&lt;/li&gt;').append( 
-                        $tab = $('&lt;a /&gt;').attr(&quot;href&quot;, &quot;#toolbar_&quot;+json.categories[key]).text(json.categories[key])
+                        $tab = $('&lt;a /&gt;').attr({href: &quot;#toolbar_&quot;+json.categories[key], id: 'toolbar_'+json.categories[key]+'_link' }).text(json.categories[key])
                     ).appendTo($tab_container);
                     $tabs = $tabs.add($tab);
                     
@@ -106,10 +106,11 @@ jQuery(function($) {
                         $tab_container.show().find(':first a').click();
                     }                    
                     $toggler.data('active', true).addClass(opts.toggle_active_class);
+                    $action_container.show();
                 },
                 function() {
                     $tab_container.hide();
-                    $actions.hide();
+                    $action_container.hide();
                     $toggler.data('active', false).removeClass(opts.toggle_active_class);
                 }
             ).hover(</diff>
      <filename>net_nemein_dasboard/static/js/toolbar.js</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>546b096b4c6567a1a3d370d6bbf90c89848871d5</id>
    </parent>
  </parents>
  <author>
    <name>Joonas Bergius</name>
    <email>joonas.bergius@gmail.com</email>
  </author>
  <url>http://github.com/bergie/midcom/commit/d16b5715fd4cf4ce74053ad836c0bc0789607184</url>
  <id>d16b5715fd4cf4ce74053ad836c0bc0789607184</id>
  <committed-date>2009-06-18T06:35:35-07:00</committed-date>
  <authored-date>2009-06-18T06:35:35-07:00</authored-date>
  <message>Styles

git-svn-id: https://svn.midgard-project.org/midgard/trunk/midcom@22588 62f49d1c-1c16-0410-9156-d311ce72abac</message>
  <tree>4f2ab894596e6f3a1482c0e3cb67bb46294b73cf</tree>
  <committer>
    <name>Joonas Bergius</name>
    <email>joonas.bergius@gmail.com</email>
  </committer>
</commit>
