From 3a754133dbc138390503341fd2e9beba3e43aa4b Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Fri, 27 Jan 2012 12:05:17 -0800 Subject: Merged old FileIO --- css/ninja.css | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 css/ninja.css (limited to 'css') diff --git a/css/ninja.css b/css/ninja.css old mode 100644 new mode 100755 -- cgit v1.2.3 From cb266a79c03968cf68efca015b2db8d6d221ac6d Mon Sep 17 00:00:00 2001 From: Jon Reid Date: Fri, 27 Jan 2012 16:15:38 -0800 Subject: Fixes to radio button base styles. Comment clean-up. --- css/ninja.css | 220 +++++++++++----------------------------------------------- 1 file changed, 39 insertions(+), 181 deletions(-) (limited to 'css') diff --git a/css/ninja.css b/css/ninja.css index 2fcb1380..9126c1d3 100755 --- a/css/ninja.css +++ b/css/ninja.css @@ -1,33 +1,5 @@ @charset "UTF-8"; /* This file contains proprietary software owned by Motorola Mobility, Inc.
No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. */ -/* */ -/* ninja.scss Main SCSS file for ninja, compiled by SASS into the file ninja.css. */ -/* _colors.scss Defines the colors for the UI of the application. To create a new theme, copy this file and change the values as desired. Note: Some colors are defined as both rgb and rgba; some of the rgba versions have multiple a values. */ -/* Colors for radio buttons and other form elements */ -/* Base colors for dividers Dividers consist of a div with a background color and either a top & bottom border (in the case of horizontal dividers) or a left & right border (in the case of vertical dividers), for a total of three different colors. */ -/* top and left */ -/* Middle */ -/* Bottom and right */ -/* Main background color of entire app */ -/* Main app background color. */ -/* rgba version */ -/* Main app border color */ -/* color of drop shadows */ -/* Stage color */ -/* body border color */ -/* Body background color */ -/* Colors for main dropdown menus: background & text for both regular and highlighted states, dividers */ -/* Colors for tools: background, text, how they interact with the UI */ -/* Colors for panels: background & text, both regular and highlighted states, dividers, borders, shadows, etc. */ -/* used for editable items in their non-edit state, etc. */ -/* Border for panel and for block elements */ -/* Shadow for text and block elements */ -/* Colors for scroll bars */ -/* _fonts.scss Defines the fonts for the application. */ -/* Droid Sans: Normal, bold asdf*/ -/* themes/themename/mixins.scss Mixins that are theme-dependent (e.g. sprite mixins, etc) */ -/* mixins.scss Generic mixins. Theme-specific mixins (e.g. for sprites) should go in the theme/themename/mixins.scss file. */ -/* Base.scss Base styles for entire application. Note that colors and font definitions go in _scss/themes/themename/_colors.scss and _scss/themes/themename/_fonts.scss */ .clear { display: block; clear: both; height: 0px; overflow: hidden; } .bold { font-weight: bold; } @@ -44,29 +16,16 @@ .layout-table .flexor div:last-child { float: right; } -/* Begin: Basic skinning for form fields */ -/* Reset all */ input.nj-skinned, textarea.nj-skinned, button.nj-skinned, select.nj-skinned, select.nj-skinned option, button.nj-skinned { -webkit-appearance: none; outline: none; } -/* Base styles */ input[type="text"].nj-skinned, input[type="password"].nj-skinned, input[type="search"].nj-skinned, textarea.nj-skinned, select.nj-skinned, select.nj-skinned option { border: 1px solid #313131; color: white; background-color: #444444; font-size: 12px; font-family: 'Droid Sans', sans-serif; } -/* Disabled styles */ input.nj-skinned:disabled, textarea.nj-skinned:disabled, select.nj-skinned:disabled, button.nj-skinned:disabled { opacity: 0.4; } -/* Text inputs and select boxes */ input[type="text"].nj-skinned, input[type="password"].nj-skinned, input[type="search"].nj-skinned, select.nj-skinned, select.nj-skinned option { height: 13px; } -/* -input[type="text"].nj-skinned:focus, -input[type="password"].nj-skinned:focus, -input[type="search"].nj-skinned:focus, -textarea.nj-skinned:focus, -select.nj-skinned:focus, -select.nj-skinned option:focus { - -webkit-box-shadow: 0px 0px 3px $color-focus-outline; -} -*/ +input[type="text"].nj-skinned:focus, input[type="password"].nj-skinned:focus, input[type="search"].nj-skinned:focus, textarea.nj-skinned:focus, select.nj-skinned:focus, select.nj-skinned option:focus { -webkit-box-shadow: 0px 0px 3px #b4b4b4; } + select.nj-skinned { background-image: url("../images/dropdown-bg.png"); background-repeat: no-repeat; background-position: right center; font-size: 12px; height: 16px; padding-right: 20px; } input[type="search"].nj-skinned { height: 17px; -webkit-box-shadow: none; } @@ -75,23 +34,18 @@ input[type="search"].nj-skinned::-webkit-search-cancel-button { -webkit-appearan input[type="search"].nj-skinned::-webkit-search-cancel-button:after { content: "\2716"; } -/* Buttons */ button.nj-skinned { font-size: 9px; cursor: pointer; } -/* Radio buttons */ input[type="radio"].nj-skinned { background-color: #474747; background-image: -webkit-linear-gradient(top, #646464 0%, #3c3c3c 100%); color: #c8c8c8; border: 2px solid #282828; width: 12px; height: 12px; overflow: hidden; border-radius: 10px; font-size: 16px; line-height: 7px; text-indent: -7px; cursor: pointer; -webkit-box-shadow: 0px 0px 2px rgba(200, 200, 200, 0.5); -moz-box-shadow: 0px 0px 2px rgba(200, 200, 200, 0.5); box-shadow: 0px 0px 2px rgba(200, 200, 200, 0.5); } -input[type="radio"].nj-skinned:checked { background-image: -webkit-linear-gradient(top, #646464 0%, #3c3c3c 100%); border: 2px solid #282828; } +input[type="radio"].nj-skinned:checked { background: -webkit-radial-gradient(center, circle cover, #c8c8c8 0%, #c8c8c8 15%, #c8c8c8 30%, rgba(0, 0, 0, 0) 31%), -webkit-linear-gradient(top, #646464 0%, #3c3c3c 100%); border: 2px solid #282828; } input[type="radio"].nj-skinned:hover { border: 2px solid #282828; } -input[type="radio"].nj-skinned:checked:after { content: "\a0 \a0 \2022"; } - input[type="radio"].nj-skinned:active { background-image: -webkit-linear-gradient(top, #3c3c3c 0%, #646464 100%); } input[type="radio"].nj-skinned:disabled { background-image: -webkit-linear-gradient(top, #646464 0%, #3c3c3c 100%); border: 2px solid #282828; cursor: default; } -/* Checkboxes */ input[type="checkbox"].nj-skinned { background-color: #474747; background-image: -webkit-linear-gradient(top, #646464 0%, #3c3c3c 100%); color: #c8c8c8; border: 1px solid #282828; width: 10px; height: 10px; font-size: 12px; overflow: visible; cursor: pointer; -webkit-box-shadow: 0px 0px 2px rgba(200, 200, 200, 0.5); -moz-box-shadow: 0px 0px 2px rgba(200, 200, 200, 0.5); box-shadow: 0px 0px 2px rgba(200, 200, 200, 0.5); line-height: 9px; } input[type="checkbox"].nj-skinned:checked:after { content: "\2714"; } @@ -100,16 +54,12 @@ input[type="checkbox"].nj-skinned:active { background-image: -webkit-linear-grad input[type="checkbox"].nj-skinned:disabled { background-image: -webkit-linear-gradient(top, #646464 0%, #3c3c3c 100%); cursor: default; } -/* End: Basic skinning for form fields */ -/* Begin: Basic skinning for visual dividers */ .nj-divider { background-color: black; border-width: 0px; overflow: hidden; } .nj-divider.divider-horizontal { border-top: 1px solid #232323; border-bottom: 1px solid #3a3a3a; height: 1px; } .nj-divider.divider-vertical { border-left: 1px solid #232323; border-right: 1px solid #3a3a3a; width: 1px; } -/* End: Basic skinning for visual dividers */ -/* MainWindow.scss Styles governing the main window and overall layout of the application. Note that colors and font definitions go in _scss/themes/themename/_colors.scss and _scss/themes/themename/_fonts.scss */ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-color: black; overflow: hidden; -webkit-user-select: none; font-family: 'Droid Sans', sans-serif; } #appContainer { position: absolute; margin: 0px; display: -webkit-box; -webkit-box-orient: vertical; -webkit-box-align: stretch; width: 100%; height: 100%; border-left: 16px solid #000; border-right: 16px solid #000; border-top: 28px solid #000; -webkit-box-sizing: border-box; max-width: 100%; max-height: 100%; } @@ -126,9 +76,7 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co #topPanelContainer { overflow: hidden; margin-bottom: 2px; height: 32px; } -#bottomPanelContainer { /*border: 1px solid #333; -background: transparent; -*/ min-height: 80px; max-height: 50%; overflow: auto; } +#bottomPanelContainer { background: transparent; min-height: 80px; max-height: 50%; overflow: auto; } .panelContainer { display: block; -webkit-box-orient: vertical; position: relative; } @@ -166,9 +114,9 @@ background: transparent; #sceneBar { height: 70px; background-color: #474747; } -#mainContainer #rulerTop { /* TODO: temporary background please replace when component is implemented */ background: url("../images/temp/ruler-top.png"); height: 15px; margin-bottom: 0px; } +#mainContainer #rulerTop { background: url("../images/temp/ruler-top.png"); height: 15px; margin-bottom: 0px; } -#rulerLeft { /* TODO: temporary background please replace when component is implemented */ background: url("../images/temp/ruler-left.png"); width: 16px; } +#rulerLeft { background: url("../images/temp/ruler-left.png"); width: 16px; } #stateBar { height: 20px; background-color: #282828; margin-bottom: 0px; } @@ -184,7 +132,6 @@ background: transparent; .resizeBar { -webkit-transition: all 0.15s linear; } -/* Splitters Collapsed */ .panelContainer, .panelContainer.collapsed { -webkit-transition: all 0.15s ease-in; } .panel.disableTransition { -webkit-transition: none !important; -webkit-box-flex: 0.1 !important; } @@ -203,18 +150,10 @@ background: transparent; .bottomSplitter.collapsed { -webkit-transform: rotate(0deg); } -/* - - -.stageContentShadow { -webkit-box-shadow: 3px 5px 4px $color-app-shadow; -moz-box-shadow: 3px 5px 4px $color-app-shadow; box-shadow: 3px 5px 4px $color-app-shadow; -} +.stageContentShadow { -webkit-box-shadow: 3px 5px 4px rgba(0, 0, 0, 0.5); -moz-box-shadow: 3px 5px 4px rgba(0, 0, 0, 0.5); box-shadow: 3px 5px 4px rgba(0, 0, 0, 0.5); } -*/ -/* -.baseBox { display:-webkit-box; display:-moz-box; display: box; -} +.baseBox { display: -webkit-box; display: -moz-box; display: box; } -/* Generic style to make any element unselectable */ .unselectable { -webkit-user-select: none; } .verticalBox { -webkit-box-orient: vertical; -moz-box-orient: vertical; box-orient: vertical; } @@ -235,19 +174,17 @@ background: transparent; #middleDocArea { -webkit-box-orient: horizontal; -moz-box-orient: horizontal; box-orient: horizontal; -moz-box-flex: 1; -webkit-box-flex: 1; box-flex: 1; margin: 1px; margin-bottom: 3px; border-style: solid; border-width: 1px; } -/* Used for the Iframe Version -#mainStageIFrame { border: none; margin: 4px; -} -*/ +#mainStageIFrame { border: none; margin: 4px; } + #mainStageArea { -moz-box-flex: 1; -webkit-box-flex: 1; box-flex: 1; overflow: scroll; position: relative; margin: 0px; padding: 0px; border: none; } -#pasteBoard { /*position: relative;*/ top: 0px; left: 0px; margin: 0px; padding: 0px; border: none; /*overflow: scroll;*/ } +#pasteBoard { top: 0px; left: 0px; margin: 0px; padding: 0px; border: none; } #stageBG { width: 100%; height: 100%; background-color: red; position: absolute; margin-left: auto; margin-right: auto; left: 0; right: 0; top: 150px; z-index: 0; } #stageUserContent { width: 100%; height: 100%; background-color: transparent; border: 1px solid black; position: absolute; margin-left: auto; margin-right: auto; left: 0; right: 0; top: 150px; z-index: 1; } -#stageParent { /* we aren't entirely sure why this works but putting a slight opacity on this div seems to keep the users content from breaking through the overlay canvas and eating mouse events John Mayhew */ z-index: 2; opacity: 0.99; /*height: 1000px;*/ /*width: 2000px;*/ position: absolute; margin: 0px; border: none; padding: 0px; top: 0px; left: 0px; /*background-color: red;*/ } +#stageParent { z-index: 2; opacity: 0.99; position: absolute; margin: 0px; border: none; padding: 0px; top: 0px; left: 0px; } .global3DSettings { -webkit-transform-style: preserve-3d; -webkit-transform: perspective(1400) matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); } @@ -271,19 +208,13 @@ background: transparent; #mainContent .CodeMirror-scroll { height: 100%; overflow: scroll; overflow-x: auto; overflow-y: auto; } -/* PanelUI.scss Styles governing the panels in the UI. Note that colors and font definitions go in _scss/themes/themename/_colors.scss and _scss/themes/themename/_fonts.scss */ -/* layout for the container of all panels within a dock area */ -.panelContainer { margin: 0px; padding: 0px 0px; position: relative; /* -this is here to hopefully show vertical scroll bars when the panels exceed the height of the panel -unfortunately it doesn't seem to work properly. this is probably due to some of our box styling or positioning -overflow: auto; */ } +.panelContainer { margin: 0px; padding: 0px 0px; position: relative; overflow: auto; } -/* base layout style for all panels*/ .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; } .panelBackground { color: white; background: #292929; } -.panelCollapseArrowFill { color: #4c4c4c; /* this is never really used but is set so we can get it via javascript to draw the control via script on the canvas */ padding: 0px 4px; } +.panelCollapseArrowFill { color: #4c4c4c; padding: 0px 4px; } .panelContentColor { background: #474747; border-color: black; } @@ -297,31 +228,26 @@ overflow: auto; */ } .panelCloseIcon:hover { opacity: 1.0; } -.toolsPanelContainer { margin-top: -2px; margin-left: -2px; padding-top: 20px; padding-left: 3px; padding-right: 3px; width: 32px; /*This is a hack to get the tools panel to extend all the way to the bottom.*/ padding-bottom: 450px; } +.toolsPanelContainer { margin-top: -2px; margin-left: -2px; padding-top: 20px; padding-left: 3px; padding-right: 3px; width: 32px; padding-bottom: 450px; } -/* sizes for the specific panels */ #toolPropertiesPanel { height: 32px; margin: 0px; } #timelinePanel { height: 116px; } -/* Only used by Animation Presets Panel currently */ .treeComponent { -webkit-user-select: none; font-size: 11px; margin-left: 20px; cursor: default; color: white; } .treeComponent ul { position: relative; list-style: none; } -/*This sets the style for a tree folder's icon*/ ul.treeComponent > img:first-child { margin-left: -35px; margin-right: 5px; -webkit-transition: -webkit-transform 0.1s linear; } .treeComponent li { position: relative; list-style: none; border-bottom: 1px solid #505050; } -.treeComponent li img { margin-left: -20px; padding-right: 10px; vertical-align: middle; /*border-bottom:1px solid #555555;*/ } +.treeComponent li img { margin-left: -20px; padding-right: 10px; vertical-align: middle; } .treeCategory { font-weight: bold; } .treeItem { font-weight: normal; vertical-align: middle; color: white; } -/* ====== Used by Properties Panel ====== */ -/* Removed the outline text input style -> Causing problems with the Canvas */ .propertiesPanel { min-height: 300px; margin-top: 4px; } .panelHRule { border: none; display: block; float: left; clear: both; width: 100%; height: 3px; background-color: #505050; } @@ -332,7 +258,6 @@ ul.treeComponent > img:first-child { margin-left: -35px; margin-right: 5px; -web .piCollapsibleSectionHeader { font-size: 12px; padding-left: 10px; vertical-align: top; height: 16px; background-color: #3a3a3a; } -/* ====== Indexed table row and column classes for Properties Panel layout ====== */ .propRow1 { width: 100%; } .propRow1Col1 { width: 30%; text-align: right; } @@ -393,7 +318,6 @@ ul.treeComponent > img:first-child { margin-left: -35px; margin-right: 5px; -web .splitterBackground { background: black; } -/* Begin: Project Panel UI classes */ .Project-Panel { height: 100%; } #pp-container { height: 100%; background-color: #292929; border: 0px; overflow-y: hidden !IMPORTANT; position: relative; } @@ -404,23 +328,16 @@ ul.treeComponent > img:first-child { margin-left: -35px; margin-right: 5px; -web #pp-col-files { display: block; position: absolute; height: auto; overflow: hidden; bottom: 0; top: 0; left: 0; right: 0; border: 2px solid black; border-bottom-width: 0px; background-color: #474747; margin-left: 30px; margin-right: 10px; margin-bottom: 36px; } -/* -#pp-container-list, -#pp-container-assets { height: 310px; width: 100%; overflow: auto; -} -*/ +#pp-container-list, #pp-container-assets { height: 310px; width: 100%; overflow: auto; } + .pp-scroll-main { display: block; position: absolute; height: auto; bottom: 0; top: 0; left: 0; right: 0; margin-top: 18px; overflow: auto; } .pp-scroll-main .pp-scroll-linked { display: block; position: absolute; height: auto; bottom: 0; top: 0; left: 0; right: 0; overflow: visible; } #pp-view-assets { display: none; } -/* -#pp-container-assets .pp-scroll-linked, -#pp-container-list .pp-scroll-linked { - width: 420px; -} -*/ +#pp-container-assets .pp-scroll-linked, #pp-container-list .pp-scroll-linked { width: 420px; } + .pp-header-container { position: relative; overflow: hidden; border-bottom: 1px solid black; background-color: #3a3a3a; min-width: 390px; } .pp-header { border-right: 1px solid black; color: white; padding-top: 4px; padding-left: 6px; font-weight: bold; display: block; float: left; overflow: visible; position: relative; } @@ -473,10 +390,7 @@ span.pp-span-all:focus { -webkit-box-shadow: none; background-color: #b4b4b4; bo .pp-sort-arrow { display: none; } -.pp-sort .pp-sort-arrow { display: block; width: 9px; height: 5px; /* -margin-right: 10px; -margin-top: 2px; -*/ background-image: url("../images/panels/project-panel/icon-sort-arrow.png"); background-repeat: no-repeat; position: absolute; top: 5px; right: 10px; } +.pp-sort .pp-sort-arrow { display: block; width: 9px; height: 5px; margin-right: 10px; margin-top: 2px; background-image: url("../images/panels/project-panel/icon-sort-arrow.png"); background-repeat: no-repeat; position: absolute; top: 5px; right: 10px; } .pp-sort.sort-ascending .pp-sort-arrow { background-position: 0 0; } @@ -490,7 +404,6 @@ margin-top: 2px; #pp-view-assets #pp-container-assets :focus, #pp-view-assets #pp-container-assets .focused { background-color: #b4b4b4; border-color: #b4b4b4; color: #474747; } -/* Icons! */ #pp-container-list li, #pp-container-list span.span-space { background-repeat: no-repeat; } #pp-container-list li.directory.open > span.pp-span-all > span.pp-col-files > span.span-space { background-image: url("../images/panels/project-panel/icon-file-folderopen.png"); background-position: 100% 0px; } @@ -531,7 +444,6 @@ margin-top: 2px; #pp-container-list span.span-space { display: block; float: left; margin-right: 5px; height: 15px; } -/* Buttons */ .pp-button, #pp-col-buttons .pp-button div { margin: 0px; padding: 0px; width: 26px; height: 25px; background-repeat: no-repeat; overflow: hidden; } .pp-button { margin-top: 5px; cursor: pointer; position: relative; left: 2px; } @@ -576,7 +488,6 @@ div.pp-button.button-divider div { height: 1px; width: 24px; background-color: b .pp-button.button-undefined { display: none; } -/* Hide and Show different types of assets */ .pp-type-script, .pp-type-video, .pp-type-audio, .pp-type-image, .pp-type-flash, .pp-type-other { display: none; } .pp-show-all .pp-asset-col div { display: block; } @@ -591,12 +502,10 @@ div.pp-button.button-divider div { height: 1px; width: 24px; background-color: b .pp-show-flash .pp-type-flash { display: block; } -/* New file flyout */ .pp-popup { position: absolute; top: -53px; left: -40px; width: 80px; height: 50px; overflow: hidden; border-radius: 5px; background-color: #292929; border: 2px solid #333333; z-index: 100; display: none; } .pp-popup p { color: white; margin: 0px; padding: 0px; } -/* Search subwidget */ #pp-search { position: absolute; display: block; height: 24px; border: 2px solid black; background-color: #474747; margin-left: 30px; margin-right: 10px; left: 0px; bottom: 10px; right: 0px; } #pp-search label { position: absolute; top: 7px; left: 12px; width: 20px; height: 20px; background-image: url("../images/panels/project-panel/icon-button-search.png"); background-repeat: no-repeat; z-index: 10; } @@ -611,21 +520,14 @@ div.pp-button.button-divider div { height: 1px; width: 24px; background-color: b #pp-view-assets #pp-container-assets .pp-filter-hidden { display: none; } -/* Inline editor styling */ #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; } -/* End: Tree component for Project Panel */ .subToolHolderPanel { margin-left: 42px; } .subToolPanel { margin-top: -6px; } -/*.marginposition{*/ -/*margin-top:-26px*/ -/*}*/ -/* Begin: Properties Panel styles */ .properties_panel { overflow-x: hidden; color: white; } -/* Begin: styling the form elements */ .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; } .properties_panel select:focus { outline: none; border: 1px solid #313131; } @@ -638,20 +540,16 @@ button.panel-button { -webkit-appearance: none; font-size: 9px; color: white; ba .properties_panel .hottextunit input { width: 40px; height: 12px; font-size: 10px; -webkit-appearance: none; border-color: #313131; background-color: #444444; color: white; } -/* End: styling the form elements */ -/* main section styles */ .pp_sectionHeader { font-size: 12px; padding-left: 37px; height: 15px; background-color: #3e3e3e; background-image: url("../images/panels/panelDisclosureIcon.png"); background-repeat: no-repeat; background-position: 11px 0px; margin-bottom: 8px; } .pp_section { width: 227px; margin-top: 5px; } -/* control groups */ .pp_group { width: 100%; clear: both; margin-left: 5px; } .pp_propset { float: left; width: auto; height: 20px; } .pp_lock { position: absolute; top: -2px; left: 25px; } -/* controls */ .pp_proplabel { float: left; width: auto; } .pp_proplabel_sm { float: left; width: auto; } @@ -664,7 +562,6 @@ button.panel-button { -webkit-appearance: none; font-size: 9px; color: white; ba .properties_panel label { display: block; float: left; line-height: 12px; height: 16px; } -/* Style overrides/extensions for tabular layout classes within panels */ .panel .layout-cell { vertical-align: top; text-align: left; } #props_defaultids label, .panel .layout-table .layout-cell:first-child, .panel .layout-table.table-2col .layout-cell:first-child { width: 70px; text-align: right; margin-right: 7px; } @@ -675,7 +572,6 @@ button.panel-button { -webkit-appearance: none; font-size: 9px; color: white; ba .panel .layout-table.table-2col-wide .layout-cell { width: 50%; } -/* Slider properties */ .slider_props .layout-table.table-2col-wide .layout-cell:first-child, .button_props .layout-table.table-2col-wide .layout-cell:first-child, .hottext_props .layout-table.table-2col-wide .layout-cell:first-child, .imagecont_props .layout-table.table-2col-wide .layout-cell:first-child, .toggle_props .layout-table.table-2col-wide .layout-cell:first-child, .image_props .layout-table.table-2col-wide .layout-cell:first-child { width: 100%; } .image_props .layout-table.table-2col-wide .layout-cell:first-child { width: 200%; } @@ -698,16 +594,12 @@ button.panel-button { -webkit-appearance: none; font-size: 9px; color: white; ba .properties_panel .layout-table { position: relative; margin-bottom: 10px; } -/* Begin: Styles for DivPIProperties */ .pp_colorpicker { width: 35px; height: 20px; overflow: hidden; text-indent: -9999px; padding: 0px 0px 0px 0px; display: block; float: left; cursor: pointer; background-color: #333; border: solid 1px #000; } .pp_strokelabel { border: none; margin: -1px 8px 0px 27px; } .pp_filllabel { border-width: none; margin: -1px 8px 0px 34px; } -/* End Styles for DivPIProperties */ -/* End: Properties Panel styles */ -/* New Panel Layout Stuff */ .panels { display: -webkit-box; position: absolute; -webkit-box-orient: vertical; -webkit-box-align: stretch; height: 100%; width: 100%; } .panel .resizeBar { height: 4px; cursor: row-resize; } @@ -754,7 +646,6 @@ button.panel-button { -webkit-appearance: none; font-size: 9px; color: white; ba .over { border-top: 1px solid #0000FF; } -/* MenuUI.scss Styles governing the main dropdown menu. Note that colors and font definitions go in _scss/themes/themename/_colors.scss and _scss/themes/themename/_fonts.scss */ .menuBar { width: 100%; border-style: solid; border-width: 1px; height: 22px; color: white; background: #474747; border-color: black; } .menuBar ul { list-style: none; margin: 0; padding: 0; float: left; cursor: default; } @@ -767,9 +658,7 @@ button.panel-button { -webkit-appearance: none; font-size: 9px; color: white; ba .menuBar li:active { background: #b57a0a; } -/*Styles for positioning and display -Supports fly-out of sub-menus two levels deep only */ -.menuBar ul ul { position: absolute; z-index: 500; } +Supports fly-out of sub-menus two levels deep only .menuBar ul ul { position: absolute; z-index: 500; } .menuBar ul ul ul { position: absolute; top: 0; left: 100%; } @@ -777,19 +666,17 @@ 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; } -/* Tools.scss For individual tool styles in the toolbar, see toolbar.scss. Note that colors and font definitions go in _scss/themes/themename/_colors.scss and _scss/themes/themename/_fonts.scss */ -/*Made changes to toolButton */ .toolButton { width: 26px; height: 23px; padding: 0px; margin: 1px; border-width: 1px; border-style: solid; } .subToolButton { float: left; } -.subOption { float: left; /*margin:10px;*/ margin-top: 5px; margin-left: 10px; margin-right: 10px; } +.subOption { float: left; margin-top: 5px; margin-left: 10px; margin-right: 10px; } .toolButton:active { border-top-width: 1px; border-top-style: solid; border-left-width: 1px; border-left-style: solid; } .toolButtonSelected { border-top-width: 1px; border-top-style: solid; border-left-width: 1px; border-left-style: solid; } -.toolSeparator { height: 1px; width: 30px; /*margin-left: 3px;*/ /*margin-right: 3px;*/ } +.toolSeparator { height: 1px; width: 30px; } .toolSeparatorTop { margin-top: 3px; margin-bottom: 0px; } @@ -803,14 +690,13 @@ nav.menuBar ul li:hover ul, nav.menuBar ul ul li:hover ul, nav.menuBar ul ul ul .drawingMode { outline: blue solid thin; } -/* Added new styling Sub Tool Shape Options*/ -.textBox { padding-top: 3px; min-width: 10em; /*height:14px;*/ margin-left: 5px; position: relative; margin-top: 0px; } +.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; /*-webkit-border-radius: 0;*/ border: 1px solid black; color: white; outline: none; } +.selectBox { width: 10em; opacity: 0.9; margin-left: 10px; float: left; display: block; background-color: #666666; border: 1px solid black; color: white; outline: none; } .selectBox:hover, .selectBox:active { background-color: #dddddd; opacity: 1; color: black; } -.label { padding-top: 3px; margin-left: 10px; font-size: 12px; /*display:inline;*/ /*line-height:10px;*/ float: left; margin-right: 5px; } +.label { padding-top: 3px; margin-left: 10px; font-size: 12px; float: left; margin-right: 5px; } .subToolPropertiespanel { margin-left: 43px; } @@ -830,25 +716,23 @@ nav.menuBar ul li:hover ul, nav.menuBar ul ul li:hover ul, nav.menuBar ul ul ul .cornerRadius.bottomRight { margin-top: 3px; -webkit-transform: rotate(180deg); margin-right: -2px; } -#toolOptionsContainer { display: inline; float: left; /*margin-left: 20px;*/ } +#toolOptionsContainer { display: inline; float: left; } .leftLabel { margin-top: 3px; float: left; } -/* Skin Radio Buttons */ input[type="radio"] { -webkit-appearance: none; background: black; width: 28px; height: 24px; vertical-align: middle; border-width: 1px; border-style: solid; border-color: #282828; font-size: 10px; color: #c8c8c8; margin: 4px; } input[type="radio"]:hover { border-width: 1px; border-style: solid; } input[type="radio"]:checked { background: #282828; border-width: 1px; border-style: solid; } -/*disabled settings for checkbox and radiobutton*/ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1px; border-style: solid; } .toolPropertiesContainer { float: left; margin-left: 10%; width: 100%; } .optionButtons { padding: 2px; margin: 1px 4px; float: left; } -.checkBoxLabel { /*margin-top:0.5em;*/ /*margin-left:-5em;*/ padding-top: 3px; font-size: 12px; float: left; margin-right: 5px; } +.checkBoxLabel { padding-top: 3px; font-size: 12px; float: left; margin-right: 5px; } .customTextBox { float: right; margin-left: 2em; margin-right: 4em; margin-top: 3px; height: 15px; } @@ -856,7 +740,7 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1 .toolButtonColor:active { background: #b2b2b2; } -.toolButtonSelectedColor { border-top-color: #595959; border-left-color: #595959; /* background: $color-tool-bg-active;*/ } +.toolButtonSelectedColor { border-top-color: #595959; border-left-color: #595959; } .toolSeparatorTopColor { background: #232323; } @@ -874,7 +758,6 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1 .optionLabel { margin-top: 5px; } -/* Begin: styles for tag toolbar */ #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; } #tagToolContainer input.tag-type { background-image: url("../images/tools/sprite-toolbar-tag.png"); } @@ -929,9 +812,6 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1 #zoomToolOptionHolder input.zoom-option { background: none; } -/* Endi: styles for tag toolbar */ -/* toolbar.scss Styles governing the individual tools. Note that colors and font definitions go in _scss/themes/themename/_colors.scss and _scss/themes/themename/_fonts.scss */ -/* New Tool List CSS */ .SelectionToolPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -360px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 1; } .SelectionToolUnpressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -390px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; } @@ -1016,7 +896,6 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1 .InkBottleToolUnpressed { background-image: url("../images/tools/inkbottle_down.png"); background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; } -/* Selection Tool Options */ .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; } @@ -1047,35 +926,26 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1 .blueDiv { background: blue; opacity: 0.2; } -/* Begin: Scroll Bar skinning */ ::-webkit-scrollbar { width: 11px; height: 11px; } -/* Turn off single button up on top, and down on bottom */ -::-webkit-scrollbar-button:start:decrement, ::-webkit-scrollbar-button:end:increment { display: none; /*we have these off by default */ } +::-webkit-scrollbar-button:start:decrement, ::-webkit-scrollbar-button:end:increment { display: none; } -/* Turn off the down area up on top, and up area on bottom */ ::-webkit-scrollbar-button:vertical:start:increment, ::-webkit-scrollbar-button:vertical:end:decrement { display: none; } -/* Turn off the down area up on top, and up area on bottom */ ::-webkit-scrollbar-button:horizontal:start:increment, ::-webkit-scrollbar-button:horizontal:end:decrement { display: none; } ::-webkit-scrollbar-track:vertical { background-color: black; } ::-webkit-scrollbar-track:horizontal { background-color: black; } -/* Track area above thumb and below up button */ ::-webkit-scrollbar-track-piece:vertical:start { background-color: transparent; } -/* Track area left of thumb and right of button */ ::-webkit-scrollbar-track-piece:horizontal:start { background-color: transparent; } -/* Track area below thumb and down button */ ::-webkit-scrollbar-track-piece:vertical:end { background-color: transparent; } -/* Track area right of thumb and left of button */ ::-webkit-scrollbar-track-piece:horizontal:end { background-color: transparent; } -/* The thumb itself */ ::-webkit-scrollbar-thumb:vertical { border-color: black; border-style: solid; border-width: 2px; -webkit-border-radius: 6px; background: -webkit-gradient(linear, left top, right top, color-stop(0.16, #8c8c8c), color-stop(0.49, #adadad), color-stop(0.82, #8c8c8c)); } ::-webkit-scrollbar-thumb:vertical:hover { border-color: black; border-style: solid; border-width: 2px; -webkit-border-radius: 6px; background: -webkit-gradient(linear, left top, right top, color-stop(0.1, #bebebe), color-stop(0.5, white), color-stop(0.9, #bebebe)); } @@ -1084,8 +954,7 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1 ::-webkit-scrollbar-thumb:horizontal:hover { border-color: black; border-style: solid; border-width: 2px; -webkit-border-radius: 6px; background: -webkit-gradient(linear, left top, left bottom, color-stop(0.16, #bebebe), color-stop(0.49, white), color-stop(0.82, #bebebe)); } -::-webkit-scrollbar-corner { /*background-color: black;*/ /* For some reason this is the only way I can find to not show the corner. Setting the ::-webkit-scrollbar-corner:disabled style doesn't work as that pseudo-class seems to be ignored. John Mayhew -*/ background-color: black; } +::-webkit-scrollbar-corner { background-color: black; } ::-webkit-scrollbar-corner:window-inactive { background-color: black; } @@ -1093,35 +962,24 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1 ::-webkit-resizer:window-inactive { background-image: url("../images/scrollbars/scrollbar_resizer.png"); background-repeat: no-repeat; } -/* disabled state */ ::-webkit-scrollbar-track:disabled { display: none; } -/* These don't seem to be necessary or in some cases, they just seem to be ignored -:-webkit-scrollbar-track:vertical:disabled { display: none; -} +:-webkit-scrollbar-track:vertical:disabled { display: none; } + +::-webkit-scrollbar-track:horizontal:disabled { display: none; } -::-webkit-scrollbar-track:horizontal:disabled { display: none; -} +::-webkit-scrollbar-track-piece:disabled { display: none; } -::-webkit-scrollbar-track-piece:disabled { display: none; -} +::-webkit-scrollbar-button:disabled { display: none; } -::-webkit-scrollbar-button:disabled { display: none; -} +::-webkit-scrollbar-corner:disabled { display: none; } -::-webkit-scrollbar-corner:disabled { display: none; -} +::-webkit-resizer:disabled { display: none; } -::-webkit-resizer:disabled { display: none; -} -*/ -/* End: Scroll Bar Skinning */ -/* Begin: Styles for the Tree component */ .tree { -webkit-user-select: none; cursor: default; float: left; padding-left: 0; color: white; } .tree li { -webkit-margin-before: 0px; -webkit-margin-after: 0px; list-style-type: none; } .tree li > text > img { margin-right: 8px; -webkit-transition: -webkit-transform 0.05s linear; } -/* End: styles for the Tree component */ /*77*/ -- cgit v1.2.3 From 6890662caba94598675679f40dbb725301c93e98 Mon Sep 17 00:00:00 2001 From: Ananya Sen Date: Thu, 2 Feb 2012 17:45:22 -0800 Subject: integrated new file dialog with the template descriptor.json and document-controller.js Signed-off-by: Ananya Sen --- css/ninja.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'css') diff --git a/css/ninja.css b/css/ninja.css index bf71955f..84600f12 100755 --- a/css/ninja.css +++ b/css/ninja.css @@ -72,7 +72,7 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co #appWorkspace { display: -webkit-box; -webkit-box-orient: horizontal; -webkit-box-pack: center; -webkit-box-align: center; -webkit-box-sizing: stretch; position: relative; padding: 2px 0px; border: 1px solid #333; overflow: hidden; } -#topMenu { background-color: #474747; position: absolute; height: 28px; width: 100%; top: 0px; left: 0px; z-index: 9999; } +#topMenu { background-color: #474747; position: absolute; height: 28px; width: 100%; top: 0px; left: 0px; z-index: 6995; } #topPanelContainer, #leftPanelContainer, #rightPanelContainer, #bottomPanelContainer { background-color: #282828; } -- cgit v1.2.3 From 2082fa6912eec2ffabd2081b7706e8e1b88a9711 Mon Sep 17 00:00:00 2001 From: Armen Kesablyan Date: Thu, 2 Feb 2012 19:03:59 -0800 Subject: Initial Text Tool Implementation Has rich-text-editor in place need to place with finalized version when complete --- css/ninja.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'css') diff --git a/css/ninja.css b/css/ninja.css index 2fcb1380..7bc4c80e 100644 --- a/css/ninja.css +++ b/css/ninja.css @@ -271,6 +271,10 @@ background: transparent; #mainContent .CodeMirror-scroll { height: 100%; overflow: scroll; overflow-x: auto; overflow-y: auto; } +.montage-editor-frame { position: absolute; z-index: 7; top: 0; left: 0; display: none; -webkit-user-select: initial; } + +.montage-editor { padding: 0px; word-wrap: normal; } + /* PanelUI.scss Styles governing the panels in the UI. Note that colors and font definitions go in _scss/themes/themename/_colors.scss and _scss/themes/themename/_fonts.scss */ /* layout for the container of all panels within a dock area */ .panelContainer { margin: 0px; padding: 0px 0px; position: relative; /* -- cgit v1.2.3 From bda8dd9fcbf98cfd7c93d48565f0d6c74e392a62 Mon Sep 17 00:00:00 2001 From: Jonathan Duran Date: Mon, 6 Feb 2012 13:47:13 -0800 Subject: CSS for timeline Signed-off-by: Jonathan Duran --- css/ninja.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'css') diff --git a/css/ninja.css b/css/ninja.css index 8ce60a10..d013d9b5 100644 --- a/css/ninja.css +++ b/css/ninja.css @@ -236,7 +236,7 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co #toolPropertiesPanel { height: 32px; margin: 0px; } -#timelinePanel { height: 116px; } +#timelinePanel { height: 100%; } .treeComponent { -webkit-user-select: none; font-size: 11px; margin-left: 20px; cursor: default; color: white; } -- cgit v1.2.3 From 151b895d743b7e662fdb13c83051a3127fc952de Mon Sep 17 00:00:00 2001 From: Jonathan Duran Date: Mon, 6 Feb 2012 21:01:39 -0800 Subject: Fix Timeline height so it appears correctly on load Signed-off-by: Jonathan Duran --- css/ninja.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'css') diff --git a/css/ninja.css b/css/ninja.css index d013d9b5..6a503373 100644 --- a/css/ninja.css +++ b/css/ninja.css @@ -80,7 +80,7 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co #topPanelContainer { overflow: hidden; margin-bottom: 2px; height: 32px; } -#bottomPanelContainer { background: transparent; min-height: 80px; max-height: 50%; overflow: auto; } +#bottomPanelContainer { background: transparent; height: 150px; min-height: 80px; max-height: 50%; overflow: auto; } .panelContainer { display: block; -webkit-box-orient: vertical; position: relative; } -- cgit v1.2.3 From fc7638f3921595f9a0cb0bd1687caf5451a7dd4d Mon Sep 17 00:00:00 2001 From: Jonathan Duran Date: Wed, 8 Feb 2012 22:00:51 -0800 Subject: Squashed commit of the following: commit 35ad4d6d2fac4432046141c63c0209cf3d00be5c Merge: 76377d5 88e80d5 Author: Valerio Virgillito Date: Wed Feb 8 20:40:50 2012 -0800 Merge pull request #24 from mencio/pi_bugs Pi bugs commit 88e80d512bdd125e6d604541c291f699bf5df564 Author: Valerio Virgillito Date: Wed Feb 8 17:49:02 2012 -0800 Correcting the PI lock for height which had a bug in the original pull request. Signed-off-by: Valerio Virgillito commit 76377d5378c7c23fd3c267fcab91aba39b30c555 Author: Valerio Virgillito Date: Wed Feb 8 17:24:46 2012 -0800 Updating the sass file. Signed-off-by: Valerio Virgillito commit 4ecdc52d3beb3224048726a373d454e1607ba10b Merge: 0537f8f 3a8dc41 Author: Valerio Virgillito Date: Wed Feb 8 17:20:36 2012 -0800 Merge pull request #27 from ericguzman/TreeComponents Tree Components - css fixes commit 3a8dc4195a166478695bb286493f83258a4be49b Author: Eric Guzman Date: Wed Feb 8 16:55:10 2012 -0800 Tree Components - css fixes commit 0537f8f29e7b8dd48fd08f20b1533fbe92a54c4b Merge: ab12be4 b6bc8b0 Author: mayhewinator Date: Wed Feb 8 14:46:17 2012 -0800 Merge pull request #25 from mayhewinator/WorkingBranch Adding assets required to be a packaged chrome app commit b6bc8b0bb91382991e6e43ad341304c813124882 Merge: c7b5edf ab12be4 Author: John Mayhew Date: Wed Feb 8 14:39:16 2012 -0800 Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch commit c7b5edf0351d678d26b17eb5e2f995a140e209bb Author: John Mayhew Date: Wed Feb 8 14:38:25 2012 -0800 Added manifest.json, and image file required for being a packaged chrome application. Removed the old versions.json and updated the main page to detect if it is running as a chrome app and retrieve the version info from the chrome.app object. If the app is running hosted, the code will use an XHR to load the manifest.json and retrieve the version number from it directly. commit 26c470085263ab40a30fc8095bfe3763df5be981 Merge: cd997c1 ab12be4 Author: Valerio Virgillito Date: Wed Feb 8 14:34:01 2012 -0800 Merge branch 'refs/heads/master' into pi_bugs commit cd997c18bdb346ff44919880239e705df80079ea Author: Valerio Virgillito Date: Wed Feb 8 14:30:56 2012 -0800 Fix for the PI Lock button. Fixing the following JIRA bugs: 111 Signed-off-by: Valerio Virgillito commit ab12be4e9a0d9fee4450795077b0107983b5682e Merge: 10cdeb5 2e58595 Author: Valerio Virgillito Date: Wed Feb 8 14:03:36 2012 -0800 Merge pull request #23 from joseeight/SCSS Changing _scss folder to scss commit 2e58595d5c58ad9937bfc4f85ba8894970d4719f Author: Jose Antonio Marquez Date: Wed Feb 8 13:56:54 2012 -0800 adding new scss folder commit 7afa8f3fb2f2cede0b227a00ccc2b84267278db6 Author: Jose Antonio Marquez Date: Wed Feb 8 13:54:42 2012 -0800 delete _scss directory commit 10cdeb52403f16d5d4be43a516e8cdfbc866a2a2 Merge: 24f9717 9a404b8 Author: Valerio Virgillito Date: Wed Feb 8 11:33:42 2012 -0800 Merge pull request #21 from mencio/pi_bugs Pi bugs fixes for 964, 616, 1084 commit 24f9717f2714f0497382436c4602736283247cf1 Merge: 763910b 9154cff Author: Valerio Virgillito Date: Wed Feb 8 11:33:22 2012 -0800 Merge pull request #22 from ericguzman/StylesControllerUpdates Styles Controller - Added array of dirty stylesheets and event dispatch ... commit 9154cff2ce10aae54d9a7bd37a9d8b5578b0e297 Author: Eric Guzman Date: Wed Feb 8 10:39:17 2012 -0800 Styles Controller - Added array of dirty stylesheets and event dispatch when a sheet is dirtied. commit 763910b9d074137eb7dee80447b89407ce5750c9 Merge: e557937 329a859 Author: Valerio Virgillito Date: Wed Feb 8 10:18:36 2012 -0800 Merge pull request #20 from mqg734/ToolFixes Hooked up materials code to go through the ShapesController and updated the PI to reflect the currently selected shape's materials. Also fixed the following bugs: commit e5579374ff39b80b8c0c69faba37f6f581758fe0 Author: Valerio Virgillito Date: Tue Feb 7 13:28:17 2012 -0800 updated montage v.0.6 to the latest changes. Signed-off-by: Valerio Virgillito commit 9a404b8a717d0aac0eabb828a4d3cdc8c9c3eed8 Author: Valerio Virgillito Date: Tue Feb 7 17:42:04 2012 -0800 IKNINJA - 1084: Fixing the custom tag. Signed-off-by: Valerio Virgillito commit a930295dfebd7fe7b4db5324b2048e6e7366c6d8 Author: Valerio Virgillito Date: Tue Feb 7 16:12:23 2012 -0800 IKNINJA-616 - Drag and drop images fix for the PI and source Signed-off-by: Valerio Virgillito commit 329a859e2666716c3a1d99c6bd2679e10c81fc8d Author: Nivesh Rajbhandari Date: Tue Feb 7 15:25:11 2012 -0800 Added ability to toggle combobox's visibility so we can show/hide materials comboboxes in the tool options. Signed-off-by: Nivesh Rajbhandari commit 65145cebdf4cde2767cbd0489ddcea5863c2ca9e Author: Valerio Virgillito Date: Tue Feb 7 14:53:46 2012 -0800 IKNINJA-964 - Fixed inconsistent element name in PI/CSS panel. Signed-off-by: Valerio Virgillito commit 668510892537eaaeb2e11520831d87b44b2489b7 Merge: 8950b34 c066fb4 Author: Valerio Virgillito Date: Tue Feb 7 14:19:22 2012 -0800 Merge pull request #19 from ericguzman/TreeComponents Tree Components - Added copyright comments commit aec849d91e4b697d496b9ede28b5d89cf2283781 Author: Nivesh Rajbhandari Date: Tue Feb 7 14:18:13 2012 -0800 id's must start with a letter, so our workaround for using uuid for RDGE canvas id's won't work because they often start with a number. Signed-off-by: Nivesh Rajbhandari commit e8e21367e59bb521801fe2e843f42ad5bca5ea9f Author: Nivesh Rajbhandari Date: Tue Feb 7 13:52:54 2012 -0800 Fixing some typos and undeclared variables in GLRectangle and ShapesController. Signed-off-by: Nivesh Rajbhandari commit c066fb41ebee85bacf9b2155366b16831af41d76 Author: Eric Guzman Date: Tue Feb 7 13:46:05 2012 -0800 Tree Components - Added copyright comments commit 3a8875c288049b466bfeb8b7f0510fd8cbfb970d Author: Nivesh Rajbhandari Date: Tue Feb 7 13:30:08 2012 -0800 Supporting switching materials in the PI. Also, moved makeFillMaterial and makeStrokeMaterial functions into GLGeomObj so shapes other than GLRectangle can use these routines. Signed-off-by: Nivesh Rajbhandari commit 8ad767b61460984a4031ba630f76ac8247a61857 Author: Nivesh Rajbhandari Date: Tue Feb 7 11:42:10 2012 -0800 Fixed PI to support WebGL materials. Signed-off-by: Nivesh Rajbhandari commit 486842239c71e7964f38a09aacda4970f2a82e1a Author: Nivesh Rajbhandari Date: Tue Feb 7 10:58:14 2012 -0800 Updated tools and PI to get/set materials by binding to appModel's materials property. This requires us to add FlatMaterial to the list of materials in the MaterialsLibrary. Signed-off-by: Nivesh Rajbhandari commit 789eaf5a92c903f27462c69a8890fbec695ab14e Merge: 92ae17b 8950b34 Author: Nivesh Rajbhandari Date: Tue Feb 7 09:36:29 2012 -0800 Merge branch 'refs/heads/ninja-internal' into ToolFixes commit 92ae17bc800cf82cdbd1482ef1af1a5fd7bd632a Author: Nivesh Rajbhandari Date: Mon Feb 6 16:35:12 2012 -0800 Force layout canvas and SelectionController to update their info when a 2d canvas is replaced by a 3d canvas (and vice-versa). Signed-off-by: Nivesh Rajbhandari commit 75486be2839494c9b54833aff8f5eef3f9542151 Author: Nivesh Rajbhandari Date: Mon Feb 6 15:41:48 2012 -0800 Support toggling between 2d and 3d canvas context. This requires us to create a new canvas with all the same values as the canvas being replaced and copying over all the shape data. Signed-off-by: Nivesh Rajbhandari commit f94b0c5ada403379b3ff8a900c2a2aabcecce49e Author: Nivesh Rajbhandari Date: Mon Feb 6 14:03:40 2012 -0800 Add enabled property for ComboBox to support enabling/disabling materials dropdowns in the PI. Signed-off-by: Nivesh Rajbhandari commit 5737864d1d55d96e3cc3c1bc9b38ec58303b3981 Author: Nivesh Rajbhandari Date: Mon Feb 6 13:35:30 2012 -0800 Allow users to switch between 2d and webGL mode. Note that this doesn't currently work. Signed-off-by: Nivesh Rajbhandari commit 486d9a31a85dd833a1c798049a00403756703034 Author: Nivesh Rajbhandari Date: Mon Feb 6 11:35:49 2012 -0800 Support use WebGL checkbox in the PI. Signed-off-by: Nivesh Rajbhandari Signed-off-by: Jonathan Duran --- css/ninja.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'css') diff --git a/css/ninja.css b/css/ninja.css index 6a503373..5a25cc84 100644 --- a/css/ninja.css +++ b/css/ninja.css @@ -408,7 +408,7 @@ span.pp-span-all:focus { -webkit-box-shadow: none; background-color: #b4b4b4; bo #pp-container-list li, #pp-container-list span.span-space { background-repeat: no-repeat; } -#pp-container-list li.directory.open > span.pp-span-all > span.pp-col-files > span.span-space { background-image: url("../images/panels/project-panel/icon-file-folderopen.png"); background-position: 100% 0px; } +#pp-container-list li.directory.open > span.pp-span-all > span.pp-col-files > span.span-space, .branch-label { background-image: url("../images/panels/project-panel/icon-file-folderopen.png"); background-position: 100% 0px; } #pp-container-list li.directory.closed > span.pp-span-all > span.pp-col-files > span.span-space { background-image: url("../images/panels/project-panel/icon-file-folderclosed.png"); background-position: 100% 0px; } -- cgit v1.2.3 From f0a833b589cd3bcd3ba26037070c06e945ef6e29 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Thu, 9 Feb 2012 16:37:52 -0800 Subject: Removing the un-used context menu style Signed-off-by: Valerio Virgillito --- css/ninja.css | 2 -- 1 file changed, 2 deletions(-) (limited to 'css') diff --git a/css/ninja.css b/css/ninja.css index ba434f42..d81ea5b1 100644 --- a/css/ninja.css +++ b/css/ninja.css @@ -164,8 +164,6 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co #rightPanelContent { overflow-y: hidden; } -.contextMenu { position: absolute; z-index: 999; } - #openDocumentsTabComponent { height: 25px; position: relative; overflow: hidden; color: white; } #openDocuments { float: left; height: 25px; width: 100%; font-size: 12px; list-style: none; margin: 0; padding: 0; position: relative; text-decoration: none; } -- cgit v1.2.3 From ce963d45cdf2703d2d4eedfa94394b178f86e0f1 Mon Sep 17 00:00:00 2001 From: Armen Kesablyan Date: Thu, 9 Feb 2012 17:11:38 -0800 Subject: More Text Tool Updates --- css/ninja.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'css') diff --git a/css/ninja.css b/css/ninja.css index 8ce60a10..3776b1d5 100644 --- a/css/ninja.css +++ b/css/ninja.css @@ -36,7 +36,7 @@ input[type="search"].nj-skinned::-webkit-search-cancel-button:after { content: " button.nj-skinned { font-size: 9px; cursor: pointer; display: block; border: 0px; margin: 0px; padding: 4px; border: 1px #313131 solid; background-color: #474747; background-image: -webkit-linear-gradient(top, #505050 0%, #3c3c3c 100%); border-radius: 4px; color: white; text-transform: uppercase; cursor: pointer; text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5); } -button.nj-skinned:active { background-image: -webkit-linear-gradient(top, #3c3c3c 0%, #505050 100%); } +button.nj-skinned:active, button.nj-skinned.active { background-image: -webkit-linear-gradient(top, #3c3c3c 0%, #505050 100%); } button.nj-skinned:hover { -webkit-box-shadow: 0px 0px 3px #b4b4b4; } @@ -212,6 +212,10 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co #mainContent .CodeMirror-scroll { height: 100%; overflow: scroll; overflow-x: auto; overflow-y: auto; } +.montage-editor-frame { position: absolute; z-index: 7; top: 0; left: 0; display: none; -webkit-user-select: initial; } + +.montage-editor { padding: 0px; word-wrap: normal; } + .panelContainer { margin: 0px; padding: 0px 0px; position: relative; overflow: auto; } .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; } -- cgit v1.2.3 From c6b02b723ae0ea7faab1506faf3415093b66036f Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Mon, 13 Feb 2012 17:46:20 -0800 Subject: Adding a montage override sass file. Overriding the default css for montage popups. Signed-off-by: Valerio Virgillito --- css/ninja.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'css') diff --git a/css/ninja.css b/css/ninja.css index 54a4bbf1..934bd60b 100644 --- a/css/ninja.css +++ b/css/ninja.css @@ -986,4 +986,8 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1 .tree li > text > img { margin-right: 8px; -webkit-transition: -webkit-transform 0.05s linear; } +.montage-modal { border: 0px; } + +.montage-popup-container { background: none; } + /*77*/ -- cgit v1.2.3 From 68ce64a5a2f4a71b54d33916aaf1d57161302425 Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Tue, 14 Feb 2012 20:48:40 -0800 Subject: Reverting text/html document classes and setting up MVC folder structure Setting up the folder structure for the proposed set up for documents in Ninja. Reverted to have a temp HTML/Text document class. Tweak some UI for file pickers. --- css/ninja.css | 2 ++ 1 file changed, 2 insertions(+) (limited to 'css') diff --git a/css/ninja.css b/css/ninja.css index d22cfc22..0be30434 100755 --- a/css/ninja.css +++ b/css/ninja.css @@ -174,6 +174,8 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co #documentBar { height: 25px; width: 1000px; position: relative; overflow: hidden; color: white; } +.montage-popup-modal-mask { opacity: 1; background: -webkit-radial-gradient(center, ellipse cover, rgba(0, 0, 0, 0.65) 0%, rgba(0, 0, 0, 0.8) 80%); } + #middleDocArea { -webkit-box-orient: horizontal; -moz-box-orient: horizontal; box-orient: horizontal; -moz-box-flex: 1; -webkit-box-flex: 1; box-flex: 1; margin: 1px; margin-bottom: 3px; border-style: solid; border-width: 1px; } #mainStageIFrame { border: none; margin: 4px; } -- cgit v1.2.3 From bb4da39a73cbd6fbe83f3b7c9ed5ae60fe58dd6b Mon Sep 17 00:00:00 2001 From: Armen Kesablyan Date: Wed, 15 Feb 2012 14:23:19 -0800 Subject: Tool Icons : New layout Signed-off-by: Armen Kesablyan --- css/ninja.css | 179 ++++++++++++++++++++++++++++------------------------------ 1 file changed, 87 insertions(+), 92 deletions(-) (limited to 'css') diff --git a/css/ninja.css b/css/ninja.css index 934bd60b..20fa85f5 100644 --- a/css/ninja.css +++ b/css/ninja.css @@ -210,10 +210,6 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co #mainContent .CodeMirror-scroll { height: 100%; overflow: scroll; overflow-x: auto; overflow-y: auto; } -.montage-editor-frame { position: absolute; z-index: 7; top: 0; left: 0; display: none; -webkit-user-select: initial; } - -.montage-editor { padding: 0px; word-wrap: normal; } - .panelContainer { margin: 0px; padding: 0px 0px; position: relative; overflow: auto; } .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; } @@ -670,16 +666,10 @@ 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; } -.toolButton { width: 26px; height: 23px; padding: 0px; margin: 1px; border-width: 1px; border-style: solid; } - .subToolButton { float: left; } .subOption { float: left; margin-top: 5px; margin-left: 10px; margin-right: 10px; } -.toolButton:active { border-top-width: 1px; border-top-style: solid; border-left-width: 1px; border-left-style: solid; } - -.toolButtonSelected { border-top-width: 1px; border-top-style: solid; border-left-width: 1px; border-left-style: solid; } - .toolSeparator { height: 1px; width: 30px; } .toolSeparatorTop { margin-top: 3px; margin-bottom: 0px; } @@ -816,118 +806,123 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1 #zoomToolOptionHolder input.zoom-option { background: none; } -.SelectionToolPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -360px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 1; } - -.SelectionToolUnpressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -390px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; } - -.SubselectionToolPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -420px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 1; } - -.SubselectionToolUnpressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -450px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; } - -.RotateTool3DPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: 0px 0px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 1; } - -.RotateTool3DUnpressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -30px 0px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; } - -.Translate3DPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -120px 0px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 1; } - -.Translate3DUnpressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -150px 0px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; } - -.TagToolPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: 0px -54px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 1; } - -.TagToolUnpressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -30px -54px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; } - -.PenToolPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -180px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 1; } - -.PenToolUnpressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -210px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; } - -.TextToolPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -60px -54px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 1; } - -.TextToolUnpressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -90px -54px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; } - -.ShapeContainerPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -120px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 1; } - -.ShapeContainerUnpressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -150px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; } - -.OvalToolPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -120px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 1; } - -.OvalToolUnpressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -150px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; } - -.RectangleToolPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -300px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 1; } - -.RectangleToolUnpressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -330px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; } - -.LineToolPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -60px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 1; } - -.LineToolUnpressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -90px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; } - -.PencilToolPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -240px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 1; } - -.PencilToolUnpressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -270px -27px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; } - -.BrushToolPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -240px 0px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 1; } - -.BrushToolUnpressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -270px 0px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; } - -.FillToolPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -300px 0px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 1; } +#toolsPanelContent { width: 40px; } -.FillToolUnpressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-position: -330px 0px; background-repeat: no-repeat; height: 23px; width: 26px; opacity: 0.7; } +.toolsList { width: 30px; margin: auto; } -.EyedropperToolPressed { background-image: url("../images/SpriteSheets/NinjaSpriteSheet2_5.png"); background-