fixing style stuffs

This commit is contained in:
Ezequiel Bergamaschi 2014-09-11 11:35:31 -03:00
parent 28660e3400
commit 4f1f111432
8 changed files with 15 additions and 31 deletions

View File

@ -13,7 +13,7 @@ var BootstrapDialog = new Class({
initialize: function (title, options) { initialize: function (title, options) {
this.setOptions(options); this.setOptions(options);
this.options.onRemoveClickData.dialog = this; this.options.onRemoveClickData.dialog = this;
this._native = $('<div class="modal fade"></div>').append('<div class="modal-dialog" style="margin:150px auto"></div>'); this._native = $('<div class="modal fade"></div>').append('<div class="modal-dialog"></div>');
var content = $('<div class="modal-content"></div>'); var content = $('<div class="modal-content"></div>');
content.on('keydown', function(event) { content.on('keydown', function(event) {
event.stopPropagation(); event.stopPropagation();

View File

@ -30,7 +30,7 @@ mindplot.widget.LinkEditor = new Class({
errorMessage: true, errorMessage: true,
onRemoveClickData: {model: this._model} onRemoveClickData: {model: this._model}
}); });
this.css({width:"600px"}); this.css({margin:"150px auto"});
var panel = this._buildPanel(model); var panel = this._buildPanel(model);
this.setContent(panel); this.setContent(panel);
}, },

View File

@ -29,7 +29,7 @@ mindplot.widget.NoteEditor = new Class({
removeButton: true, removeButton: true,
onRemoveClickData: {model: this._model} onRemoveClickData: {model: this._model}
}); });
this.css({width:"600px"}); this.css({margin:"150px auto"});
var panel = this._buildPanel(model); var panel = this._buildPanel(model);
this.setContent(panel); this.setContent(panel);
}, },

View File

@ -23,7 +23,6 @@
<script type="text/javascript" language="javascript" src="js/jquery.timeago.js"></script> <script type="text/javascript" language="javascript" src="js/jquery.timeago.js"></script>
<script type="text/javascript" language="javascript" src="js/jquery.timeago.${locale}.js"></script> <script type="text/javascript" language="javascript" src="js/jquery.timeago.${locale}.js"></script>
<link rel="stylesheet" type="text/css" href="css/pageHeaders.css"/>
<body> <body>
<div style="padding:10px"> <div style="padding:10px">

View File

@ -20,7 +20,7 @@
color: #000000; color: #000000;
} }
.btn-header:hover { .btn-header:hover {
background-color: #eee; background-color: #C8E2DF;
} }
.WelcomeHeader { .WelcomeHeader {
position: relative; position: relative;

View File

@ -5,4 +5,4 @@
<% <%
request.setAttribute("principal", com.wisemapping.security.Utils.getUser()); request.setAttribute("principal", com.wisemapping.security.Utils.getUser());
%> %>
<%@include file="/jsp/style.jsp" %>

View File

@ -15,22 +15,18 @@
} }
#collabEmails { #collabEmails {
width: 250px; width: 325px;
display: inline-block; display: inline-block;
vertical-align: middle;
margin-bottom: 0;
} }
#roleBtn { #addMessageLink,#roleBtn a {
margin: 0 10px; padding-left: 20px;
display: inline-block;
vertical-align: middle;
color: #428bca; color: #428bca;
text-decoration: none;
} }
#addBtn { #roleBtn a:hover {
display: inline-block; text-decoration: underline;
vertical-align: middle;
} }
#collabMessage { #collabMessage {
@ -58,7 +54,7 @@
<p><strong><spring:message code="ADD_PEOPLE"/>:</strong></p> <p><strong><spring:message code="ADD_PEOPLE"/>:</strong></p>
<input type="text" id="collabEmails" name="collabEmails" <input type="text" id="collabEmails" name="collabEmails" class="form-control"
placeholder="<spring:message code="COLLABORATORS_SEPARATED_BY_COMA"/>"/> placeholder="<spring:message code="COLLABORATORS_SEPARATED_BY_COMA"/>"/>
<div class="btn-group" id="roleBtn"> <div class="btn-group" id="roleBtn">
@ -74,9 +70,9 @@
</div> </div>
<div style="margin-top: 10px;"> <div style="margin-top: 10px;">
<p><strong><spring:message code="EMAIL_NOTIFICATION_MESSAGE"/></strong> - <a href="#" <p><strong><spring:message code="EMAIL_NOTIFICATION_MESSAGE"/></strong> - <a href="#"
id="addMessageLink"><spring:message id="addMessageLink" style="padding-left: 0px"><spring:message
code="ADD_MESSAGE"/></a></p> code="ADD_MESSAGE"/></a></p>
<textarea cols="4" id="collabMessage" placeholder="<spring:message code="OPTIONAL_CUSTOM_MESSAGE"/>"> <textarea cols="4" id="collabMessage" class="form-control" placeholder="<spring:message code="OPTIONAL_CUSTOM_MESSAGE"/>">
</textarea> </textarea>
</div> </div>
@ -151,7 +147,7 @@ function addCollaboration(email, role, changeType) {
} else { } else {
rowStr = '<tr data-collab=' + email + ' data-role="' + role + '">\ rowStr = '<tr data-collab=' + email + ' data-role="' + role + '">\
<td>' + email + ' (<spring:message code="YOU"/>)</td>\ <td>' + email + ' (<spring:message code="YOU"/>)</td>\
<td><button class="btn btn-secondary">' + messages[role] + '</button></td>\ <td><button class="btn btn-secondary" style="float: right">' + messages[role] + '</button></td>\
<td></td>\ <td></td>\
</tr>'; </tr>';
tableElem.append(rowStr); tableElem.append(rowStr);

View File

@ -1,11 +0,0 @@
<%@ page contentType="text/html; charset=UTF-8" language="java" %>
<html>
<head>
<style>
h2 {
font-size: 160%;
color: #8e9181;
}
</style>
</head>
</html>