vmario
/
doodle3d-client
mirror of https://github.com/Doodle3D/doodle3d-client.git
0
0
Fork 0
Code Issues Releases Wiki Activity

Cleanup

This commit is contained in:
peteruithoven 2014-01-10 14:04:17 +01:00
parent a4ad7d7198
commit 139e4ca6ae
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/Popup.js
View File

@ -1,11 +1,11 @@
function showPopup(popup) { function showPopup(popup) {
$(".popupMask").show(); $("#popupMask").fadeIn(POPUP_SHOW_DURATION);
popup.show(); popup.fadeIn(POPUP_SHOW_DURATION);
keyboardShortcutsEnabled=false; keyboardShortcutsEnabled=false;
} }
function hidePopup(popup) { function hidePopup(popup) {
$(".popupMask").hide(); $("#popupMask").fadeOut(POPUP_SHOW_DURATION);
popup.hide(); popup.fadeOut(POPUP_SHOW_DURATION);
keyboardShortcutsEnabled=true; keyboardShortcutsEnabled=true;
} }

2
js/buttonbehaviors.js
View File

@ -42,7 +42,7 @@ function initButtonBehavior() {
btnSine = $(".btnSine"); btnSine = $(".btnSine");
btnAdd = $(".btnAdd"); btnAdd = $(".btnAdd");
btnToggleVertical = $(".btnToggleVertical"); btnToggleVertical = $(".btnToggleVertical");
buttonGroupAdd = $(".buttonGroupAdd"); buttonGroupAdd = $("#buttonGroupAdd");
buttonGroupVertical = $(".buttonGroupVertical"); buttonGroupVertical = $(".buttonGroupVertical");
popupWordArt = $(".popupWordArt"); popupWordArt = $(".popupWordArt");
popupShape = $(".popupShape"); popupShape = $(".popupShape");

2
less/buttons.less
View File

@ -150,7 +150,7 @@
padding: 5% 5% 5% 5%; padding: 5% 5% 5% 5%;
} }
.buttonGroupAdd { #buttonGroupAdd {
display: none; display: none;
z-index: 1000; z-index: 1000;
margin-top: -60%; margin-top: -60%;

2
www/index.html
View File

@ -35,7 +35,7 @@
<img class="btnOops btn" src="img/buttons/btnOops.png" /><br/> <img class="btnOops btn" src="img/buttons/btnOops.png" /><br/>
<img class="btnAdd btn" src="img/buttons/btnAdd.png" /><br/> <img class="btnAdd btn" src="img/buttons/btnAdd.png" /><br/>
<div class="buttonGroup buttonGroupAdd"> <div class="buttonGroup" id="buttonGroupAdd">
<img class="btnWordArt btn" src="img/buttons/btnWordArt.png" /> <img class="btnWordArt btn" src="img/buttons/btnWordArt.png" />
<img class="btnShape btn" src="img/buttons/btnShape.png" /> <img class="btnShape btn" src="img/buttons/btnShape.png" />
</div> </div>