changeset 2837:03e10af41cad

tweak basic sidebar styling; alignment, rounded corners
author RogerHaase <haaserd@gmail.com>
date Wed, 22 Oct 2014 09:00:45 -0700
parents 796a977ac521
children 40fd6fac76f8
files MoinMoin/themes/basic/static/css/theme.css MoinMoin/themes/basic/static/custom-less/theme.less MoinMoin/themes/basic/templates/layout.html MoinMoin/themes/basic/templates/show.html
diffstat 4 files changed, 57 insertions(+), 51 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/themes/basic/static/css/theme.css	Tue Oct 21 09:04:50 2014 -0700
+++ b/MoinMoin/themes/basic/static/css/theme.css	Wed Oct 22 09:00:45 2014 -0700
@@ -6296,7 +6296,7 @@
   margin-bottom: -1px;
   background-color: #ffffff;
   text-align: left;
-  padding: 5px 10px;
+  padding: 2px 10px;
   background-color: #c8ddf1;
   border: 1px solid #c8ddf1;
   width: 100%;
@@ -6336,9 +6336,12 @@
 .moin-useractions {
   float: right;
 }
+.list-group-item-heading {
+  margin: 7px 10px;
+}
 .list-group-item {
   text-align: left;
-  padding: 5px 10px;
+  padding: 2px 10px;
   background-color: #c8ddf1;
   border: 1px solid #c8ddf1;
 }
@@ -6350,6 +6353,7 @@
   border: 1px solid #1b436d;
   font-variant: small-caps;
   color: #c8ddf1;
+  border-radius: 4px;
 }
 .moin-list-heading > a {
   color: #c8ddf1;
@@ -6437,10 +6441,7 @@
   color: #d9534f;
 }
 .moin-sidebar-panels {
-  margin-bottom: 20px;
-  padding-left: 0;
   overflow: hidden;
-  padding-top: 15px;
 }
 .moin-sidebar-panels a .hidden-sm,
 .moin-sidebar-panels a .hidden-xs {
@@ -6558,7 +6559,7 @@
 }
 .moin-quicklink {
   position: relative;
-  padding: 5px 15px 5px 15px;
+  padding: 2px 10px 2px 10px;
   background-color: #c8ddf1;
   border: 1px solid #c8ddf1;
   margin-bottom: -1px;
--- a/MoinMoin/themes/basic/static/custom-less/theme.less	Tue Oct 21 09:04:50 2014 -0700
+++ b/MoinMoin/themes/basic/static/custom-less/theme.less	Wed Oct 22 09:00:45 2014 -0700
@@ -95,9 +95,13 @@
   float: right;
 }
 
