From f00b6bf581d4cbcf07168c0c877fb7bfed27905c Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Tue, 31 Mar 2015 03:09:05 +0000 Subject: [PATCH] UI Fixes --- package.json | 4 ++-- plugins/c9.ide.dialog/dialog.js | 21 +++++++++++++------ .../c9.ide.layout.classic/less/bk-window.less | 10 ++++++++- 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index b2701107..5ec20f56 100644 --- a/package.json +++ b/package.json @@ -77,13 +77,13 @@ "c9.ide.behaviors": "#6aad7006a0", "c9.ide.closeconfirmation": "#a28bfd8272", "c9.ide.configuration": "#b8470f4107", - "c9.ide.dialog.wizard": "#9ec0eafb28", + "c9.ide.dialog.wizard": "#3641096e13", "c9.ide.fontawesome": "#781602c5d8", "c9.ide.format": "#f51451ac57", "c9.ide.help.support": "#60e88f5680", "c9.ide.imgeditor": "#08bbc53578", "c9.ide.immediate": "#6845a93705", - "c9.ide.installer": "#f0d8fe9d26", + "c9.ide.installer": "#ca02a6312b", "c9.ide.mount": "#32e79866ee", "c9.ide.navigate": "#64156c7f4a", "c9.ide.newresource": "#9a7464cc47", diff --git a/plugins/c9.ide.dialog/dialog.js b/plugins/c9.ide.dialog/dialog.js index 1f61dea5..f240aa71 100644 --- a/plugins/c9.ide.dialog/dialog.js +++ b/plugins/c9.ide.dialog/dialog.js @@ -67,10 +67,12 @@ define(function(require, module, exports) { var left = options.left; var top = options.top; var width = options.width || 512; + var height = options.height; var title = options.title; var heading = options.heading; var body = options.body; var custom = options.custom; + var className = options.class; var modal = options.modal; var zindex = options.zindex; var allowClose = options.allowClose; @@ -101,9 +103,13 @@ define(function(require, module, exports) { modal: modal, buttons: allowClose ? "close" : "", width: width, + height: height, zindex: zindex || "", skin: "bk-window2", - class: "relative" + (options.dark ? " dark" : ""), + class: "dialog " + + (height ? "" : "relative") + + (options.dark ? " dark" : "") + + (className ? " " + className : ""), childNodes: [ new ui.vbox({ id: "titles", @@ -439,11 +445,14 @@ define(function(require, module, exports) { dialog.setAttribute("height", v ? dialog.getHeight() : ""); dialog.setAttribute("width", v ? dialog.getWidth() : ""); - dialog.setAttribute("class", v ? "" : "relative"); - titles.setAttribute("anchors", v ? "0 0 46 0" : ""); - buttons.setAttribute("bottom", v ? "0" : ""); - buttons.setAttribute("left", v ? "0" : ""); - buttons.setAttribute("right", v ? "0" : ""); + dialog.setAttribute("class", "dialog " + + (v ? "" : "relative") + + (options.dark ? " dark" : "") + + (className ? " " + className : "")); + // titles.setAttribute("anchors", v ? "0 0 46 0" : ""); + // buttons.setAttribute("bottom", v ? "0" : ""); + // buttons.setAttribute("left", v ? "0" : ""); + // buttons.setAttribute("right", v ? "0" : ""); dialog.setAttribute("resizable", v); }, /** diff --git a/plugins/c9.ide.layout.classic/less/bk-window.less b/plugins/c9.ide.layout.classic/less/bk-window.less index 5f48e02d..aee25a91 100644 --- a/plugins/c9.ide.layout.classic/less/bk-window.less +++ b/plugins/c9.ide.layout.classic/less/bk-window.less @@ -129,4 +129,12 @@ right: 20px; top: 25px; } - \ No newline at end of file + +.bk-window.dialog .bk-container{ + display: flex; + flex-direction: column; +} +.bk-window.dialog .bk-container > div:first-child{ + flex: 1; + position: relative; +} \ No newline at end of file