diff --git a/less/header.less b/less/header.less index 5a04431..2328077 100644 --- a/less/header.less +++ b/less/header.less @@ -373,3 +373,77 @@ body.skin-default .header { } } } + +label.dropdown-toggle { + cursor: pointer; + margin: 0; +} + +#user-control-list-check:checked + #user-control-list { + display: block; +} + +.navbar-default { + .navbar-nav { + > li > label { + color: @navbar-default-link-color; + + &:hover, + &:focus { + color: @navbar-default-link-hover-color; + background-color: @navbar-default-link-hover-bg; + } + } + > .active > label { + &, + &:hover, + &:focus { + color: @navbar-default-link-active-color; + background-color: @navbar-default-link-active-bg; + } + } + > .disabled > label { + &, + &:hover, + &:focus { + color: @navbar-default-link-disabled-color; + background-color: @navbar-default-link-disabled-bg; + } + } + > .open > label { + &, + &:hover, + &:focus { + background-color: @navbar-default-link-active-bg; + color: @navbar-default-link-active-color; + } + } + } +} + +.dropdown-menu > li > form > button { + text-align: left; + width: 100%; + background: none; + border: none; + display: block; + padding: 3px 20px; + clear: both; + font-weight: normal; + line-height: @line-height-base; + color: @dropdown-link-color; + white-space: nowrap; // prevent links from randomly breaking onto new lines + + &:hover, + &:focus { + text-decoration: none; + color: @dropdown-link-hover-color; + background-color: @dropdown-link-hover-bg; + } +} + +html[data-dir="rtl"] { + .dropdown-menu > li > form > button { + text-align: right; + } +} diff --git a/lib/modules/quickreply.js b/lib/modules/quickreply.js index b7f322f..a79ae83 100644 --- a/lib/modules/quickreply.js +++ b/lib/modules/quickreply.js @@ -3,29 +3,30 @@ /*globals $, app, ajaxify, socket*/ define('persona/quickreply', ['components'], function(components) { - var QuickReply = {}; - - QuickReply.init = function() { - - var element = components.get('topic/quickreply/text'); - var data = { - element: element, - strategies: [], - options: { - zIndex: 100, - listPosition: function(position) { - this.$el.css(this._applyPlacement(position)); + var QuickReply = {}; + + QuickReply.init = function() { + + var element = components.get('topic/quickreply/text'); + var data = { + element: element, + strategies: [], + options: { + zIndex: 100, + listPosition: function(position) { + this.$el.css(this._applyPlacement(position)); this.$el.css('position', 'absolute'); return this; - } - } - }; - - $(window).trigger('composer:autocomplete:init', data); + } + } + }; + + $(window).trigger('composer:autocomplete:init', data); data.element.textcomplete(data.strategies, data.options); $('.textcomplete-wrapper').css('height', '100%').find('textarea').css('height', '100%'); - + components.get('topic/quickreply/button').on('click', function(e) { + e.preventDefault(); var replyMsg = components.get('topic/quickreply/text').val(); var replyData = { tid: ajaxify.data.tid, @@ -41,6 +42,6 @@ define('persona/quickreply', ['components'], function(components) { }); }); }; - - return QuickReply; + + return QuickReply; }); diff --git a/templates/category.tpl b/templates/category.tpl index c9d58e9..6800957 100644 --- a/templates/category.tpl +++ b/templates/category.tpl @@ -12,7 +12,7 @@
{error}