From 33bb9b7e97e9ec3bd664b3e1c3e7297ba8d07ede Mon Sep 17 00:00:00 2001 From: John Mayhew Date: Mon, 7 May 2012 15:44:18 -0700 Subject: more work on making subtool styling/layout consistent --- css/ninja.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'css/ninja.css') diff --git a/css/ninja.css b/css/ninja.css index 650f3b08..be8b8109 100755 --- a/css/ninja.css +++ b/css/ninja.css @@ -683,7 +683,9 @@ nav.menuBar ul li:hover ul, nav.menuBar ul ul li:hover ul, nav.menuBar ul ul ul .subToolHolderPanel .toolbutton:hover, .subToolHolderPanel .toolbutton.active { -webkit-transform: scale(0.75); } -.subOption { float: left; margin-top: 5px; margin-left: 10px; margin-right: 10px; } +.subOption { float: left; margin-top: 0px; margin-left: 1px; margin-right: 0px; } + +.subOptionSpacer { margin-right: 16px; } .toolSeparator { height: 1px; width: 30px; } -- cgit v1.2.3 From 843d8ea8ee58a54bcb71d7b28dbf78fae153b491 Mon Sep 17 00:00:00 2001 From: John Mayhew Date: Mon, 7 May 2012 16:03:07 -0700 Subject: updated ninja.css from sass --- css/ninja.css | 26 -------------------------- 1 file changed, 26 deletions(-) (limited to 'css/ninja.css') diff --git a/css/ninja.css b/css/ninja.css index be8b8109..3b011673 100755 --- a/css/ninja.css +++ b/css/ninja.css @@ -861,8 +861,6 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1 .FillTool { background-image: url("../images/tools/Tool-Fill.png"); } -.EyedropperTool { background-image: url("../images/tools/Tool-EyeDropper.png"); } - .EraserTool { background-image: url("../images/tools/Tool-Erase.png"); } .RotateStageTool3D { background-image: url("../images/tools/Tool-3DRotateStage.png"); } @@ -875,28 +873,6 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1 .InkBottleTool { background-image: url("../images/tools/Tool-FillColor.png"); } -.toolsList .colortoolbar { padding-left: 1px; padding-top: 4px; } - -.toolsList .colortoolbar button { width: 27px; height: 27px; background: black; border: 1px solid #000; padding: 0; margin: 0px; } - -.toolsList .colortoolbar div { width: 27px; height: 27px; margin: 0; margin-top: 3px; } - -.toolsList .colortoolbar div.cpe_colortoolbar_container { margin: 0; } - -/*.InkBottleToolPressed {*/ -/*background-image: url("../images/tools/inkbottle_down.png");*/ -/*background-repeat: no-repeat;*/ -/*height: 23px;*/ -/*width: 26px;*/ -/*opacity: 1;*/ -/*}*/ -/*.InkBottleToolUnpressed {*/ -/*background-image: url("../images/tools/inkbottle_down.png");*/ -/*background-repeat: no-repeat;*/ -/*height: 23px;*/ -/*width: 26px;*/ -/*opacity: 0.7;*/ -/*}*/ .topAlignUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -240px -54px; background-repeat: no-repeat; height: 23px; width: 26px; } .rightAlignUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -270px -54px; background-repeat: no-repeat; height: 23px; width: 26px; } @@ -923,8 +899,6 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1 .bucketToolUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -330px 0px; background-repeat: no-repeat; height: 23px; width: 26px; } -.pencilToolUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -270px -27px; background-repeat: no-repeat; height: 23px; width: 26px; } - .blueDiv { background: blue; opacity: 0.2; } ::-webkit-scrollbar { width: 11px; height: 11px; } -- cgit v1.2.3 From dd663d8fe9191cc57c9cebe6d425562cb45982c2 Mon Sep 17 00:00:00 2001 From: John Mayhew Date: Tue, 8 May 2012 07:25:09 -0700 Subject: Removed unused SubSelect Tool --- css/ninja.css | 2 -- 1 file changed, 2 deletions(-) (limited to 'css/ninja.css') diff --git a/css/ninja.css b/css/ninja.css index b619eee1..2acfcb5d 100755 --- a/css/ninja.css +++ b/css/ninja.css @@ -833,8 +833,6 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1 .SelectionTool { background-image: url("../images/tools/Tool-Selection.png"); } -.SubselectionTool { background-image: url("../images/tools/Tool-Subselect.png"); } - .RotateTool3D { background-image: url("../images/tools/Tool-3DRotate.png"); } .Translate3D { background-image: url("../images/tools/Tool-3DTranslate.png"); } -- cgit v1.2.3 From 7dedf0735eec1d227b21291e1bb43dcdec93cbf3 Mon Sep 17 00:00:00 2001 From: John Mayhew Date: Tue, 8 May 2012 09:55:02 -0700 Subject: -Removed id dependence of the tag tool options CSS -Separated the options3d CSS from the tag tool options css -Removed unused translateObjectToolContainer CSS class --- css/ninja.css | 62 ++++++++++++++++++++++++++++++++++------------------------- 1 file changed, 36 insertions(+), 26 deletions(-) (limited to 'css/ninja.css') diff --git a/css/ninja.css b/css/ninja.css index 2acfcb5d..9740317d 100755 --- a/css/ninja.css +++ b/css/ninja.css @@ -763,49 +763,41 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1 .optionLabel { margin-top: 5px; } -#tagToolContainer input.tag-type, #rotateObjectToolContainer input.tag-type, #translateObjectToolContainer input.tag-type { background: none; width: 20px; height: 20px; display: block; float: left; margin: 0px; padding: 0px; margin-right: 5px; margin-top: 4px; background-repeat: no-repeat; opacity: 0.8; text-indent: -9999px; cursor: pointer; -webkit-border-radius: 3px; -webkit-user-select: none; border: 1px solid transparent; } +.tagRadioButtons input.tag-type { background: none; width: 20px; height: 20px; display: block; float: left; margin: 0px; padding: 0px; margin-right: 5px; margin-top: 4px; background-repeat: no-repeat; opacity: 0.8; text-indent: -9999px; cursor: pointer; -webkit-border-radius: 3px; -webkit-user-select: none; border: 1px solid transparent; } -#tagToolContainer input.tag-type { background-image: url("../images/tools/sprite-toolbar-tag.png"); } +.tagRadioButtons input.tag-type { background-image: url("../images/tools/sprite-toolbar-tag.png"); } -#rotateObjectToolContainer input.tag-type { background-image: url("../images/tools/sprite-toolbar-3d.png"); } +.tagRadioButtons input.tag-type:active { border: 1px solid transparent; } -#translateObjectToolContainer input.tag-type { background-image: url("../images/tools/sprite-toolbar-3d.png"); } +.tagRadioButtons input.tag-type:hover { opacity: 1.0; -webkit-box-shadow: 0px 0px 4px #fff; } -#tagToolContainer input.tag-type:active, #rotateObjectToolContainer input.tag-type:active, #translateObjectToolContainer input.tag-type:active { border: 1px solid transparent; } +.tagRadioButtons input.tag-type:checked { background-color: transparent; opacity: 1.0; cursor: default; -webkit-box-shadow: none; } -#tagToolContainer input.tag-type:hover, #rotateObjectToolContainer input.tag-type:hover, #translateObjectToolContainer input.tag-type:hover { opacity: 1.0; -webkit-box-shadow: 0px 0px 4px #fff; } +.tagRadioButtons input.divTool { background-position: -40px 0px; } -#tagToolContainer input.tag-type:checked, #rotateObjectToolContainer input.tag-type:checked, #translateObjectToolContainer input.tag-type:checked { background-color: transparent; opacity: 1.0; cursor: default; -webkit-box-shadow: none; } +.tagRadioButtons input.divTool:checked { background-position: -40px -20px; } -#tagToolContainer input#divTool { background-position: -40px 0px; } +.tagRadioButtons input.imageTool { background-position: -60px 0px; } -#tagToolContainer input#divTool:checked { background-position: -40px -20px; } +.tagRadioButtons input.imageTool:checked { background-position: -60px -20px; } -#tagToolContainer input#imageTool { background-position: -60px 0px; } +.tagRadioButtons input.videoTool { background-position: -100px 0px; } -#tagToolContainer input#imageTool:checked { background-position: -60px -20px; } +.tagRadioButtons input.videoTool:checked { background-position: -100px -20px; } -#tagToolContainer input#videoTool { background-position: -100px 0px; } +.tagRadioButtons input.canvasTool { background-position: -20px 0px; } -#tagToolContainer input#videoTool:checked { background-position: -100px -20px; } +.tagRadioButtons input.canvasTool:checked { background-position: -20px -20px; } -#tagToolContainer input#canvasTool, #rotateObjectToolContainer input#rotateLocally, #translateObjectToolContainer input#translateLocally { background-position: -20px 0px; } +.tagRadioButtons input.customTool { background-position: 0px 0px; } -#tagToolContainer input#canvasTool:checked, #rotateObjectToolContainer input#rotateLocally:checked, #translateObjectToolContainer input#translateLocally:checked { background-position: -20px -20px; } +.tagRadioButtons input.customTool:checked { background-position: 0px -20px; } -#tagToolContainer input#flashTool { background-position: -80px 0px; } +.tagRadioButtons .nj-divider { height: 100%; float: left; position: relative; top: 5px; } -#tagToolContainer input#flashTool:checked { background-position: -80px -20px; } +.tagRadioButtons select.nj-skinned { visibility: visible; position: relative; } -#tagToolContainer input#customTool, #rotateObjectToolContainer input#rotateGlobally, #translateObjectToolContainer input#translateGlobally { background-position: 0px 0px; } - -#tagToolContainer input#customTool:checked, #rotateObjectToolContainer input#rotateGlobally:checked, #translateObjectToolContainer input#translateGlobally:checked { background-position: 0px -20px; } - -#tagToolContainer .nj-divider { height: 100%; float: left; position: relative; top: 5px; } - -#tagToolContainer select.nj-skinned { visibility: visible; position: relative; } - -#tagToolContainer select[disabled="true"].nj-skinned, #tagToolContainer select[disabled].nj-skinned { visibility: hidden; } +.tagRadioButtons select[disabled="true"].nj-skinned, .tagRadioButtons select[disabled].nj-skinned { visibility: hidden; } #zoomToolOptionHolder input#zoomInTool:checked { border-style: solid; border-width: 1px; border-color: white; background-image: url("../images/optionsbar/zoom/zoom_plus.png"); background-repeat: no-repeat; background-position: 4px 3px; } @@ -817,6 +809,24 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1 #zoomToolOptionHolder input.zoom-option { background: none; } +.object3DToolContainer input.tag-type { background: none; width: 20px; height: 20px; display: block; float: left; margin: 0px; padding: 0px; margin-right: 5px; margin-top: 4px; background-repeat: no-repeat; opacity: 0.8; text-indent: -9999px; cursor: pointer; -webkit-border-radius: 3px; -webkit-user-select: none; border: 1px solid transparent; } + +.object3DToolContainer input.tag-type { background-image: url("../images/tools/sprite-toolbar-3d.png"); } + +.object3DToolContainer input.tag-type:active { border: 1px solid transparent; } + +.object3DToolContainer input.tag-type:hover { opacity: 1.0; -webkit-box-shadow: 0px 0px 4px #fff; } + +.object3DToolContainer input.tag-type:checked { background-color: transparent; opacity: 1.0; cursor: default; -webkit-box-shadow: none; } + +.object3DToolContainer input.rotateLocally { background-position: -20px 0px; } + +.object3DToolContainer input.rotateLocally:checked { background-position: -20px -20px; } + +.object3DToolContainer input.rotateGlobally { background-position: 0px 0px; } + +.object3DToolContainer input.rotateGlobally:checked { background-position: 0px -20px; } + #toolsPanelContent { width: 40px; } .toolsList { width: 29px; margin: auto; } -- cgit v1.2.3 From e973618155eeca6b3608c9d303669e20baeaf0ff Mon Sep 17 00:00:00 2001 From: John Mayhew Date: Tue, 8 May 2012 10:08:30 -0700 Subject: moved all tag tool css back into the scss file added extra padding before first input control --- css/ninja.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'css/ninja.css') diff --git a/css/ninja.css b/css/ninja.css index 9740317d..24600b49 100755 --- a/css/ninja.css +++ b/css/ninja.css @@ -773,7 +773,7 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1 .tagRadioButtons input.tag-type:checked { background-color: transparent; opacity: 1.0; cursor: default; -webkit-box-shadow: none; } -.tagRadioButtons input.divTool { background-position: -40px 0px; } +.tagRadioButtons input.divTool { margin-left: 8px; background-position: -40px 0px; } .tagRadioButtons input.divTool:checked { background-position: -40px -20px; } @@ -799,6 +799,10 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1 .tagRadioButtons select[disabled="true"].nj-skinned, .tagRadioButtons select[disabled].nj-skinned { visibility: hidden; } +.tagRadioButtons .fillColorCtrl { width: 18px; height: 18px; margin-top: 6px; margin-left: 3px; margin-right: 8px; border: 1px black solid; } + +.tagRadioButtons .colorCtrlIcon { width: 20px; height: 20px; margin-top: 6px; -webkit-transform: scale(0.8); background-color: #282828; } + #zoomToolOptionHolder input#zoomInTool:checked { border-style: solid; border-width: 1px; border-color: white; background-image: url("../images/optionsbar/zoom/zoom_plus.png"); background-repeat: no-repeat; background-position: 4px 3px; } #zoomToolOptionHolder input#zoomOutTool:checked { border-style: solid; border-width: 1px; border-color: white; background-image: url("../images/optionsbar/zoom/zoom_minus.png"); background-repeat: no-repeat; background-position: 4px 3px; } -- cgit v1.2.3 From 9f0754eb0c619e9e33df707f24eed1dd6ae95096 Mon Sep 17 00:00:00 2001 From: John Mayhew Date: Tue, 8 May 2012 14:48:28 -0700 Subject: implemented proper styling for shape, inkbottle and fill tools make all icons for fill and stroke use the proper classes/images --- css/ninja.css | 54 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 26 deletions(-) (limited to 'css/ninja.css') diff --git a/css/ninja.css b/css/ninja.css index 24600b49..0a74acf8 100755 --- a/css/ninja.css +++ b/css/ninja.css @@ -831,6 +831,34 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1 .object3DToolContainer input.rotateGlobally:checked { background-position: 0px -20px; } +.optionsSelectionTool { padding: 6px; } + +.optionsSelectionTool > * { float: left; } + +.topAlignUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -240px -54px; background-repeat: no-repeat; height: 23px; width: 26px; } + +.rightAlignUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -270px -54px; background-repeat: no-repeat; height: 23px; width: 26px; } + +.bottomAlignUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -300px -54px; background-repeat: no-repeat; height: 23px; width: 26px; } + +.verticalLeftUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -330px -54px; background-repeat: no-repeat; height: 23px; width: 26px; } + +.verticalCenterUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -360px -54px; background-repeat: no-repeat; height: 23px; width: 26px; } + +.verticalRightUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -390px -54px; background-repeat: no-repeat; height: 23px; width: 26px; } + +.distRightUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: 0px -81px; background-repeat: no-repeat; height: 23px; width: 26px; } + +.distLeftUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -420px -54px; background-repeat: no-repeat; height: 23px; width: 26px; } + +.distCenterUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -60px -81px; background-repeat: no-repeat; height: 23px; width: 26px; } + +.distTopUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -30px -81px; background-repeat: no-repeat; height: 23px; width: 26px; } + +.distBottomUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -90px -81px; background-repeat: no-repeat; height: 23px; width: 26px; } + +.distVCenterUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -450px -54px; background-repeat: no-repeat; height: 23px; width: 26px; } + #toolsPanelContent { width: 40px; } .toolsList { width: 29px; margin: auto; } @@ -883,32 +911,6 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1 .InkBottleTool { background-image: url("../images/tools/Tool-FillColor.png"); } -.topAlignUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -240px -54px; background-repeat: no-repeat; height: 23px; width: 26px; } - -.rightAlignUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -270px -54px; background-repeat: no-repeat; height: 23px; width: 26px; } - -.bottomAlignUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -300px -54px; background-repeat: no-repeat; height: 23px; width: 26px; } - -.verticalLeftUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -330px -54px; background-repeat: no-repeat; height: 23px; width: 26px; } - -.verticalCenterUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -360px -54px; background-repeat: no-repeat; height: 23px; width: 26px; } - -.verticalRightUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -390px -54px; background-repeat: no-repeat; height: 23px; width: 26px; } - -.distRightUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: 0px -81px; background-repeat: no-repeat; height: 23px; width: 26px; } - -.distLeftUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -420px -54px; background-repeat: no-repeat; height: 23px; width: 26px; } - -.distCenterUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -60px -81px; background-repeat: no-repeat; height: 23px; width: 26px; } - -.distTopUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -30px -81px; background-repeat: no-repeat; height: 23px; width: 26px; } - -.distBottomUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -90px -81px; background-repeat: no-repeat; height: 23px; width: 26px; } - -.distVCenterUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -450px -54px; background-repeat: no-repeat; height: 23px; width: 26px; } - -.bucketToolUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -330px 0px; background-repeat: no-repeat; height: 23px; width: 26px; } - .blueDiv { background: blue; opacity: 0.2; } ::-webkit-scrollbar { width: 11px; height: 11px; } -- cgit v1.2.3 From 0088f8e5f3a0be4b6e5e497afbe34de11211493c Mon Sep 17 00:00:00 2001 From: John Mayhew Date: Wed, 9 May 2012 11:36:13 -0700 Subject: -Put new selection tool icons in the options bar -Styled the selection tool options bar --- css/ninja.css | 40 +++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-) (limited to 'css/ninja.css') diff --git a/css/ninja.css b/css/ninja.css index 0a74acf8..d309b34e 100755 --- a/css/ninja.css +++ b/css/ninja.css @@ -681,9 +681,7 @@ nav.menuBar ul li:hover ul, nav.menuBar ul ul li:hover ul, nav.menuBar ul ul ul .subToolHolderPanel .toolbutton:hover, .subToolHolderPanel .toolbutton.active { -webkit-transform: scale(0.75); } -.subOption { float: left; margin-top: 0px; margin-left: 1px; margin-right: 0px; } - -.subOptionSpacer { margin-right: 16px; } +.toolOptionsSpacer { margin-right: 9px; } .toolSeparator { height: 1px; width: 30px; } @@ -835,29 +833,41 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1 .optionsSelectionTool > * { float: left; } -.topAlignUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -240px -54px; background-repeat: no-repeat; height: 23px; width: 26px; } +.optionsSelectionTool button { padding-top: 0px; } + +.selectionToolIcon { width: 16px; height: 16px; background-repeat: no-repeat; background-position: 1px 2px; } + +.alignTopIcon { background-image: url("../images/tools/AlignTop.png"); } + +.alignMiddleIcon { background-image: url("../images/tools/AlignMiddle.png"); } + +.alignBottomIcon { background-image: url("../images/tools/AlignBottom.png"); } + +.alignLeftIcon { background-image: url("../images/tools/AlignLeft.png"); } + +.alignCenterIcon { background-image: url("../images/tools/AlignCenter.png"); } -.rightAlignUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -270px -54px; background-repeat: no-repeat; height: 23px; width: 26px; } +.alignRightIcon { background-image: url("../images/tools/AlignRight.png"); } -.bottomAlignUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -300px -54px; background-repeat: no-repeat; height: 23px; width: 26px; } +.arrangeBringForwardIcon { background-image: url("../images/tools/ArrangeBringForward.png"); } -.verticalLeftUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -330px -54px; background-repeat: no-repeat; height: 23px; width: 26px; } +.arrangeSendBackwardIcon { background-image: url("../images/tools/ArrangeSendBackward.png"); } -.verticalCenterUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -360px -54px; background-repeat: no-repeat; height: 23px; width: 26px; } +.arrangeBringToFrontIcon { background-image: url("../images/tools/ArrangeBringToFront.png"); } -.verticalRightUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -390px -54px; background-repeat: no-repeat; height: 23px; width: 26px; } +.arrangeSendToBackIcon { background-image: url("../images/tools/ArrangeSendToBack.png"); } -.distRightUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: 0px -81px; background-repeat: no-repeat; height: 23px; width: 26px; } +.distTopIcon { background-image: url("../images/tools/DistTop.png"); } -.distLeftUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -420px -54px; background-repeat: no-repeat; height: 23px; width: 26px; } +.distMiddleIcon { background-image: url("../images/tools/DistMiddle.png"); } -.distCenterUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -60px -81px; background-repeat: no-repeat; height: 23px; width: 26px; } +.distBottomIcon { background-image: url("../images/tools/DistBottom.png"); } -.distTopUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -30px -81px; background-repeat: no-repeat; height: 23px; width: 26px; } +.distLeftIcon { background-image: url("../images/tools/DistLeft.png"); } -.distBottomUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -90px -81px; background-repeat: no-repeat; height: 23px; width: 26px; } +.distCenterIcon { background-image: url("../images/tools/DistCenter.png"); } -.distVCenterUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -450px -54px; background-repeat: no-repeat; height: 23px; width: 26px; } +.distRightIcon { background-image: url("../images/tools/DistRight.png"); } #toolsPanelContent { width: 40px; } -- cgit v1.2.3 From 7dd942b6e19d2d7a779bc50e7bf4c8f8780b8f3a Mon Sep 17 00:00:00 2001 From: John Mayhew Date: Wed, 9 May 2012 14:19:14 -0700 Subject: Correct layout and styling for the shape tool and its sub tools --- css/ninja.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'css/ninja.css') diff --git a/css/ninja.css b/css/ninja.css index d309b34e..a65e826f 100755 --- a/css/ninja.css +++ b/css/ninja.css @@ -677,7 +677,7 @@ nav.menuBar ul ul, nav.menuBar ul li:hover ul ul, nav.menuBar ul ul li:hover ul nav.menuBar ul li:hover ul, nav.menuBar ul ul li:hover ul, nav.menuBar ul ul ul li:hover ul { display: block; } -.subToolHolderPanel .toolbutton { float: left; -webkit-transform: scale(0.6); } +.subToolHolderPanel .toolbutton { float: left; -webkit-transform: scale(0.6); margin-top: -4px; } .subToolHolderPanel .toolbutton:hover, .subToolHolderPanel .toolbutton.active { -webkit-transform: scale(0.75); } -- cgit v1.2.3 From 18370abcf406c6ab36d5c5f2613cb79e756ff6d2 Mon Sep 17 00:00:00 2001 From: John Mayhew Date: Wed, 9 May 2012 18:07:32 -0700 Subject: -Consolidated many redundant css classes used in the tool options bars --- css/ninja.css | 44 +++++++++++++------------------------------- 1 file changed, 13 insertions(+), 31 deletions(-) (limited to 'css/ninja.css') diff --git a/css/ninja.css b/css/ninja.css index a65e826f..b281632e 100755 --- a/css/ninja.css +++ b/css/ninja.css @@ -526,10 +526,6 @@ div.pp-button.button-divider div { height: 1px; width: 24px; background-color: b #pp-container-assets input.inline-editor { height: 11px; width: 80%; background-color: #242424 !important; color: #b2b2b2 !important; top: -2px; border-width: 0px; font-size: 11px; } -.subToolHolderPanel { margin-left: 42px; } - -.subToolPanel { margin-top: -6px; } - .properties_panel { overflow-x: hidden; color: white; } .properties_panel select { -webkit-appearance: none; font-size: 9px; color: white; background-color: #444444; border: 1px solid #313131; width: 120px; height: 15px; outline: none; background-image: url("../images/dropdown-bg.png"); background-repeat: no-repeat; background-position: right center; } @@ -677,25 +673,19 @@ nav.menuBar ul ul, nav.menuBar ul li:hover ul ul, nav.menuBar ul ul li:hover ul nav.menuBar ul li:hover ul, nav.menuBar ul ul li:hover ul, nav.menuBar ul ul ul li:hover ul { display: block; } +.subToolHolderPanel { margin-left: 42px; padding: 6px; float: left; } + .subToolHolderPanel .toolbutton { float: left; -webkit-transform: scale(0.6); margin-top: -4px; } .subToolHolderPanel .toolbutton:hover, .subToolHolderPanel .toolbutton.active { -webkit-transform: scale(0.75); } -.toolOptionsSpacer { margin-right: 9px; } - -.toolSeparator { height: 1px; width: 30px; } - -.toolSeparatorTop { margin-top: 3px; margin-bottom: 0px; } - -.toolSeparatorMiddle { margin-top: 0px; margin-bottom: 0px; } +.toolOptionsFloatChildren > * { float: left; } -.toolSeparatorBottom { margin-top: 0px; margin-bottom: 3px; } - -.toolImageBase { padding: 0px; width: 26px; height: 23px; opacity: 0.7; background-repeat: no-repeat; } +.toolOptionsSpacer { margin-right: 9px; } -.toolImageBase:hover { opacity: 1.0; } +.toolColorChipCtrl { width: 18px; height: 18px; margin-top: 1px; margin-left: 3px; margin-right: 8px; border: 1px black solid; } -.drawingMode { outline: blue solid thin; } +.toolColorChipIcon { width: 20px; height: 20px; margin-top: 1px; -webkit-transform: scale(0.8); background-color: #282828; } .textBox { padding-top: 3px; min-width: 10em; margin-left: 5px; position: relative; margin-top: 0px; } @@ -713,11 +703,11 @@ nav.menuBar ul li:hover ul, nav.menuBar ul ul li:hover ul, nav.menuBar ul ul ul .cornerRadius.topLeft { -webkit-transform: rotate(0deg); } -.cornerRadius.topRight { -webkit-transform: rotate(90deg); margin-right: -2px; } +.cornerRadius.topRight { -webkit-transform: rotate(90deg); } -.cornerRadius.bottomLeft { margin-top: 3px; -webkit-transform: rotate(270deg); } +.cornerRadius.bottomLeft { -webkit-transform: rotate(270deg); } -.cornerRadius.bottomRight { margin-top: 3px; -webkit-transform: rotate(180deg); margin-right: -2px; } +.cornerRadius.bottomRight { -webkit-transform: rotate(180deg); } #toolOptionsContainer { display: inline; float: left; } @@ -761,7 +751,7 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1 .optionLabel { margin-top: 5px; } -.tagRadioButtons input.tag-type { background: none; width: 20px; height: 20px; display: block; float: left; margin: 0px; padding: 0px; margin-right: 5px; margin-top: 4px; background-repeat: no-repeat; opacity: 0.8; text-indent: -9999px; cursor: pointer; -webkit-border-radius: 3px; -webkit-user-select: none; border: 1px solid transparent; } +.tagRadioButtons input.tag-type { background: none; width: 20px; height: 20px; display: block; float: left; margin: 0px; padding: 0px; margin-right: 5px; margin-top: 0px; background-repeat: no-repeat; opacity: 0.8; text-indent: -9999px; cursor: pointer; -webkit-border-radius: 3px; -webkit-user-select: none; border: 1px solid transparent; } .tagRadioButtons input.tag-type { background-image: url("../images/tools/sprite-toolbar-tag.png"); } @@ -791,16 +781,12 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1 .tagRadioButtons input.customTool:checked { background-position: 0px -20px; } -.tagRadioButtons .nj-divider { height: 100%; float: left; position: relative; top: 5px; } +.tagRadioButtons .nj-divider { height: 100%; float: left; position: relative; } -.tagRadioButtons select.nj-skinned { visibility: visible; position: relative; } +.tagRadioButtons select.nj-skinned { visibility: visible; position: relative; margin-top: 1px; } .tagRadioButtons select[disabled="true"].nj-skinned, .tagRadioButtons select[disabled].nj-skinned { visibility: hidden; } -.tagRadioButtons .fillColorCtrl { width: 18px; height: 18px; margin-top: 6px; margin-left: 3px; margin-right: 8px; border: 1px black solid; } - -.tagRadioButtons .colorCtrlIcon { width: 20px; height: 20px; margin-top: 6px; -webkit-transform: scale(0.8); background-color: #282828; } - #zoomToolOptionHolder input#zoomInTool:checked { border-style: solid; border-width: 1px; border-color: white; background-image: url("../images/optionsbar/zoom/zoom_plus.png"); background-repeat: no-repeat; background-position: 4px 3px; } #zoomToolOptionHolder input#zoomOutTool:checked { border-style: solid; border-width: 1px; border-color: white; background-image: url("../images/optionsbar/zoom/zoom_minus.png"); background-repeat: no-repeat; background-position: 4px 3px; } @@ -811,7 +797,7 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1 #zoomToolOptionHolder input.zoom-option { background: none; } -.object3DToolContainer input.tag-type { background: none; width: 20px; height: 20px; display: block; float: left; margin: 0px; padding: 0px; margin-right: 5px; margin-top: 4px; background-repeat: no-repeat; opacity: 0.8; text-indent: -9999px; cursor: pointer; -webkit-border-radius: 3px; -webkit-user-select: none; border: 1px solid transparent; } +.object3DToolContainer input.tag-type { background: none; width: 20px; height: 20px; display: block; float: left; margin: 0px; margin-right: 5px; background-repeat: no-repeat; opacity: 0.8; text-indent: -9999px; cursor: pointer; -webkit-border-radius: 3px; -webkit-user-select: none; border: 1px solid transparent; } .object3DToolContainer input.tag-type { background-image: url("../images/tools/sprite-toolbar-3d.png"); } @@ -829,10 +815,6 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1 .object3DToolContainer input.rotateGlobally:checked { background-position: 0px -20px; } -.optionsSelectionTool { padding: 6px; } - -.optionsSelectionTool > * { float: left; } - .optionsSelectionTool button { padding-top: 0px; } .selectionToolIcon { width: 16px; height: 16px; background-repeat: no-repeat; background-position: 1px 2px; } -- cgit v1.2.3 From 3be15e2076f2d3d46862bbc0ea078b9bf2e161fe Mon Sep 17 00:00:00 2001 From: John Mayhew Date: Thu, 10 May 2012 11:17:42 -0700 Subject: -moved sel tool images to proper folder -finished styling shape tool options -added new icons for shape tool --- css/ninja.css | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'css/ninja.css') diff --git a/css/ninja.css b/css/ninja.css index b281632e..a7aab886 100755 --- a/css/ninja.css +++ b/css/ninja.css @@ -701,13 +701,13 @@ nav.menuBar ul li:hover ul, nav.menuBar ul ul li:hover ul, nav.menuBar ul ul ul .cornerRadius:hover, .cornerRadius:active { opacity: 1; } -.cornerRadius.topLeft { -webkit-transform: rotate(0deg); } +.cornerRadius.topLeft { -webkit-transform: rotate(0deg); margin-top: 1px; margin-right: 3px; } -.cornerRadius.topRight { -webkit-transform: rotate(90deg); } +.cornerRadius.topRight { -webkit-transform: rotate(90deg); margin-right: 3px; margin-top: 1px; } -.cornerRadius.bottomLeft { -webkit-transform: rotate(270deg); } +.cornerRadius.bottomLeft { -webkit-transform: rotate(270deg); margin-right: 2px; margin-top: -1px; } -.cornerRadius.bottomRight { -webkit-transform: rotate(180deg); } +.cornerRadius.bottomRight { -webkit-transform: rotate(180deg); margin-right: 4px; margin-top: -1px; } #toolOptionsContainer { display: inline; float: left; } @@ -819,37 +819,37 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1 .selectionToolIcon { width: 16px; height: 16px; background-repeat: no-repeat; background-position: 1px 2px; } -.alignTopIcon { background-image: url("../images/tools/AlignTop.png"); } +.alignTopIcon { background-image: url("../images/optionsbar/selection/AlignTop.png"); } -.alignMiddleIcon { background-image: url("../images/tools/AlignMiddle.png"); } +.alignMiddleIcon { background-image: url("../images/optionsbar/selection/AlignMiddle.png"); } -.alignBottomIcon { background-image: url("../images/tools/AlignBottom.png"); } +.alignBottomIcon { background-image: url("../images/optionsbar/selection/AlignBottom.png"); } -.alignLeftIcon { background-image: url("../images/tools/AlignLeft.png"); } +.alignLeftIcon { background-image: url("../images/optionsbar/selection/AlignLeft.png"); } -.alignCenterIcon { background-image: url("../images/tools/AlignCenter.png"); } +.alignCenterIcon { background-image: url("../images/optionsbar/selection/AlignCenter.png"); } -.alignRightIcon { background-image: url("../images/tools/AlignRight.png"); } +.alignRightIcon { background-image: url("../images/optionsbar/selection/AlignRight.png"); } -.arrangeBringForwardIcon { background-image: url("../images/tools/ArrangeBringForward.png"); } +.arrangeBringForwardIcon { background-image: url("../images/optionsbar/selection/ArrangeBringForward.png"); } -.arrangeSendBackwardIcon { background-image: url("../images/tools/ArrangeSendBackward.png"); } +.arrangeSendBackwardIcon { background-image: url("../images/optionsbar/selection/ArrangeSendBackward.png"); } -.arrangeBringToFrontIcon { background-image: url("../images/tools/ArrangeBringToFront.png"); } +.arrangeBringToFrontIcon { background-image: url("../images/optionsbar/selection/ArrangeBringToFront.png"); } -.arrangeSendToBackIcon { background-image: url("../images/tools/ArrangeSendToBack.png"); } +.arrangeSendToBackIcon { background-image: url("../images/optionsbar/selection/ArrangeSendToBack.png"); } -.distTopIcon { background-image: url("../images/tools/DistTop.png"); } +.distTopIcon { background-image: url("../images/optionsbar/selection/DistTop.png"); } -.distMiddleIcon { background-image: url("../images/tools/DistMiddle.png"); } +.distMiddleIcon { background-image: url("../images/optionsbar/selection/DistMiddle.png"); } -.distBottomIcon { background-image: url("../images/tools/DistBottom.png"); } +.distBottomIcon { background-image: url("../images/optionsbar/selection/DistBottom.png"); } -.distLeftIcon { background-image: url("../images/tools/DistLeft.png"); } +.distLeftIcon { background-image: url("../images/optionsbar/selection/DistLeft.png"); } -.distCenterIcon { background-image: url("../images/tools/DistCenter.png"); } +.distCenterIcon { background-image: url("../images/optionsbar/selection/DistCenter.png"); } -.distRightIcon { background-image: url("../images/tools/DistRight.png"); } +.distRightIcon { background-image: url("../images/optionsbar/selection/DistRight.png"); } #toolsPanelContent { width: 40px; } -- cgit v1.2.3 From 2cdefe05cdc058160093d7ab9d50a4fadd1c45fc Mon Sep 17 00:00:00 2001 From: John Mayhew Date: Mon, 14 May 2012 12:41:47 -0700 Subject: -updated images for tag and zoom tool -made tag and zoom tool radio group button styles consistent and removed duplicate classes --- css/ninja.css | 48 +++++++++++++++--------------------------------- 1 file changed, 15 insertions(+), 33 deletions(-) (limited to 'css/ninja.css') diff --git a/css/ninja.css b/css/ninja.css index 309c3ccd..34a29362 100755 --- a/css/ninja.css +++ b/css/ninja.css @@ -679,6 +679,14 @@ nav.menuBar ul li:hover ul, nav.menuBar ul ul li:hover ul, nav.menuBar ul ul ul .toolColorChipIcon { width: 20px; height: 20px; margin-top: 1px; -webkit-transform: scale(0.8); background-color: #282828; } +.subToolHolderPanel input.toolOptsRadioButton { background: none; width: 20px; height: 20px; display: block; margin: 0px; padding: 0px; margin-right: 5px; margin-top: 0px; background-repeat: no-repeat; opacity: 0.8; text-indent: -9999px; cursor: pointer; -webkit-border-radius: 3px; -webkit-user-select: none; border: 1px solid transparent; background-position: 1px 1px; } + +.subToolHolderPanel input.toolOptsRadioButton:active { border: 1px solid transparent; } + +.subToolHolderPanel input.toolOptsRadioButton:hover { opacity: 1.0; -webkit-box-shadow: 0px 0px 4px #fff; } + +.subToolHolderPanel input.toolOptsRadioButton:checked { background-color: #b2b2b2; opacity: 1.0; cursor: default; -webkit-box-shadow: none; background-repeat: no-repeat; background-position: 1px 1px; } + .textBox { padding-top: 3px; min-width: 10em; margin-left: 5px; position: relative; margin-top: 0px; } .selectBox { width: 10em; opacity: 0.9; margin-left: 10px; float: left; display: block; background-color: #666666; border: 1px solid black; color: white; outline: none; } @@ -743,35 +751,15 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1 .optionLabel { margin-top: 5px; } -.tagRadioButtons input.tag-type { background: none; width: 20px; height: 20px; display: block; float: left; margin: 0px; padding: 0px; margin-right: 5px; margin-top: 0px; background-repeat: no-repeat; opacity: 0.8; text-indent: -9999px; cursor: pointer; -webkit-border-radius: 3px; -webkit-user-select: none; border: 1px solid transparent; } - -.tagRadioButtons input.tag-type { background-image: url("../images/tools/sprite-toolbar-tag.png"); } - -.tagRadioButtons input.tag-type:active { border: 1px solid transparent; } - -.tagRadioButtons input.tag-type:hover { opacity: 1.0; -webkit-box-shadow: 0px 0px 4px #fff; } - -.tagRadioButtons input.tag-type:checked { background-color: transparent; opacity: 1.0; cursor: default; -webkit-box-shadow: none; } - -.tagRadioButtons input.divTool { margin-left: 8px; background-position: -40px 0px; } +.tagRadioButtons input.divTool { background-image: url("../images/optionsbar/tag/div-tag.png"); } -.tagRadioButtons input.divTool:checked { background-position: -40px -20px; } +.tagRadioButtons input.imageTool { background-image: url("../images/optionsbar/tag/img-tag.png"); } -.tagRadioButtons input.imageTool { background-position: -60px 0px; } +.tagRadioButtons input.videoTool { background-image: url("../images/optionsbar/tag/vid-tag.png"); } -.tagRadioButtons input.imageTool:checked { background-position: -60px -20px; } +.tagRadioButtons input.canvasTool { background-image: url("../images/optionsbar/tag/canvas-tag.png"); } -.tagRadioButtons input.videoTool { background-position: -100px 0px; } - -.tagRadioButtons input.videoTool:checked { background-position: -100px -20px; } - -.tagRadioButtons input.canvasTool { background-position: -20px 0px; } - -.tagRadioButtons input.canvasTool:checked { background-position: -20px -20px; } - -.tagRadioButtons input.customTool { background-position: 0px 0px; } - -.tagRadioButtons input.customTool:checked { background-position: 0px -20px; } +.tagRadioButtons input.customTool { background-image: url("../images/optionsbar/tag/custom-tag.png"); } .tagRadioButtons .nj-divider { height: 100%; float: left; position: relative; } @@ -779,15 +767,9 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1 .tagRadioButtons select[disabled="true"].nj-skinned, .tagRadioButtons select[disabled].nj-skinned { visibility: hidden; } -#zoomToolOptionHolder input#zoomInTool:checked { border-style: solid; border-width: 1px; border-color: white; background-image: url("../images/optionsbar/zoom/zoom_plus.png"); background-repeat: no-repeat; background-position: 4px 3px; } - -#zoomToolOptionHolder input#zoomOutTool:checked { border-style: solid; border-width: 1px; border-color: white; background-image: url("../images/optionsbar/zoom/zoom_minus.png"); background-repeat: no-repeat; background-position: 4px 3px; } - -#zoomToolOptionHolder input#zoomInTool { border-style: solid; border-width: 1px; background-image: url("../images/optionsbar/zoom/zoom_plus.png"); background-repeat: no-repeat; background-position: 4px 3px; } - -#zoomToolOptionHolder input#zoomOutTool { border-style: solid; border-width: 1px; background-image: url("../images/optionsbar/zoom/zoom_minus.png"); background-repeat: no-repeat; background-position: 4px 3px; } +#zoomToolOptionHolder .zoomOutToolIcon { background-image: url("../images/optionsbar/zoom/zoom_minus.png"); } -#zoomToolOptionHolder input.zoom-option { background: none; } +#zoomToolOptionHolder .zoomInToolIcon { background-image: url("../images/optionsbar/zoom/zoom_plus.png"); } .object3DToolContainer input.tag-type { background: none; width: 20px; height: 20px; display: block; float: left; margin: 0px; margin-right: 5px; background-repeat: no-repeat; opacity: 0.8; text-indent: -9999px; cursor: pointer; -webkit-border-radius: 3px; -webkit-user-select: none; border: 1px solid transparent; } -- cgit v1.2.3 From 52f63541065ce94fab8766b1b0db057eafcfccaa Mon Sep 17 00:00:00 2001 From: John Mayhew Date: Mon, 14 May 2012 14:57:07 -0700 Subject: -changed tool options radio button class to match the styling of the shape options tool buttons -fixed bug injected in the tag tool caused by accidental removal of the value element attribute -moved color chip in the tag tool to the right of the element radio button group --- css/ninja.css | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'css/ninja.css') diff --git a/css/ninja.css b/css/ninja.css index 34a29362..6b3c00d6 100755 --- a/css/ninja.css +++ b/css/ninja.css @@ -679,13 +679,11 @@ nav.menuBar ul li:hover ul, nav.menuBar ul ul li:hover ul, nav.menuBar ul ul ul .toolColorChipIcon { width: 20px; height: 20px; margin-top: 1px; -webkit-transform: scale(0.8); background-color: #282828; } -.subToolHolderPanel input.toolOptsRadioButton { background: none; width: 20px; height: 20px; display: block; margin: 0px; padding: 0px; margin-right: 5px; margin-top: 0px; background-repeat: no-repeat; opacity: 0.8; text-indent: -9999px; cursor: pointer; -webkit-border-radius: 3px; -webkit-user-select: none; border: 1px solid transparent; background-position: 1px 1px; } +.subToolHolderPanel input.toolOptsRadioButton { width: 24px; height: 24px; margin: 0px 5px 0px 0px; padding: 0px; cursor: pointer; border-radius: 3px; -webkit-user-select: none; border: 1px solid transparent; background: none; background-repeat: no-repeat; background-position: center center; -webkit-transform: scale(0.9); } -.subToolHolderPanel input.toolOptsRadioButton:active { border: 1px solid transparent; } +.subToolHolderPanel input.toolOptsRadioButton:hover { box-shadow: 0px 0px 2px 2px #999; -webkit-transform: scale(1); } -.subToolHolderPanel input.toolOptsRadioButton:hover { opacity: 1.0; -webkit-box-shadow: 0px 0px 4px #fff; } - -.subToolHolderPanel input.toolOptsRadioButton:checked { background-color: #b2b2b2; opacity: 1.0; cursor: default; -webkit-box-shadow: none; background-repeat: no-repeat; background-position: 1px 1px; } +.subToolHolderPanel input.toolOptsRadioButton:checked { box-shadow: inset 0px 0px 2px 2px #999; background-color: #363636; background-position: center center; background-repeat: no-repeat; -webkit-transform: scale(1); } .textBox { padding-top: 3px; min-width: 10em; margin-left: 5px; position: relative; margin-top: 0px; } @@ -837,7 +835,7 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1 .toolbutton:active { background-color: #8c8c8c; } -.toolbutton.active { box-shadow: inset 0px 0px 2px 2px #555; background-color: #363636; } +.toolbutton.active { box-shadow: inset 0px 0px 2px 2px #999; background-color: #363636; } .SelectionTool { background-image: url("../images/tools/Tool-Selection.png"); } -- cgit v1.2.3 From 035c851a955952d0a1c89a7c8a646b674ab3f4f2 Mon Sep 17 00:00:00 2001 From: John Mayhew Date: Tue, 15 May 2012 10:42:41 -0700 Subject: -fixed spacing problem in the tag tool -implemented the new mode radio buttons for the pen tool --- css/ninja.css | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'css/ninja.css') diff --git a/css/ninja.css b/css/ninja.css index 6b3c00d6..33ec332c 100755 --- a/css/ninja.css +++ b/css/ninja.css @@ -823,6 +823,12 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1 .distRightIcon { background-image: url("../images/optionsbar/selection/DistRight.png"); } +.optionsPenTool input.penToolIcon { background-image: url("../images/tools/Tool-Pen.png"); } + +.optionsPenTool input.penPlusToolIcon { background-image: url("../images/optionsbar/pen/penPlus.png"); } + +.optionsPenTool input.penMinusToolIcon { background-image: url("../images/optionsbar/pen/penMinus.png"); } + #toolsPanelContent { width: 40px; } .toolsList { width: 29px; margin: auto; } -- cgit v1.2.3 From 9539e778dd678cec90cf83528df69a189be3a192 Mon Sep 17 00:00:00 2001 From: John Mayhew Date: Tue, 15 May 2012 15:24:13 -0700 Subject: updated object 3D options bar to use the new radio styles removed its use of the sprite sheet --- css/ninja.css | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'css/ninja.css') diff --git a/css/ninja.css b/css/ninja.css index 33ec332c..682dfc9d 100755 --- a/css/ninja.css +++ b/css/ninja.css @@ -769,23 +769,9 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1 #zoomToolOptionHolder .zoomInToolIcon { background-image: url("../images/optionsbar/zoom/zoom_plus.png"); } -.object3DToolContainer input.tag-type { background: none; width: 20px; height: 20px; display: block; float: left; margin: 0px; margin-right: 5px; background-repeat: no-repeat; opacity: 0.8; text-indent: -9999px; cursor: pointer; -webkit-border-radius: 3px; -webkit-user-select: none; border: 1px solid transparent; } +.object3DToolContainer input.rotateLocally { background-image: url("../images/optionsbar/options3D/rotate-locally.png"); } -.object3DToolContainer input.tag-type { background-image: url("../images/tools/sprite-toolbar-3d.png"); } - -.object3DToolContainer input.tag-type:active { border: 1px solid transparent; } - -.object3DToolContainer input.tag-type:hover { opacity: 1.0; -webkit-box-shadow: 0px 0px 4px #fff; } - -.object3DToolContainer input.tag-type:checked { background-color: transparent; opacity: 1.0; cursor: default; -webkit-box-shadow: none; } - -.object3DToolContainer input.rotateLocally { background-position: -20px 0px; } - -.object3DToolContainer input.rotateLocally:checked { background-position: -20px -20px; } - -.object3DToolContainer input.rotateGlobally { background-position: 0px 0px; } - -.object3DToolContainer input.rotateGlobally:checked { background-position: 0px -20px; } +.object3DToolContainer input.rotateGlobally { background-image: url("../images/optionsbar/options3D/rotate-globally.png"); } .optionsSelectionTool button { padding-top: 0px; } -- cgit v1.2.3