From 01e7e2448bc58698fb5808d141c1a8a5dfbdaaf7 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. --- _scss/compass_app_log.txt | 13 ++++ _scss/imports/scss/_Base.scss | 49 ++++++++------- _scss/imports/scss/_Components.scss | 4 +- _scss/imports/scss/_MainWindow.scss | 30 +++++----- _scss/imports/scss/_MenuUI.scss | 15 +++-- _scss/imports/scss/_PanelUI.scss | 99 +++++++++++++++---------------- _scss/imports/scss/_ScrollBars.scss | 42 ++++++------- _scss/imports/scss/_Stage.scss | 22 +++---- _scss/imports/scss/_Tools.scss | 48 +++++++-------- _scss/imports/scss/_ToolsSample.scss | 2 +- _scss/imports/scss/_mixins.scss | 10 ++-- _scss/imports/scss/_toolbar.scss | 18 +++--- _scss/imports/themes/default/_colors.scss | 65 ++++++++++---------- _scss/imports/themes/default/_fonts.scss | 5 -- _scss/imports/themes/default/_mixins.scss | 6 +- _scss/ninja.scss | 8 +-- 16 files changed, 221 insertions(+), 215 deletions(-) (limited to '_scss') diff --git a/_scss/compass_app_log.txt b/_scss/compass_app_log.txt index 6fe64a6f..00a7f071 100644 --- a/_scss/compass_app_log.txt +++ b/_scss/compass_app_log.txt @@ -93,3 +93,16 @@ 2012-01-20 15:16:38 overwrite ../css/ninja.css 2012-01-20 15:17:03 overwrite ../css/ninja.css 2012-01-20 15:17:39 overwrite ../css/ninja.css +2012-01-27 16:08:54 error ninja.scss (Line 26: Invalid CSS after "resize:": expected pseudoclass or pseudoelement, was "/* Base colors ...") +2012-01-27 16:08:54 overwrite ../css/ninja.css +2012-01-27 16:09:18 error ninja.scss (Line 26: Invalid CSS after "resize:": expected pseudoclass or pseudoelement, was "/* Base colors ...") +2012-01-27 16:09:18 overwrite ../css/ninja.css +2012-01-27 16:09:34 error ninja.scss (Line 93: Invalid CSS after " z-index:": expected pseudoclass or pseudoelement, was " 2;") +2012-01-27 16:09:34 overwrite ../css/ninja.css +2012-01-27 16:11:17 error ninja.scss (Line 20: Invalid CSS after "...nately it doesn": expected "{", was "'t seem to work...") +2012-01-27 16:11:17 overwrite ../css/ninja.css +2012-01-27 16:11:57 error ninja.scss (Line 106: Invalid CSS after "...how the corner.": expected class name, was "Setting the ::-...") +2012-01-27 16:11:57 overwrite ../css/ninja.css +2012-01-27 16:12:29 overwrite ../css/ninja.css +2012-01-27 16:13:46 overwrite ../css/ninja.css +2012-01-27 16:14:02 overwrite ../css/ninja.css diff --git a/_scss/imports/scss/_Base.scss b/_scss/imports/scss/_Base.scss index f9a1cfa3..75ccc07d 100644 --- a/_scss/imports/scss/_Base.scss +++ b/_scss/imports/scss/_Base.scss @@ -4,12 +4,12 @@ // (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. // -/* - * 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 - */ + +//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; @@ -42,8 +42,8 @@ float: right; } -/* Begin: Basic skinning for form fields */ -/* Reset all */ +// Begin: Basic skinning for form fields +// Reset all input.nj-skinned, textarea.nj-skinned, button.nj-skinned, @@ -54,7 +54,7 @@ button.nj-skinned { outline: none; } -/* Base styles */ +// Base styles input[type="text"].nj-skinned, input[type="password"].nj-skinned, input[type="search"].nj-skinned, @@ -68,7 +68,7 @@ select.nj-skinned option { font-family: 'Droid Sans', sans-serif; } -/* Disabled styles */ +// Disabled styles input.nj-skinned:disabled, textarea.nj-skinned:disabled, select.nj-skinned:disabled, @@ -76,7 +76,7 @@ button.nj-skinned:disabled { opacity: 0.4; } -/* Text inputs and select boxes */ +// Text inputs and select boxes input[type="text"].nj-skinned, input[type="password"].nj-skinned, input[type="search"].nj-skinned, @@ -84,7 +84,7 @@ 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, @@ -93,7 +93,7 @@ select.nj-skinned:focus, select.nj-skinned option:focus { -webkit-box-shadow: 0px 0px 3px $color-focus-outline; } -*/ + select.nj-skinned { background-image: url("../images/dropdown-bg.png"); @@ -118,13 +118,13 @@ input[type="search"].nj-skinned::-webkit-search-cancel-button:after { content:"\2716"; } -/* Buttons */ +// Buttons button.nj-skinned { font-size: 9px; cursor: pointer; } -/* Radio buttons */ +// Radio buttons input[type="radio"].nj-skinned { background-color: $color-menu-bg; background-image: -webkit-linear-gradient(top, $color-radio-gradient-top 0%, $color-radio-gradient-bottom 100%); @@ -143,15 +143,18 @@ input[type="radio"].nj-skinned { box-shadow: 0px 0px 2px $color-radio-shadow; } input[type="radio"].nj-skinned:checked { - background-image: -webkit-linear-gradient(top, $color-radio-gradient-top 0%, $color-radio-gradient-bottom 100%); + background: -webkit-radial-gradient(center, + circle cover, + $color-radio 0%, + $color-radio 15%, + $color-radio 30%, + $color-transparent 31%), + -webkit-linear-gradient(top, $color-radio-gradient-top 0%, $color-radio-gradient-bottom 100%); border: 2px solid $color-radio-border; } input[type="radio"].nj-skinned:hover { border: 2px solid $color-radio-border; } -input[type="radio"].nj-skinned:checked:after { - content:"\a0 \a0 \2022"; -} input[type="radio"].nj-skinned:active { background-image: -webkit-linear-gradient(top, $color-radio-gradient-bottom 0%, $color-radio-gradient-top 100%); } @@ -160,7 +163,7 @@ input[type="radio"].nj-skinned:disabled { border: 2px solid $color-radio-border; cursor: default; } -/* Checkboxes */ +// Checkboxes input[type="checkbox"].nj-skinned { background-color: $color-menu-bg; background-image: -webkit-linear-gradient(top, $color-radio-gradient-top 0%, $color-radio-gradient-bottom 100%); @@ -190,9 +193,9 @@ input[type="checkbox"].nj-skinned:disabled { background-image: -webkit-linear-gradient(top, $color-radio-gradient-top 0%, $color-radio-gradient-bottom 100%); cursor: default; } -/* End: Basic skinning for form fields */ +// End: Basic skinning for form fields -/* Begin: Basic skinning for visual dividers */ +// Begin: Basic skinning for visual dividers .nj-divider { background-color: $color-divider-second; border-width: 0px; @@ -208,4 +211,4 @@ input[type="checkbox"].nj-skinned:disabled { border-right: 1px solid $color-divider-third; width: 1px; } -/* End: Basic skinning for visual dividers */ +// End: Basic skinning for visual dividers diff --git a/_scss/imports/scss/_Components.scss b/_scss/imports/scss/_Components.scss index 2fda5afc..c4182c73 100644 --- a/_scss/imports/scss/_Components.scss +++ b/_scss/imports/scss/_Components.scss @@ -6,7 +6,7 @@ -/* Begin: Styles for the Tree component */ +// Begin: Styles for the Tree component .tree { @@ -30,4 +30,4 @@ -webkit-transition: -webkit-transform 0.05s linear; } -/* End: styles for the Tree component */ \ No newline at end of file +// End: styles for the Tree component \ No newline at end of file diff --git a/_scss/imports/scss/_MainWindow.scss b/_scss/imports/scss/_MainWindow.scss index 0807d894..23ace69b 100644 --- a/_scss/imports/scss/_MainWindow.scss +++ b/_scss/imports/scss/_MainWindow.scss @@ -4,12 +4,12 @@ // (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. // -/* - * 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 - */ + +// 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; @@ -83,9 +83,9 @@ } #bottomPanelContainer { - /*border: 1px solid #333; + //border: 1px solid #333; background: transparent; - */ + min-height:80px; max-height:50%; overflow:auto; @@ -200,14 +200,14 @@ } #mainContainer #rulerTop { - /* TODO: temporary background please replace when component is implemented */ + // TODO: temporary background please replace when component is implemented background: url("../images/temp/ruler-top.png"); height:15px; margin-bottom: 0px; } #rulerLeft { - /* TODO: temporary background please replace when component is implemented */ + // TODO: temporary background please replace when component is implemented background: url("../images/temp/ruler-left.png"); width:16px; } @@ -246,7 +246,7 @@ .resizeBar { -webkit-transition: all 0.15s linear; } -/* Splitters Collapsed */ +// Splitters Collapsed .panelContainer, .panelContainer.collapsed { -webkit-transition: all 0.15s ease-in; } .panel.disableTransition { -webkit-transition: none !important; -webkit-box-flex:0.1 !important; } .disableTransition { -webkit-transition: none !important; -webkit-box-flex:0 !important; } @@ -258,7 +258,7 @@ .topSplitter.collapsed { -webkit-transform:rotate(180deg); } .bottomSplitter.collapsed { -webkit-transform:rotate(0deg); } -/* +// .stageContentShadow { @@ -267,15 +267,15 @@ box-shadow: 3px 5px 4px $color-app-shadow; } -*/ -/* + +// .baseBox { display:-webkit-box; display:-moz-box; display: box; } -/* Generic style to make any element unselectable */ +// Generic style to make any element unselectable .unselectable { -webkit-user-select: none; } diff --git a/_scss/imports/scss/_MenuUI.scss b/_scss/imports/scss/_MenuUI.scss index e821e5cc..e1fb149a 100644 --- a/_scss/imports/scss/_MenuUI.scss +++ b/_scss/imports/scss/_MenuUI.scss @@ -4,12 +4,11 @@ // (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. // -/* - * 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 - */ +// 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; @@ -49,8 +48,8 @@ background : $color-menu-active-bg; } -/*Styles for positioning and display -Supports fly-out of sub-menus two levels deep only */ +// Styles for positioning and display +Supports fly-out of sub-menus two levels deep only .menuBar ul ul { position: absolute; diff --git a/_scss/imports/scss/_PanelUI.scss b/_scss/imports/scss/_PanelUI.scss index e72a1502..ac82adf8 100644 --- a/_scss/imports/scss/_PanelUI.scss +++ b/_scss/imports/scss/_PanelUI.scss @@ -4,24 +4,23 @@ // (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. // -/* - * 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 */ +// +// 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; */ + // 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; } -/* base layout style for all panels*/ +// base layout style for all panels .panelDisclosureIcon { background-image:url("../images/panels/panelDisclosureIcon.png"); @@ -40,7 +39,7 @@ } .panelCollapseArrowFill { - color: rgba(76,76,76,1); /* this is never really used but is set so we can get it via javascript to draw the control via script on the canvas */ + color: rgba(76,76,76,1); // 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; } @@ -87,11 +86,11 @@ padding-right:3px; width:32px; - /*This is a hack to get the tools panel to extend all the way to the bottom.*/ + // This is a hack to get the tools panel to extend all the way to the bottom. padding-bottom:450px; } -/* sizes for the specific panels */ +// sizes for the specific panels #toolPropertiesPanel { height: 32px; @@ -102,7 +101,7 @@ height: 116px; } -/* Only used by Animation Presets Panel currently */ +// Only used by Animation Presets Panel currently .treeComponent { @@ -119,7 +118,7 @@ list-style: none; } -/*This sets the style for a tree folder's icon*/ +// This sets the style for a tree folder's icon ul.treeComponent > img:first-child { margin-left: -35px; @@ -139,7 +138,7 @@ ul.treeComponent > img:first-child margin-left: -20px; padding-right:10px; vertical-align:middle; - /*border-bottom:1px solid #555555;*/ + // border-bottom:1px solid #555555; } .treeCategory @@ -153,8 +152,8 @@ ul.treeComponent > img:first-child color: $color-panel-text; } -/* ====== Used by Properties Panel ====== */ -/* Removed the outline text input style -> Causing problems with the Canvas */ +// ====== Used by Properties Panel ====== +// Removed the outline text input style -> Causing problems with the Canvas .propertiesPanel { @@ -210,7 +209,7 @@ ul.treeComponent > img:first-child background-color: $color-panel-shadow; } -/* ====== Indexed table row and column classes for Properties Panel layout ====== */ +// ====== Indexed table row and column classes for Properties Panel layout ====== .propRow1{ width:100%; } @@ -313,7 +312,7 @@ ul.treeComponent > img:first-child -/* Begin: Project Panel UI classes */ +// Begin: Project Panel UI classes .Project-Panel { height: 100%; } @@ -354,14 +353,14 @@ ul.treeComponent > img:first-child margin-bottom: 36px; } -/* +// #pp-container-list, #pp-container-assets { height: 310px; width: 100%; overflow: auto; } -*/ + .pp-scroll-main { display: block; @@ -388,12 +387,12 @@ ul.treeComponent > img:first-child #pp-view-assets { display: none; } -/* +// #pp-container-assets .pp-scroll-linked, #pp-container-list .pp-scroll-linked { width: 420px; } -*/ + .pp-header-container { position: relative; @@ -518,10 +517,10 @@ span.pp-span-all:focus { 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; @@ -559,7 +558,7 @@ span.pp-span-all:focus { color: $color-menu-bg; } -/* Icons! */ +// Icons! #pp-container-list li, #pp-container-list span.span-space { background-repeat: no-repeat; @@ -660,7 +659,7 @@ span.pp-span-all:focus { } -/* Buttons */ +// Buttons .pp-button, #pp-col-buttons .pp-button div { margin: 0px; @@ -748,7 +747,7 @@ div.pp-button.button-divider div { display: none; } -/* Hide and Show different types of assets */ +// Hide and Show different types of assets .pp-type-script, .pp-type-video, .pp-type-audio, @@ -777,7 +776,7 @@ div.pp-button.button-divider div { display: block; } -/* New file flyout */ +// New file flyout .pp-popup { position: absolute; top: -53px; @@ -796,7 +795,7 @@ div.pp-button.button-divider div { margin: 0px; padding: 0px; } -/* Search subwidget */ +// Search subwidget #pp-search { position: absolute; display: block; @@ -850,7 +849,7 @@ div.pp-button.button-divider div { } -/* Inline editor styling */ +// Inline editor styling #pp-container-assets input.inline-editor { height: 11px; width: 80%; @@ -862,7 +861,7 @@ div.pp-button.button-divider div { } -/* End: Tree component for Project Panel */ +// End: Tree component for Project Panel .subToolHolderPanel{ @@ -873,17 +872,17 @@ div.pp-button.button-divider div { margin-top:-6px } -/*.marginposition{*/ - /*margin-top:-26px*/ -/*}*/ -/* Begin: Properties Panel styles */ +// .marginposition{ + // margin-top:-26px +// } +// Begin: Properties Panel styles .properties_panel { overflow-x: hidden; color: $color-panel-text; } -/* Begin: styling the form elements */ +// Begin: styling the form elements .properties_panel select { -webkit-appearance: none; font-size: 9px; @@ -932,10 +931,10 @@ button.panel-button { background-color: $color-panel-input-bg; color: $color-panel-input; } -/* End: styling the form elements */ +// End: styling the form elements -/* main section styles */ +// main section styles .pp_sectionHeader{ font-size:12px; padding-left:37px; @@ -952,7 +951,7 @@ button.panel-button { margin-top: 5px; } -/* control groups */ +// control groups .pp_group{ width: 100%; clear: both; @@ -969,7 +968,7 @@ button.panel-button { left: 25px; } -/* controls */ +// controls .pp_proplabel{ float: left; width: auto; @@ -1004,7 +1003,7 @@ button.panel-button { line-height: 12px; height: 16px; } -/* Style overrides/extensions for tabular layout classes within panels */ +// Style overrides/extensions for tabular layout classes within panels .panel .layout-cell { vertical-align: top; text-align: left; @@ -1025,7 +1024,7 @@ button.panel-button { .panel .layout-table.table-2col-wide .layout-cell { width: 50%; } -/* Slider properties */ +// 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, @@ -1079,7 +1078,7 @@ button.panel-button { margin-bottom: 10px; } -/* Begin: Styles for DivPIProperties */ +// Begin: Styles for DivPIProperties .pp_colorpicker{ width: 35px; height: 20px; @@ -1100,13 +1099,13 @@ button.panel-button { border-width: none; margin: -1px 8px 0px 34px; } -/* End Styles for DivPIProperties */ +// End Styles for DivPIProperties -/* End: Properties Panel styles */ +// End: Properties Panel styles -/* New Panel Layout Stuff */ +// New Panel Layout Stuff .panels { display: -webkit-box; diff --git a/_scss/imports/scss/_ScrollBars.scss b/_scss/imports/scss/_ScrollBars.scss index 9066c3ff..1c2f30ea 100644 --- a/_scss/imports/scss/_ScrollBars.scss +++ b/_scss/imports/scss/_ScrollBars.scss @@ -4,25 +4,25 @@ // (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. // -/* Begin: Scroll Bar skinning */ +// Begin: Scroll Bar skinning ::-webkit-scrollbar { width: 11px; height: 11px; } -/* Turn off single button up on top, and down on bottom */ +// 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 */ + display: none; // we have these off by default } -/* Turn off the down area up on top, and up area on bottom */ +// 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 */ +// 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; @@ -36,27 +36,27 @@ background-color: $color-sb-border; } -/* Track area above thumb and below up button */ +// 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 */ +// 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 */ +// 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 */ +// Track area right of thumb and left of button ::-webkit-scrollbar-track-piece:horizontal:end { background-color: transparent; } -/* The thumb itself */ +// The thumb itself ::-webkit-scrollbar-thumb:vertical { border-color: $color-sb-border; border-style: solid; @@ -101,13 +101,13 @@ } ::-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; + + //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: $color-sb-border; } ::-webkit-scrollbar-corner:window-inactive { @@ -124,12 +124,12 @@ background-repeat: no-repeat; } -/* disabled state */ +// 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 +// These don't seem to be necessary or in some cases, they just seem to be ignored :-webkit-scrollbar-track:vertical:disabled { display: none; } @@ -153,6 +153,6 @@ ::-webkit-resizer:disabled { display: none; } -*/ -/* End: Scroll Bar Skinning */ + +// End: Scroll Bar Skinning diff --git a/_scss/imports/scss/_Stage.scss b/_scss/imports/scss/_Stage.scss index a992b793..7b7db576 100644 --- a/_scss/imports/scss/_Stage.scss +++ b/_scss/imports/scss/_Stage.scss @@ -21,12 +21,12 @@ border-width: 1px; } -/* Used for the Iframe Version +// Used for the Iframe Version #mainStageIFrame { border: none; margin: 4px; } -*/ + @@ -44,14 +44,14 @@ } #pasteBoard { - /*position: relative;*/ + // position: relative; top: 0px; left: 0px; margin: 0px; padding: 0px; border: none; - /*overflow: scroll;*/ + // overflow: scroll; } @@ -86,21 +86,21 @@ } #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 - */ + // 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;*/ + // height: 1000px; + // width: 2000px; position: absolute; margin: 0px; border: none; padding: 0px; top: 0px; left: 0px; - /*background-color: red;*/ + // background-color: red; } .global3DSettings { diff --git a/_scss/imports/scss/_Tools.scss b/_scss/imports/scss/_Tools.scss index 8614285f..935c4cd6 100644 --- a/_scss/imports/scss/_Tools.scss +++ b/_scss/imports/scss/_Tools.scss @@ -4,15 +4,15 @@ // (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. // -/* - * 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 - * - */ +// +// 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 */ +// Made changes to toolButton .toolButton { width:26px; @@ -33,7 +33,7 @@ .subOption{ float:left; - /*margin:10px;*/ + // margin:10px; margin-top: 5px; margin-left: 10px; margin-right: 10px; @@ -57,8 +57,8 @@ .toolSeparator { height:1px; width:30px; - /*margin-left: 3px;*/ - /*margin-right: 3px;*/ + // margin-left: 3px; + // margin-right: 3px; } .toolSeparatorTop { @@ -94,13 +94,13 @@ } -/* Added new styling Sub Tool Shape Options*/ +// Added new styling Sub Tool Shape Options .textBox { padding-top:3px; min-width:10em; - /*height:14px;*/ + // height:14px; margin-left:5px; position:relative; margin-top:0px; @@ -113,7 +113,7 @@ float:left; display:block; background-color: $color-tool-select-bg; - /*-webkit-border-radius: 0;*/ + // -webkit-border-radius: 0; border: 1px solid $color-tool-select-border; color:$color-tool-text; outline:none; @@ -129,8 +129,8 @@ padding-top:3px; margin-left:10px; font-size:12px; - /*display:inline;*/ - /*line-height:10px;*/ + // display:inline; + // line-height:10px; float:left; margin-right:5px; } @@ -201,7 +201,7 @@ { display:inline; float:left; - /*margin-left: 20px;*/ + // margin-left: 20px; } .leftLabel{ @@ -209,7 +209,7 @@ float:left; } -/* Skin Radio Buttons */ +// Skin Radio Buttons input[type="radio"] { -webkit-appearance: none; background: $color-radio-bg; @@ -236,7 +236,7 @@ input[type="radio"]:checked { border-style: solid; } -/*disabled settings for checkbox and radiobutton*/ +// disabled settings for checkbox and radiobutton input[type="radio"]:disabled { opacity: .3; background: $color-radio-border; @@ -258,8 +258,8 @@ input[type="radio"]:disabled { } .checkBoxLabel{ - /*margin-top:0.5em;*/ - /*margin-left:-5em;*/ + // margin-top:0.5em; + // margin-left:-5em; padding-top:3px; font-size:12px; float:left; @@ -286,7 +286,7 @@ input[type="radio"]:disabled { .toolButtonSelectedColor { border-top-color: $color-tool-border-selected; border-left-color: $color-tool-border-selected; - /* background: $color-tool-bg-active;*/ + // background: $color-tool-bg-active; } @@ -328,7 +328,7 @@ input[type="radio"]:disabled { @include marginTop(5px); } -/* Begin: styles for tag toolbar */ +// Begin: styles for tag toolbar #tagToolContainer input.tag-type, #rotateObjectToolContainer input.tag-type, #translateObjectToolContainer input.tag-type { @@ -484,4 +484,4 @@ input[type="radio"]:disabled { } -/* Endi: styles for tag toolbar */ \ No newline at end of file +// Endi: styles for tag toolbar \ No newline at end of file diff --git a/_scss/imports/scss/_ToolsSample.scss b/_scss/imports/scss/_ToolsSample.scss index 8c354f14..2e1da9a8 100644 --- a/_scss/imports/scss/_ToolsSample.scss +++ b/_scss/imports/scss/_ToolsSample.scss @@ -5,7 +5,7 @@ // (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. // -/*Image Sprinting */ +// Image Sprinting .ovalToolUp { background-image: url("../images/SpriteSheets/NinjaSpriteSheet.png"); background-repeat: no-repeat; diff --git a/_scss/imports/scss/_mixins.scss b/_scss/imports/scss/_mixins.scss index e654aecf..061262f7 100644 --- a/_scss/imports/scss/_mixins.scss +++ b/_scss/imports/scss/_mixins.scss @@ -4,11 +4,11 @@ // (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. // -/* - * mixins.scss - * Generic mixins. Theme-specific mixins (e.g. for sprites) - * should go in the theme/themename/mixins.scss file. - */ + +// mixins.scss +// Generic mixins. Theme-specific mixins (e.g. for sprites) +// should go in the theme/themename/mixins.scss file. + // Mixin to set the Opacity of an Element @mixin opacity($opacity){ diff --git a/_scss/imports/scss/_toolbar.scss b/_scss/imports/scss/_toolbar.scss index 64fb32de..048c1f88 100644 --- a/_scss/imports/scss/_toolbar.scss +++ b/_scss/imports/scss/_toolbar.scss @@ -4,14 +4,14 @@ // (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. // -/* - * 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 */ +// +// 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 { @include background-pos(12,1,26px,23px); @include opacity(1.0); @@ -219,7 +219,7 @@ opacity: 0.7; } -/* Selection Tool Options */ +// Selection Tool Options .topAlignUp { @include background-pos(8,2,26px,23px); diff --git a/_scss/imports/themes/default/_colors.scss b/_scss/imports/themes/default/_colors.scss index 2fbe7956..34d5ffc9 100644 --- a/_scss/imports/themes/default/_colors.scss +++ b/_scss/imports/themes/default/_colors.scss @@ -4,14 +4,13 @@ // (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. // -/* - * _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.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 */ + +// Colors for radio buttons and other form elements $color-radio-border: rgb(40,40,40); $color-radio-shadow: rgba(200,200,200,0.5); $color-radio-gradient-top: rgb(100,100,100); @@ -22,29 +21,29 @@ $color-input: rgb(255,255,255); $color-input-bg: rgb(68, 68, 68); $color-input-border: rgb(49, 49, 49); $color-focus-outline: rgb(180, 180, 180); +$color-transparent: rgba(0,0,0,0); -/* 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. - * - */ -$color-divider-first: rgb(35,35,35); /* top and left */ -$color-divider-second: rgb(0,0,0); /* Middle */ -$color-divider-third: rgb(58,58,58); /* Bottom and right */ +// 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. +// + +$color-divider-first: rgb(35,35,35); // top and left +$color-divider-second: rgb(0,0,0); // Middle +$color-divider-third: rgb(58,58,58); // Bottom and right -/* Main background color of entire app */ -$color-app-bg: rgb(0,0,0); /* Main app background color. */ -$color-app-bg-a1: rgba(0,0,0,1); /* rgba version */ -$color-app-border: rgb(51,51,51); /* Main app border color */ -$color-app-shadow: rgba(0,0,0,.5); /* color of drop shadows */ -$color-stage: rgb(128,128,128); /* Stage color */ -$color-body-border: rgb(0,0,0); /* body border color */ -$color-body-bg: rgb(255,255,255); /* Body background color */ +// Main background color of entire app +$color-app-bg: rgb(0,0,0); // Main app background color. +$color-app-bg-a1: rgba(0,0,0,1); // rgba version +$color-app-border: rgb(51,51,51); // Main app border color +$color-app-shadow: rgba(0,0,0,.5); // color of drop shadows +$color-stage: rgb(128,128,128); // Stage color +$color-body-border: rgb(0,0,0); // body border color +$color-body-bg: rgb(255,255,255); // Body background color -/* Colors for main dropdown menus: background & text for both regular and highlighted states, dividers */ +// Colors for main dropdown menus: background & text for both regular and highlighted states, dividers $color-menu-bg: rgb(71,71,71); $color-menu-text: rgb(255,255,255); $color-menu-hilite-bg: rgb(178,178,178); @@ -54,7 +53,7 @@ $color-menu-border: rgb(0,0,0); $color-menu-active-bg: rgb(181,122,10); -/* Colors for tools: background, text, how they interact with the UI */ +// Colors for tools: background, text, how they interact with the UI $color-tool-bg: rgb(41,41,41); $color-tool-bg-active: rgb(178,178,178); $color-tool-border-selected: rgb(89,89,89); @@ -69,15 +68,15 @@ $color-tool-select-border: rgb(0,0,0); $color-tool-select-hover-bg: rgb(221,221,221); -/* Colors for panels: background & text, both regular and highlighted states, dividers, borders, shadows, etc. */ +// Colors for panels: background & text, both regular and highlighted states, dividers, borders, shadows, etc. $color-panel-bg: $color-menu-bg; $color-panel-text: $color-menu-text; $color-panel-input: $color-panel-text; $color-panel-hilite-bg: $color-menu-hilite-bg; $color-panel-hilite-text: $color-menu-hilite-text; -$color-panel-clickable: rgb(215,215,215); /* used for editable items in their non-edit state, etc. */ -$color-panel-border: $color-menu-border; /* Border for panel and for block elements */ -$color-panel-shadow: rgb(58,58,58); /* Shadow for text and block elements */ +$color-panel-clickable: rgb(215,215,215); // used for editable items in their non-edit state, etc. +$color-panel-border: $color-menu-border; // Border for panel and for block elements +$color-panel-shadow: rgb(58,58,58); // Shadow for text and block elements $color-panel-input-bg: rgb(68, 68, 68); $color-panel-dividerlabel-bg: rgb(62, 62, 62); $color-panel-input-border: rgb(49, 49, 49); @@ -85,7 +84,7 @@ $color-panel-divider-top: rgb(62, 62, 62); $color-panel-divider: $color-menu-divider; $color-panel-divider-bottom: rgb(86, 86, 86); -/* Colors for scroll bars */ +// Colors for scroll bars $color-sb-border: rgb(0,0,0); $color-sb-1: rgb(140,140,140); $color-sb-2: rgb(173,173,173); diff --git a/_scss/imports/themes/default/_fonts.scss b/_scss/imports/themes/default/_fonts.scss index 9410dfd2..9174cff3 100644 --- a/_scss/imports/themes/default/_fonts.scss +++ b/_scss/imports/themes/default/_fonts.scss @@ -4,9 +4,4 @@ // (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. // -/* - * _fonts.scss - * Defines the fonts for the application. - */ -/* Droid Sans: Normal, bold asdf*/ diff --git a/_scss/imports/themes/default/_mixins.scss b/_scss/imports/themes/default/_mixins.scss index e6a38a93..9f61e7ef 100644 --- a/_scss/imports/themes/default/_mixins.scss +++ b/_scss/imports/themes/default/_mixins.scss @@ -4,10 +4,8 @@ // (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. // -/* - * themes/themename/mixins.scss - * Mixins that are theme-dependent (e.g. sprite mixins, etc) - */ +// themes/themename/mixins.scss +// Mixins that are theme-dependent (e.g. sprite mixins, etc) $Mx:0; $My:0; diff --git a/_scss/ninja.scss b/_scss/ninja.scss index 9980b04a..11c04afb 100755 --- a/_scss/ninja.scss +++ b/_scss/ninja.scss @@ -6,11 +6,11 @@ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. */ -/* */ -/* ninja.scss - * Main SCSS file for ninja, compiled by SASS into the file ninja.css. - */ + +// ninja.scss +// Main SCSS file for ninja, compiled by SASS into the file ninja.css. + // Import theme settings @import "imports/themes/default/colors"; -- cgit v1.2.3