From: zuber Date: Mon, 24 Aug 2009 13:57:01 +0000 (+0200) Subject: Przyciski w dwóch otwartych naraz edytorach XML sobie nie przeszkadzają. X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/76a7781f806775f0b29c50ab8937e4dd64807830?ds=sidebyside;hp=-c Przyciski w dwóch otwartych naraz edytorach XML sobie nie przeszkadzają. --- 76a7781f806775f0b29c50ab8937e4dd64807830 diff --git a/apps/toolbar/templates/toolbar/toolbar.html b/apps/toolbar/templates/toolbar/toolbar.html index c508929f..c6b5ebb9 100644 --- a/apps/toolbar/templates/toolbar/toolbar.html +++ b/apps/toolbar/templates/toolbar/toolbar.html @@ -1,14 +1,14 @@ {% load toolbar_tags %} -
-
    +
    +
      {% for group in groups %}
    1. {{ group.name }}
    2. {% endfor %}
     
    -
    +
    {% for group in groups %} -
      +
        {% for button in group.button_set.all %}
      1. {{ button.label }}
      2. {% endfor %} diff --git a/project/static/css/master.css b/project/static/css/master.css index 88e6583e..5912e1e7 100644 --- a/project/static/css/master.css +++ b/project/static/css/master.css @@ -194,12 +194,12 @@ label { /* = XML Editor panel = */ /* ==================== */ -#toolbar { +.toolbar { height: 48px; overflow: hidden; } -#toolbar, #toolbar ol, #sidebar-toolbar, #sidebar-toolbar ol { +.toolbar, .toolbar ol { /* overflow: hidden;*/ display: block; margin: 0; @@ -208,15 +208,7 @@ label { border-top: 1px solid #AAA; } -#sidebar-toolbar { - width: 0; -} - -#sidebar-toolbar, #sidebar-toolbar ol { - overflow: hidden; -} - -#sidebar-tabs li, #toolbar-tabs li { +.toolbar-tabs li { font-size: 14px; display: block; float: left; @@ -232,24 +224,24 @@ label { -webkit-border-top-right-radius: 8px; } -#sidebar-tabs, #toolbar-tabs { +.toolbar-tabs { height: 21px; z-index: 1000; /* overflow: hidden;*/ } -#sidebar-tabs li:hover, #sidebar-tabs li.active, #toolbar-tabs li:hover, #toolbar-tabs li.active { +.toolbar-tabs li:hover, .toolbar-tabs li.active { cursor: default; background-color: #EEE; border-bottom: 1px solid #EEE; } -#toolbar-buttons { +.toolbar-buttons { background-color: #EEE; border-bottom: 1px solid #AAA; } -#toolbar-buttons li { +.toolbar-buttons li { display: block; font-size: 12px; padding: 1px 8px; @@ -260,7 +252,7 @@ label { float: left; } -#toolbar-buttons li:hover { +.toolbar-buttons li:hover { background-color: #777; color: #FFF; cursor: default; diff --git a/project/templates/explorer/panels/xmleditor.html b/project/templates/explorer/panels/xmleditor.html index 89990a4a..f2a6d733 100644 --- a/project/templates/explorer/panels/xmleditor.html +++ b/project/templates/explorer/panels/xmleditor.html @@ -7,9 +7,9 @@