diff --git a/public/css/bootstrap.css b/public/css/bootstrap.css index b72d5239c7..04b8e3c81d 100644 --- a/public/css/bootstrap.css +++ b/public/css/bootstrap.css @@ -5228,7 +5228,7 @@ a.thumbnail.active { } .alert { - padding: 15px; + padding: 10px; margin-bottom: 20px; border-radius: 4px; } @@ -5252,7 +5252,7 @@ a.thumbnail.active { } .alert-dismissable { - padding-right: 35px; + padding-right: 30px; } .alert-dismissable .close { diff --git a/public/js/wn/form/comments.js b/public/js/wn/form/comments.js index 060b52b6a9..c797b64a78 100644 --- a/public/js/wn/form/comments.js +++ b/public/js/wn/form/comments.js @@ -10,12 +10,12 @@ wn.ui.form.Comments = Class.extend({ var me = this; this.wrapper =this.parent; this.row = $("
").appendTo(this.parent); - this.input = $('
\ + this.input = $('
\
') .appendTo(this.row) .find("textarea"); this.button = $('
\ - \
') .appendTo(this.row) @@ -50,10 +50,10 @@ wn.ui.form.Comments = Class.extend({ $(repl('
\
\ -
\ +
\ \
\ -
\ +
\ %(comment)s%(delete)s
\ %(fullname)s / %(comment_on)s\
\ diff --git a/public/js/wn/form/control.js b/public/js/wn/form/control.js index 1b0815102e..6f351689cc 100644 --- a/public/js/wn/form/control.js +++ b/public/js/wn/form/control.js @@ -104,7 +104,7 @@ wn.ui.form.ControlImage = wn.ui.form.Control.extend({ this._super(); var me = this; this.$wrapper - .css({"margin-bottom": "10px", "margin-right": "15px", "float": "right"}) + .css({"margin-bottom": "10px", "margin-right": "15px", "float": "right", "text-align": "right"}) .on("refresh", function() { me.$wrapper.empty(); if(me.df.options && me.frm.doc[me.df.options]) { diff --git a/public/js/wn/ui/appframe.js b/public/js/wn/ui/appframe.js index 07adfb6596..f5276b8884 100644 --- a/public/js/wn/ui/appframe.js +++ b/public/js/wn/ui/appframe.js @@ -35,7 +35,7 @@ wn.ui.AppFrame = Class.extend({ // appframe::title get_title_area: function() { - return this.$title_area.find(".title-area"); + return this.$title_area; }, set_title: function(txt, full_text) {