diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2012-08-23 11:28:24 -0400 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2012-08-23 11:28:24 -0400 |
| commit | 8e5df08f73c0cc29d2240604e5db418002aece07 (patch) | |
| tree | 111a463c87f74e373f9545e9671bd2cada708021 | |
| parent | c955b9512ffb11f0bcd55338f01f17b1d6076045 (diff) | |
| parent | 6ace42a0a4d836b309b70de78a3703cea651fa16 (diff) | |
| download | askbot-8e5df08f73c0cc29d2240604e5db418002aece07.tar.gz askbot-8e5df08f73c0cc29d2240604e5db418002aece07.tar.bz2 askbot-8e5df08f73c0cc29d2240604e5db418002aece07.zip | |
Merge branch 'adolfo-user-groups' into user-groups
| -rw-r--r-- | askbot/skins/default/media/style/style.css | 10 | ||||
| -rw-r--r-- | askbot/skins/default/media/style/style.less | 11 | ||||
| -rw-r--r-- | askbot/skins/default/templates/meta/bottom_scripts.html | 6 | ||||
| -rw-r--r-- | askbot/skins/default/templates/widgets/meta_nav.html | 2 |
4 files changed, 16 insertions, 13 deletions
diff --git a/askbot/skins/default/media/style/style.css b/askbot/skins/default/media/style/style.css index a2b6f194..55f5806f 100644 --- a/askbot/skins/default/media/style/style.css +++ b/askbot/skins/default/media/style/style.css @@ -319,14 +319,18 @@ body.user-messages { #metaNav #navGroups { background: 3px -132px url(../images/sprites.png) no-repeat; } -#metaNav #navBadges { - background: 0px -170px url(../images/sprites.png) no-repeat; +#metaNav a.group-name { + padding: 0px; +} +#metaNav span.dropdown:hover ul.dropdown-menu { + display: block; } #metaNav .dropdown { float: left; } #metaNav .dropdown-menu { - top: 120%; + /*top: 120%;*/ + left: 7%; } #header.with-logo #userToolsNav { diff --git a/askbot/skins/default/media/style/style.less b/askbot/skins/default/media/style/style.less index 14c83471..a03780c3 100644 --- a/askbot/skins/default/media/style/style.less +++ b/askbot/skins/default/media/style/style.less @@ -324,8 +324,12 @@ body.user-messages { .sprites(3px,-132px) } - #navBadges{ - .sprites(0px,-170px) + a.group-name { + padding: 0px; + } + + span.dropdown:hover ul.dropdown-menu { + display: block; } .dropdown { @@ -333,9 +337,10 @@ body.user-messages { } .dropdown-menu{ - top: 120%; + /*top: 120%;*/ left: 7%; } + } #header.with-logo #userToolsNav { diff --git a/askbot/skins/default/templates/meta/bottom_scripts.html b/askbot/skins/default/templates/meta/bottom_scripts.html index 067e4cc4..ea763b76 100644 --- a/askbot/skins/default/templates/meta/bottom_scripts.html +++ b/askbot/skins/default/templates/meta/bottom_scripts.html @@ -41,9 +41,6 @@ }); </script> {% endif %} -{%if settings.GROUPS_ENABLED%} -<script type="text/javascript" src="{{'/bootstrap/js/bootstrap.js'|media}}" /></script> -{% endif %} <script type="text/javascript"> /*<![CDATA[*/ $(document).ready(function(){ @@ -78,9 +75,6 @@ if (askbot['data']['userIsAdminOrMod']) { $('body').addClass('admin'); } - {%if settings.GROUPS_ENABLED%} - $(".dropdown-toggle").dropdown(); - {% endif %} }); {% if user_messages %} $('#validate_email_alert').click(function(){notify.close(true)}) diff --git a/askbot/skins/default/templates/widgets/meta_nav.html b/askbot/skins/default/templates/widgets/meta_nav.html index 6cfd44a5..659780c4 100644 --- a/askbot/skins/default/templates/widgets/meta_nav.html +++ b/askbot/skins/default/templates/widgets/meta_nav.html @@ -7,7 +7,7 @@ {% if settings.GROUPS_ENABLED %} <span class="dropdown"> <a - id="navGroups" class='dropdown-toggle {% if active_tab == 'groups' %}"on"{% endif %}' + id="navGroups" class='{% if active_tab == 'groups' %}"on"{% endif %}' href="{% url groups %}" data-target="#" > {% trans %}people & groups{% endtrans %} </a> |