+.list-group-item-heading {
+  margin: 7px 10px;
+}
+
 .list-group-item {
   text-align: left;
-  padding: 5px 10px;
+  padding: 2px 10px;
   background-color: @search_option_bar_text_color;
   border: 1px solid @search_option_bar_text_color;
   > a {
@@ -110,6 +114,7 @@
   border: 1px solid @navbar-bg;
   font-variant: small-caps;
   color: @search_option_bar_text_color;
+  border-radius: 4px;
   > a {
     color: @search_option_bar_text_color;
   }
@@ -150,9 +155,7 @@
 }
 
 .moin-sidebar-panels {
-  .list-group;
   overflow: hidden;
-  padding-top: 15px;
 }
 
 .moin-sidebar-panels a .hidden-sm,
@@ -190,7 +193,7 @@
 
 .moin-quicklink {
   position: relative;
-  padding: 5px 15px 5px 15px;
+  padding: 2px 10px 2px 10px;
   background-color: @search_option_bar_text_color;
   border: 1px solid @search_option_bar_text_color;
   margin-bottom: -1px;
--- a/MoinMoin/themes/basic/templates/layout.html	Tue Oct 21 09:04:50 2014 -0700
+++ b/MoinMoin/themes/basic/templates/layout.html	Wed Oct 22 09:00:45 2014 -0700
@@ -16,7 +16,7 @@
 {% macro local_panel_main(panelname) -%}
     {% for endpoint, href, iconcls, label, title, exists in panelname %}
         {# iconcls should be defined, defined for all local_panel_items, see themes/__init.py #}
-        {{ hyperlink(href, title, exists, label, iconcls + " icon-fixed-width", "list-group-item") }}
+        {{ hyperlink(href, title, exists, label, iconcls, "list-group-item wikilink") }}
     {% endfor %}
 {% endmacro %}
 
@@ -87,28 +87,34 @@
                     {% endif %}
 
                     {% if navibar_items %}
-                        <div class="list-group-item moin-list-heading"> {{ _("Site Navigation") }} </div>
-                        {% for cls, url, text, title in navibar_items if cls != 'userlink' %}
-                            <a class="list-group-item {{ cls }}
-                                {% if url in [current_url, current_path, current_url_showview] %} active{% endif %}" href="{{ url }}"
-                                {% if title %}title="{{ title }}"{% endif %}>
-                                {{ text|shorten_item_name }}
-                            </a>
-                        {% endfor %}
-                        {% if item_navigation %}
-                            <div class="list-group-item moin-list-heading"> {{ _("Supplementation") }} </div>
+                        <div class="moin-list-heading">
+                            <div class="list-group-item-heading">{{ _("Site Navigation") }}</div>
+                            {% for cls, url, text, title in navibar_items if cls != 'userlink' %}
+                                <a class="list-group-item {{ cls }}
+                                    {% if url in [current_url, current_path, current_url_showview] %} active{% endif %}" href="{{ url }}"
+                                    {% if title %}title="{{ title }}"{% endif %}>
+                                    {{ text|shorten_item_name }}
+                                </a>
+                            {% endfor %}
+                        </div>
+                    {% endif %}
+
+                    {% if item_navigation %}
+                        <div class="moin-list-heading">
+                            <div class="list-group-item-heading">{{ _("Supplementation") }}</div>
                             {{ local_panel_main(item_navigation) }}
-                        {% endif %}
+                        </div>
                     {% endif %}
 
                     {% for cls, url, text, title in navibar_items if cls == 'userlink' %}
-                        {% if loop.first %}
-                            <div class="list-group-item moin-list-heading">Quick Links</div>
+                        {% if loop.first %}<div class="moin-list-heading">
+                            <div class="list-group-item-heading">{{ _("Quick Links") }}</div>
                         {% endif %}
                         <div class="moin-quicklink">
                             <a class="moin-quicklink-label {{ cls }}" href="{{ url }}" {% if title %}title="{{ title }} : {{ url|safe }}"{% else %}"{{ url|safe }}"{% endif %}>{{ text|shorten_item_name(20) }}
                             </a>
                         </div>
+                        {% if loop.last %}</div>{% endif %}
                     {% endfor %}
 
                     {% if self.local_panel %}
--- a/MoinMoin/themes/basic/templates/show.html	Tue Oct 21 09:04:50 2014 -0700
+++ b/MoinMoin/themes/basic/templates/show.html	Wed Oct 22 09:00:45 2014 -0700
@@ -28,51 +28,47 @@
 {% endblock %}
 
 {% block local_panel %}
-
-        <!-- user, site, item actions -->
-    <div class="list-group">
-        {% if user_actions %}
-            <div class="list-group-item moin-list-heading">
+    {% if user_actions %}
+        <div class="moin-list-heading">
+            <div class="list-group-item-heading">
                 {{ _("User Actions") }}
                 <a class="moin-showhide moin-useractions" href="#" >[+]</a>
             </div>
             <div id="user-actions" class="hidden">{{ self.user_actions() }}</div>
-        {% endif %}
+        </div>
+    {% endif %}
 
-        <div class="list-group-item moin-list-heading">
-            View Options
+    <div class="moin-list-heading">
+        <div class="list-group-item-heading">
+            {{ _("View Options") }}
             <a class="moin-showhide moin-viewoptions" href="#">[+]</a>
         </div>
+
         <div id="view-options" class="hidden">
-            <button type="button"
-                    class="btn btn-default moin-user-action-special moin-toggle-comments-button moin-toggle-comments-tooltip"
-                    data-toggle="button"
-                    title="Show Comments">
-                <span class="pull-left">
+            <div class="moin-toggle-comments-button list-group-item" style="">
+                <a class="moin-toggle-comments-tooltip" href="#" title="Show comments">
                     <i class="fa fa-comment fa-fw"></i>
                     Comments
-                </span>
-            </button>
-            <button type="button"
-                    class="btn btn-default moin-user-action-special moin-transclusions-button moin-transclusions-tooltip"
-                    data-toggle="button"
-                    title="Show Transclusions">
-                <span class="pull-left">
+                </a>
+            </div>
+            <div class="moin-transclusions-button list-group-item" style="">
+                <a class="moin-transclusions-tooltip" href="#" title="Show transclusions">
                     <i class="fa fa-paste fa-fw"></i>
                     Transclusions
-                </span>
-            </button>
+                </a>
+            </div>
         </div>
+    </div>
 
-        {% if item_actions %}
-            <div class="list-group-item moin-list-heading">
+    {% if item_actions %}
+        <div class="moin-list-heading">
+            <div class="list-group-item-heading">
                 {{ _("Item Actions") }}
                 <a class="moin-showhide moin-itemactions" href="#" >[+]</a>
             </div>
             <div id="item-actions" class="hidden">{{ self.item_actions() }}</div>
-        {% endif %}
-    </div>
-
+        </div>
+    {% endif %}
 {% endblock %}
 
 {% block options_for_javascript %}