瀏覽代碼

[ui] [minor] dirty and comment padding fix

version-14
Rushabh Mehta 11 年之前
父節點
當前提交
61c3d2fd42
共有 4 個檔案被更改,包括 8 行新增8 行删除
  1. +2
    -2
      public/css/bootstrap.css
  2. +4
    -4
      public/js/wn/form/comments.js
  3. +1
    -1
      public/js/wn/form/control.js
  4. +1
    -1
      public/js/wn/ui/appframe.js

+ 2
- 2
public/css/bootstrap.css 查看文件

@@ -5228,7 +5228,7 @@ a.thumbnail.active {
} }


.alert { .alert {
padding: 15px;
padding: 10px;
margin-bottom: 20px; margin-bottom: 20px;
border-radius: 4px; border-radius: 4px;
} }
@@ -5252,7 +5252,7 @@ a.thumbnail.active {
} }


.alert-dismissable { .alert-dismissable {
padding-right: 35px;
padding-right: 30px;
} }


.alert-dismissable .close { .alert-dismissable .close {


+ 4
- 4
public/js/wn/form/comments.js 查看文件

@@ -10,12 +10,12 @@ wn.ui.form.Comments = Class.extend({
var me = this; var me = this;
this.wrapper =this.parent; this.wrapper =this.parent;
this.row = $("<div class='row'>").appendTo(this.parent); this.row = $("<div class='row'>").appendTo(this.parent);
this.input = $('<div class="col-md-10">\
this.input = $('<div class="col-md-10" style="margin-top: 5px;">\
<textarea rows="3" class="form-control"></textarea></div>') <textarea rows="3" class="form-control"></textarea></div>')
.appendTo(this.row) .appendTo(this.row)
.find("textarea"); .find("textarea");
this.button = $('<div class="col-md-1">\ this.button = $('<div class="col-md-1">\
<button class="btn btn-default btn-go" class="col-md-1">\
<button class="btn btn-default btn-go" class="col-md-1" style="margin-top: 5px;">\
<i class="icon-ok"></i></button>\ <i class="icon-ok"></i></button>\
</div>') </div>')
.appendTo(this.row) .appendTo(this.row)
@@ -50,10 +50,10 @@ wn.ui.form.Comments = Class.extend({
$(repl('<div class="comment alert alert-warning col-md-10" data-name="%(name)s">\ $(repl('<div class="comment alert alert-warning col-md-10" data-name="%(name)s">\
<div class="row">\ <div class="row">\
<div class="col-md-1">\
<div class="col-xs-1">\
<span class="avatar avatar-small"><img src="%(image)s"></span>\ <span class="avatar avatar-small"><img src="%(image)s"></span>\
</div>\ </div>\
<div class="col-md-11">\
<div class="col-xs-11">\
%(comment)s%(delete)s<br>\ %(comment)s%(delete)s<br>\
<span class="small text-muted">%(fullname)s / %(comment_on)s</span>\ <span class="small text-muted">%(fullname)s / %(comment_on)s</span>\
</div>\ </div>\


+ 1
- 1
public/js/wn/form/control.js 查看文件

@@ -104,7 +104,7 @@ wn.ui.form.ControlImage = wn.ui.form.Control.extend({
this._super(); this._super();
var me = this; var me = this;
this.$wrapper 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() { .on("refresh", function() {
me.$wrapper.empty(); me.$wrapper.empty();
if(me.df.options && me.frm.doc[me.df.options]) { if(me.df.options && me.frm.doc[me.df.options]) {


+ 1
- 1
public/js/wn/ui/appframe.js 查看文件

@@ -35,7 +35,7 @@ wn.ui.AppFrame = Class.extend({
// appframe::title // appframe::title
get_title_area: function() { get_title_area: function() {
return this.$title_area.find(".title-area");
return this.$title_area;
}, },


set_title: function(txt, full_text) { set_title: function(txt, full_text) {


Loading…
取消
儲存