diff options
author | Eric Guzman | 2012-02-22 23:19:45 -0800 |
---|---|---|
committer | Eric Guzman | 2012-02-22 23:19:45 -0800 |
commit | 9e8cd4448a6d0f809a55c3bdea8b45ed75339794 (patch) | |
tree | c7b5105153f17aedecd0669c611dbea44be7374c | |
parent | a5ee11857f923d3e49b44c0a8c480e9d0b026d5b (diff) | |
parent | 2afef244a3f8124f8a049e504e9782c05904ce23 (diff) | |
download | ninja-9e8cd4448a6d0f809a55c3bdea8b45ed75339794.tar.gz |
Merge branch 'refs/heads/master' into CSSPanelUpdates
90 files changed, 816 insertions, 884 deletions
diff --git a/css/ninja.css b/css/ninja.css index 96ae6caf..4d450208 100755 --- a/css/ninja.css +++ b/css/ninja.css | |||
@@ -212,10 +212,6 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co | |||
212 | 212 | ||
213 | #mainContent .CodeMirror-scroll { height: 100%; overflow: scroll; overflow-x: auto; overflow-y: auto; } | 213 | #mainContent .CodeMirror-scroll { height: 100%; overflow: scroll; overflow-x: auto; overflow-y: auto; } |
214 | 214 | ||
215 | .montage-editor-frame { position: absolute; z-index: 7; top: 0; left: 0; display: none; -webkit-user-select: initial; } | ||
216 | |||
217 | .montage-editor { padding: 0px; word-wrap: normal; } | ||
218 | |||
219 | .panelContainer { margin: 0px; padding: 0px 0px; position: relative; overflow: auto; } | 215 | .panelContainer { margin: 0px; padding: 0px 0px; position: relative; overflow: auto; } |
220 | 216 | ||
221 | .panelDisclosureIcon { background-image: url("../images/panels/panelDisclosureIcon.png"); background-repeat: no-repeat; width: 16px; height: 16px; float: left; -webkit-transition-property: rotate; -webkit-transition-duration: 0.2s; -webkit-transition-timing-function: linear; padding-right: 2px; } | 217 | .panelDisclosureIcon { background-image: url("../images/panels/panelDisclosureIcon.png"); background-repeat: no-repeat; width: 16px; height: 16px; float: left; -webkit-transition-property: rotate; -webkit-transition-duration: 0.2s; -webkit-transition-timing-function: linear; padding-right: 2px; } |
@@ -672,16 +668,12 @@ nav.menuBar ul ul, nav.menuBar ul li:hover ul ul, nav.menuBar ul ul li:hover ul | |||
672 | 668 | ||
673 | nav.menuBar ul li:hover ul, nav.menuBar ul ul li:hover ul, nav.menuBar ul ul ul li:hover ul { display: block; } | 669 | nav.menuBar ul li:hover ul, nav.menuBar ul ul li:hover ul, nav.menuBar ul ul ul li:hover ul { display: block; } |
674 | 670 | ||
675 | .toolButton { width: 26px; height: 23px; padding: 0px; margin: 1px; border-width: 1px; border-style: solid; } | 671 | .subToolHolderPanel .toolbutton { float: left; -webkit-transform: scale(0.6); } |
676 | 672 | ||
677 | .subToolButton { float: left; } | 673 | .subToolHolderPanel .toolbutton:hover, .subToolHolderPanel .toolbutton.active { -webkit-transform: scale(0.75); } |
678 | 674 | ||
679 | .subOption { float: left; margin-top: 5px; margin-left: 10px; margin-right: 10px; } | 675 | .subOption { float: left; margin-top: 5px; margin-left: 10px; margin-right: 10px; } |
680 | 676 | ||
681 | .toolButton:active { border-top-width: 1px; border-top-style: solid; border-left-width: 1px; border-left-style: solid; } | ||
682 | |||
683 | .toolButtonSelected { border-top-width: 1px; border-top-style: solid; border-left-width: 1px; border-left-style: solid; } | ||
684 | |||
685 | .toolSeparator { height: 1px; width: 30px; } | 677 | .toolSeparator { height: 1px; width: 30px; } |
686 | 678 | ||
687 | .toolSeparatorTop { margin-top: 3px; margin-bottom: 0px; } | 679 | .toolSeparatorTop { margin-top: 3px; margin-bottom: 0px; } |
@@ -818,118 +810,127 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1 | |||
818 | 810 | ||
819 | #zoomToolOptionHolder input.zoom-option { background: none; } | 811 | #zoomToolOptionHolder input.zoom-option { background: none; } |
820 | 812 | ||
821 | .SelectionToolPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -360px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 1; } | 813 | #toolsPanelContent { width: 40px; } |
822 | |||
823 | .SelectionToolUnpressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -390px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; } | ||
824 | |||
825 | .SubselectionToolPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -420px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 1; } | ||
826 | |||
827 | .SubselectionToolUnpressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -450px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; } | ||
828 | |||
829 | .RotateTool3DPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: 0px 0px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 1; } | ||
830 | |||
831 | .RotateTool3DUnpressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -30px 0px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; } | ||
832 | |||
833 | .Translate3DPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -120px 0px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 1; } | ||
834 | |||
835 | .Translate3DUnpressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -150px 0px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; } | ||
836 | |||
837 | .TagToolPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: 0px -54px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 1; } | ||
838 | |||
839 | .TagToolUnpressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -30px -54px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; } | ||
840 | |||
841 | .PenToolPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -180px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 1; } | ||
842 | |||
843 | .PenToolUnpressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -210px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; } | ||
844 | 814 | ||
845 | .TextToolPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -60px -54px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 1; } | 815 | .toolsList { width: 29px; margin: auto; } |
846 | 816 | ||
847 | .TextToolUnpressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -90px -54px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; } | 817 | .toolsList hr { border: 0px; border-top: 1px solid #232323; border-bottom: 1px solid #3A3A3A; margin: 2px; } |
848 | 818 | ||
849 | .ShapeContainerPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -120px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 1; } | 819 | .toolbutton { width: 29px; height: 29px; background-position: center center; background-repeat: no-repeat; border-radius: 3px; opacity: 1; margin-bottom: 2px; -webkit-transform: scale(0.8); -webkit-transition: 0.15s all cubic-bezier(0.44, 0.19, 0, 0.99); } |
850 | 820 | ||
851 | .ShapeContainerUnpressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -150px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; } | 821 | .toolbutton:hover, .toolbutton.active { box-shadow: 0px 0px 2px 2px #999; -webkit-transform: scale(1); opacity: 1; } |
852 | 822 | ||
853 | .OvalToolPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -120px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 1; } | 823 | .toolbutton:active { background-color: #8c8c8c; } |
854 | 824 | ||
855 | .OvalToolUnpressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -150px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; } | 825 | .toolbutton.active { box-shadow: inset 0px 0px 2px 2px #555; background-color: #363636; } |
856 | 826 | ||
857 | .RectangleToolPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -300px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 1; } | 827 | .SelectionTool { background-image: url("../images/tools/Tool-Selection.png"); } |
858 | 828 | ||
859 | .RectangleToolUnpressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -330px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; } | 829 | .SubselectionTool { background-image: url("../images/tools/Tool-Subselect.png"); } | <