diff --git a/bricks/.DS_Store b/bricks/.DS_Store index 1488c89..412be8b 100755 Binary files a/bricks/.DS_Store and b/bricks/.DS_Store differ diff --git a/bricks/conform.js b/bricks/conform.js index cfb8efb..8cee484 100644 --- a/bricks/conform.js +++ b/bricks/conform.js @@ -1,12 +1,13 @@ var bricks = window.bricks || {}; bricks.Conform = class extends bricks.BMessage { constructor(opts){ - opts.auto_dismiss = false; + opts.auto_open = true; + opts.auto_close = false; super(opts); - this.create_btns(); + this.create_toolbar(); } - create_tooolbar(){ - desc = { + create_toolbar(){ + var desc = { tools:[ bricks.extend({ "name":"conform", @@ -14,13 +15,13 @@ bricks.Conform = class extends bricks.BMessage { "label":'Conform' }, this.opts.conform||{}), bricks.extend({ - "name":"cancel", + "name":"discard", "icon":bricks_resource('imgs/cancel.png'), "label":"Discard" }, this.opts.discard||{}) ] } - w = new bricks.IconTextBar(desc); + var w = new bricks.IconTextBar(desc); w.bind('conform', this.conform_hndl.bind(this)); w.bind('discard', this.discard_hndl.bind(this)); if (!w) return; @@ -32,7 +33,6 @@ bricks.Conform = class extends bricks.BMessage { } discard_hndl(event){ this.dismiss(); - this.dispatch('discard'); } } diff --git a/bricks/css/bricks.css b/bricks/css/bricks.css index 0f21424..70a4c59 100755 --- a/bricks/css/bricks.css +++ b/bricks/css/bricks.css @@ -32,6 +32,7 @@ body { width: 30%; height: 30%; background-color: #f0f0f0; + color:#222222; border: 1px solid #ccc; border-radius: 5px; margin-bottom: 10px; @@ -49,6 +50,12 @@ body { .message>.title { background-color: #3030f0; + color: #e8e8e8; +} + +.error>.title { + background-color: #f03030; + color: #e8e8e8; } .vscroll { @@ -63,10 +70,6 @@ body { overflow:scroll; } -.error>.title { - background-color: #f03030; -} - .vcontainer { display: flex; flex-direction: column; diff --git a/bricks/floaticonbar.js b/bricks/floaticonbar.js index 2b37efe..232b6f3 100644 --- a/bricks/floaticonbar.js +++ b/bricks/floaticonbar.js @@ -24,7 +24,8 @@ bricks.IconBar = class extends bricks.HBox { this.height_int = 0; for (var i=0;i