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/imports/scss/_PanelUI.scss | 99 ++++++++++++++++++++-------------------- 1 file changed, 49 insertions(+), 50 deletions(-) (limited to '_scss/imports/scss/_PanelUI.scss') 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; -- cgit v1.2.3 From 2e24eaa71b260fd11632d8a124874b238c9aa82a Mon Sep 17 00:00:00 2001 From: Jon Reid Date: Wed, 1 Feb 2012 16:02:37 -0800 Subject: Delete unneeded compass log file (IKNINJA 1101). Update base styles for better colors on HTML buttons. Change project panel so it shows no project by default. --- _scss/imports/scss/_PanelUI.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '_scss/imports/scss/_PanelUI.scss') diff --git a/_scss/imports/scss/_PanelUI.scss b/_scss/imports/scss/_PanelUI.scss index ac82adf8..21ada556 100644 --- a/_scss/imports/scss/_PanelUI.scss +++ b/_scss/imports/scss/_PanelUI.scss @@ -390,7 +390,7 @@ ul.treeComponent > img:first-child // #pp-container-assets .pp-scroll-linked, #pp-container-list .pp-scroll-linked { - width: 420px; + //width: 420px; } -- cgit v1.2.3