Merge branch 'master' into plugins-refactor

695dffac · JC Brand · 42437ffa · d5ead50b · 695dffac · 695dffac
Commit 695dffac authored May 14, 2015 by JC Brand
Expand all Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

css/converse.css css/converse.css +1 -1

css/converse.css.map css/converse.css.map +1 -1

src/templates/toolbar.html src/templates/toolbar.html +1 -1

No files found.
--- a/css/converse.css
+++ b/css/converse.css
@@ -1222,7 +1222,7 @@
    color: #681F2C; }
  #conversejs .set-xmpp-status {
    background: none;
-    padding: 0.5em; }
+    padding: 0.75em 0.5em 0.5em 0.5em; }
    #conversejs .set-xmpp-status .dropdown dd ul {
      z-index: 22; }
  #conversejs .minimized-chats-flyout,

--- a/css/converse.css.map
+++ b/css/converse.css.map
--- a/src/templates/toolbar.html
+++ b/src/templates/toolbar.html
 {[ if (show_emoticons)  { ]}
-    <li class="toggle-smiley icon-happy" title="Insert a smilery">
+    <li class="toggle-smiley icon-happy" title="Insert a smiley">
        <ul>
            <li><a class="icon-smiley" href="#" data-emoticon=":)"></a></li>
            <li><a class="icon-wink" href="#" data-emoticon=";)"></a></li>