From 4f1f1114329a4e7e38bccada33fc30dc9c8f1fe4 Mon Sep 17 00:00:00 2001 From: Ezequiel Bergamaschi Date: Thu, 11 Sep 2014 11:35:31 -0300 Subject: [PATCH] fixing style stuffs --- .../libraries/bootstrap/BootstrapDialog.js | 2 +- .../src/main/javascript/widget/LinkEditor.js | 2 +- .../src/main/javascript/widget/NoteEditor.js | 2 +- .../main/webapp/jsp/dialogFullTemplate.jsp | 1 - wise-webapp/src/main/webapp/jsp/header.jsp | 2 +- wise-webapp/src/main/webapp/jsp/init.jsp | 2 +- .../src/main/webapp/jsp/mindmapShare.jsp | 24 ++++++++----------- wise-webapp/src/main/webapp/jsp/style.jsp | 11 --------- 8 files changed, 15 insertions(+), 31 deletions(-) delete mode 100644 wise-webapp/src/main/webapp/jsp/style.jsp diff --git a/mindplot/src/main/javascript/libraries/bootstrap/BootstrapDialog.js b/mindplot/src/main/javascript/libraries/bootstrap/BootstrapDialog.js index 03052972..3670d42b 100644 --- a/mindplot/src/main/javascript/libraries/bootstrap/BootstrapDialog.js +++ b/mindplot/src/main/javascript/libraries/bootstrap/BootstrapDialog.js @@ -13,7 +13,7 @@ var BootstrapDialog = new Class({ initialize: function (title, options) { this.setOptions(options); this.options.onRemoveClickData.dialog = this; - this._native = $('
').append('
'); + this._native = $('
').append('
'); var content = $('
'); content.on('keydown', function(event) { event.stopPropagation(); diff --git a/mindplot/src/main/javascript/widget/LinkEditor.js b/mindplot/src/main/javascript/widget/LinkEditor.js index 4bd4c1d5..52e57ceb 100644 --- a/mindplot/src/main/javascript/widget/LinkEditor.js +++ b/mindplot/src/main/javascript/widget/LinkEditor.js @@ -30,7 +30,7 @@ mindplot.widget.LinkEditor = new Class({ errorMessage: true, onRemoveClickData: {model: this._model} }); - this.css({width:"600px"}); + this.css({margin:"150px auto"}); var panel = this._buildPanel(model); this.setContent(panel); }, diff --git a/mindplot/src/main/javascript/widget/NoteEditor.js b/mindplot/src/main/javascript/widget/NoteEditor.js index 83210d7b..ee234d8f 100644 --- a/mindplot/src/main/javascript/widget/NoteEditor.js +++ b/mindplot/src/main/javascript/widget/NoteEditor.js @@ -29,7 +29,7 @@ mindplot.widget.NoteEditor = new Class({ removeButton: true, onRemoveClickData: {model: this._model} }); - this.css({width:"600px"}); + this.css({margin:"150px auto"}); var panel = this._buildPanel(model); this.setContent(panel); }, diff --git a/wise-webapp/src/main/webapp/jsp/dialogFullTemplate.jsp b/wise-webapp/src/main/webapp/jsp/dialogFullTemplate.jsp index 50fce265..6c650fcd 100644 --- a/wise-webapp/src/main/webapp/jsp/dialogFullTemplate.jsp +++ b/wise-webapp/src/main/webapp/jsp/dialogFullTemplate.jsp @@ -23,7 +23,6 @@ -
diff --git a/wise-webapp/src/main/webapp/jsp/header.jsp b/wise-webapp/src/main/webapp/jsp/header.jsp index acd3d58c..76b30a5c 100644 --- a/wise-webapp/src/main/webapp/jsp/header.jsp +++ b/wise-webapp/src/main/webapp/jsp/header.jsp @@ -20,7 +20,7 @@ color: #000000; } .btn-header:hover { - background-color: #eee; + background-color: #C8E2DF; } .WelcomeHeader { position: relative; diff --git a/wise-webapp/src/main/webapp/jsp/init.jsp b/wise-webapp/src/main/webapp/jsp/init.jsp index e2ef4252..faf48a0e 100644 --- a/wise-webapp/src/main/webapp/jsp/init.jsp +++ b/wise-webapp/src/main/webapp/jsp/init.jsp @@ -5,4 +5,4 @@ <% request.setAttribute("principal", com.wisemapping.security.Utils.getUser()); %> -<%@include file="/jsp/style.jsp" %> + diff --git a/wise-webapp/src/main/webapp/jsp/mindmapShare.jsp b/wise-webapp/src/main/webapp/jsp/mindmapShare.jsp index 90577daf..97a1904c 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapShare.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapShare.jsp @@ -15,22 +15,18 @@ } #collabEmails { - width: 250px; + width: 325px; display: inline-block; - vertical-align: middle; - margin-bottom: 0; } - #roleBtn { - margin: 0 10px; - display: inline-block; - vertical-align: middle; + #addMessageLink,#roleBtn a { + padding-left: 20px; color: #428bca; + text-decoration: none; } - #addBtn { - display: inline-block; - vertical-align: middle; + #roleBtn a:hover { + text-decoration: underline; } #collabMessage { @@ -58,7 +54,7 @@

:

- "/>
@@ -74,9 +70,9 @@

-

-
@@ -151,7 +147,7 @@ function addCollaboration(email, role, changeType) { } else { rowStr = '\ ' + email + ' ()\ - \ + \ \ '; tableElem.append(rowStr); diff --git a/wise-webapp/src/main/webapp/jsp/style.jsp b/wise-webapp/src/main/webapp/jsp/style.jsp deleted file mode 100644 index 0de8efd6..00000000 --- a/wise-webapp/src/main/webapp/jsp/style.jsp +++ /dev/null @@ -1,11 +0,0 @@ -<%@ page contentType="text/html; charset=UTF-8" language="java" %> - - - - - \ No newline at end of file