Peter will hate this but I extended Etherpad to support 64 colors and removed the requirements for a background image on the colorpicker dialogue

This commit is contained in:
John McLear 2011-08-16 21:29:51 +01:00
parent 5da30a40bf
commit 5d30c8b4a5
4 changed files with 17 additions and 9 deletions

View file

@ -348,11 +348,16 @@ a#hidetopmsg { position: absolute; right: 5px; bottom: 5px; }
#myswatch { width: 100%; height: 100%; background: transparent;/*...initially*/ }
#mycolorpicker {
background: url(../img/colorpicker.gif) no-repeat left top;
width: 232px; height: 140px;
/*background: url(../img/colorpicker.gif) no-repeat left top;*/
width: 232px; height: 230px;
position: absolute;
left: -240px; top: 0px; z-index: 101;
display: none;/*...initially*/
border-style: solid;
border-radius: 5px;
border-color: #000;
background: #fff;
border-width:1px;
}
#mycolorpicker ul li
@ -362,12 +367,12 @@ a#hidetopmsg { position: absolute; right: 5px; bottom: 5px; }
#mycolorpicker .picked { border: 1px solid #000 !important; }
#mycolorpicker .picked .pickerswatch { border: 1px solid #fff; }
#mycolorpickersave { position: absolute; left: 14px; top: 102px;
width: 47px; height: 0; padding-top: 20px; overflow: hidden;
cursor: pointer; }
#mycolorpickercancel { position: absolute; left: 87px; top: 102px;
width: 44px; height: 0; padding-top: 20px; overflow: hidden;
cursor: pointer; }
#mycolorpickersave { position: absolute; left: 10px; top: 192px;
width: 60px; padding: 4px; overflow: hidden; color: #000;
cursor: pointer; color:#000; font-size:13px; border-radius:5px; border-style:solid; border-color:#000; border-width:1px;text-align:center;background-color:#86DC6C;}
#mycolorpickercancel { position: absolute; left: 87px; top: 192px;
width: 60px; padding: 4px; overflow: hidden; color: #000;
cursor: pointer; color:#000; font-size:13px; border-radius:5px; border-style:solid; border-color:#000; border-width:1px;text-align:center;background-color:#FF8F8F;}
#myusernameform { margin-left: 35px; }
#myusernameedit { font-size: 1.3em; color: #fff;
padding: 3px; height: 18px; margin: 0; border: 0;
@ -1095,3 +1100,4 @@ width:27px !important;
cursor: hand;
cursor: pointer;
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

View file

@ -143,8 +143,10 @@ We removed this feature cause its not worth the space it needs in the editbar
<a onclick="closeColorPicker()">Cancel</a>
</span>
</div>
<!--
<div id="mycolorpickersave">Save</div>
<div id="mycolorpickercancel">Cancel</div>
-->
<div id="myswatchbox"><div id="myswatch"><!-- --></div></div>
<div id="myusernameform"><input type="text" id="myusernameedit" disabled="disabled" /></div>