Merge remote-tracking branch 'flames/master'

This commit is contained in:
FrozenCow 2011-02-24 00:03:52 +01:00
commit da4c456254
2 changed files with 22 additions and 7 deletions

View File

@ -208,7 +208,7 @@ DynMap.prototype = {
value: '' value: ''
}) })
.keydown(function(event) { .keydown(function(event) {
if (event.keyCode === '13') { if (event.keyCode == '13') {
event.preventDefault(); event.preventDefault();
sendChat(chatinput.val()); sendChat(chatinput.val());
chatinput.val(''); chatinput.val('');

View File

@ -1,17 +1,19 @@
/******************* /*******************
* This is the over-ride CSS file. * This is the over-ride CSS file.
* *
* if you know any CSS you can easily add any custom rules to change how * if you know any CSS you can easily add custom rules to change how DynMap
* Dynmap looks for your particular install. * looks and behaves under your DynMap installation.
* *
* Simply uncomment the override.css in the index.html and rename this file * 1. Uncomment the override.css in the index.html.
* to override.css to use these custom rules. * 2. Rename this file or create a new override.css.
* 3. Add your own rules (or steal these) to personalize how DynMap looks.
* *
* By adding these rules here you can easily save your changes between updates. * By adding your own rules here, you can then save your changes
* between DynMap updates and they won't get over-written.
*/ */
/* IE : Use the alternate compass image */ /* Use the alternate compass image */
.compass { .compass {
top: 20px; top: 20px;
@ -22,3 +24,16 @@
background-image: url(compass_alt.png); background-image: url(compass_alt.png);
} }
/* These next two keep the DynMap sidebar open... */
.dynmap .sidebar {
margin-right: 0px;
}
/* ...and hide the hitbar along with the sidebar controls */
.dynmap .sidebar .hitbar,
.dynmap .sidebar .panel > .pin {
display: none;
}