From 6803c0abd279fcb640c38b3881b751bab982cbe0 Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 6 Jul 2012 12:42:16 -0700 Subject: Remove trailing spaces --- scss/imports/scss/_Base.scss | 40 +++++++------- scss/imports/scss/_Components.scss | 4 +- scss/imports/scss/_MainWindow.scss | 10 ++-- scss/imports/scss/_MenuUI.scss | 6 +-- scss/imports/scss/_MontageOverrides.scss | 2 +- scss/imports/scss/_PanelUI.scss | 90 ++++++++++++++++---------------- scss/imports/scss/_ScrollBars.scss | 28 +++++----- scss/imports/scss/_Stage.scss | 16 +++--- scss/imports/scss/_Tools.scss | 74 +++++++++++++------------- scss/imports/scss/_mixins.scss | 2 +- scss/imports/scss/_toolbar.scss | 6 +-- scss/imports/themes/default/_colors.scss | 46 ++++++++-------- scss/ninja.scss | 4 +- 13 files changed, 164 insertions(+), 164 deletions(-) (limited to 'scss') diff --git a/scss/imports/scss/_Base.scss b/scss/imports/scss/_Base.scss index 45ff8975..c5a2949b 100755 --- a/scss/imports/scss/_Base.scss +++ b/scss/imports/scss/_Base.scss @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. //Base.scss //Base styles for entire application. -//Note that colors and font definitions go in +//Note that colors and font definitions go in //_scss/themes/themename/_colors.scss and _scss/themes/themename/_fonts.scss @@ -57,7 +57,7 @@ POSSIBILITY OF SUCH DAMAGE. display: table-row; } .layout-cell { - display: table-cell; + display: table-cell; } .layout-table .flexor div:first-child { float: left; @@ -66,10 +66,10 @@ POSSIBILITY OF SUCH DAMAGE. float: right; } -// Begin: Basic skinning for form fields -// Reset all -input.nj-skinned, -textarea.nj-skinned, +// Begin: Basic skinning for form fields +// Reset all +input.nj-skinned, +textarea.nj-skinned, button.nj-skinned, select.nj-skinned, select.nj-skinned option { @@ -99,7 +99,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, @@ -141,7 +141,7 @@ input[type="search"].nj-skinned::-webkit-search-cancel-button:after { content:"\2716"; } -// Buttons +// Buttons button.nj-skinned { font-size: 9px; cursor: pointer; @@ -159,13 +159,13 @@ button.nj-skinned { text-shadow: 1px 1px 1px $color-app-shadow } button.nj-skinned:active, button.nj-skinned.active { - background-image: -webkit-linear-gradient(top, $color-formgrad-bottom 0%, $color-formgrad-top 100%); + background-image: -webkit-linear-gradient(top, $color-formgrad-bottom 0%, $color-formgrad-top 100%); } button.nj-skinned:hover { -webkit-box-shadow: 0px 0px 3px $color-focus-outline; } -// 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%); @@ -184,12 +184,12 @@ input[type="radio"].nj-skinned { box-shadow: 0px 0px 2px $color-radio-shadow; } input[type="radio"].nj-skinned:checked { - background: -webkit-radial-gradient(center, - circle cover, - $color-radio 0%, - $color-radio 15%, - $color-radio 30%, - $color-transparent 31%), + 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; } @@ -204,7 +204,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%); @@ -234,9 +234,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; @@ -252,4 +252,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 754278ec..6a3106cd 100755 --- a/scss/imports/scss/_Components.scss +++ b/scss/imports/scss/_Components.scss @@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE. -// Begin: Styles for the Tree component +// Begin: Styles for the Tree component .tree { @@ -54,4 +54,4 @@ POSSIBILITY OF SUCH DAMAGE. -webkit-transition: -webkit-transform 0.05s linear; } -// End: styles for the Tree component +// End: styles for the Tree component diff --git a/scss/imports/scss/_MainWindow.scss b/scss/imports/scss/_MainWindow.scss index fee4f552..a1ead470 100755 --- a/scss/imports/scss/_MainWindow.scss +++ b/scss/imports/scss/_MainWindow.scss @@ -33,7 +33,7 @@ POSSIBILITY OF SUCH DAMAGE. // 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; @@ -289,7 +289,7 @@ POSSIBILITY OF SUCH DAMAGE. .resizeBar { -webkit-transition: all 0.15s linear; } -// Splitters Collapsed +// Splitters Collapsed .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; } @@ -310,7 +310,7 @@ POSSIBILITY OF SUCH DAMAGE. box-shadow: 3px 5px 4px $color-app-shadow; } - + // .baseBox { display:-webkit-box; @@ -318,7 +318,7 @@ POSSIBILITY OF SUCH DAMAGE. display: box; } -// Generic style to make any element unselectable +// Generic style to make any element unselectable .unselectable { -webkit-user-select: none; } @@ -335,7 +335,7 @@ POSSIBILITY OF SUCH DAMAGE. overflow: hidden; color: white; } - + #openDocuments { float: left; height: 25px; diff --git a/scss/imports/scss/_MenuUI.scss b/scss/imports/scss/_MenuUI.scss index 827b29bf..af7a9d70 100755 --- a/scss/imports/scss/_MenuUI.scss +++ b/scss/imports/scss/_MenuUI.scss @@ -30,9 +30,9 @@ POSSIBILITY OF SUCH DAMAGE. // MenuUI.scss // Styles governing the main dropdown menu. -// Note that colors and font definitions go in +// 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; @@ -73,7 +73,7 @@ POSSIBILITY OF SUCH DAMAGE. } // Styles for positioning and display -Supports fly-out of sub-menus two levels deep only +Supports fly-out of sub-menus two levels deep only .menuBar ul ul { position: absolute; diff --git a/scss/imports/scss/_MontageOverrides.scss b/scss/imports/scss/_MontageOverrides.scss index 416df430..7a55f420 100644 --- a/scss/imports/scss/_MontageOverrides.scss +++ b/scss/imports/scss/_MontageOverrides.scss @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. //MontageOverrides.scss //Montage overrides. -//Note that colors and font definitions go in +//Note that colors and font definitions go in //_scss/themes/themename/_colors.scss and _scss/themes/themename/_fonts.scss .montage-modal { diff --git a/scss/imports/scss/_PanelUI.scss b/scss/imports/scss/_PanelUI.scss index b3eeb1fa..8c6efcab 100755 --- a/scss/imports/scss/_PanelUI.scss +++ b/scss/imports/scss/_PanelUI.scss @@ -28,15 +28,15 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// +// // PanelUI.scss // Styles governing the panels in the UI. -// Note that colors and font definitions go in +// 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 -// base layout style for all panels +// base layout style for all panels .panelDisclosureIcon { background-image:url("../images/panels/panelDisclosureIcon.png"); @@ -55,7 +55,7 @@ POSSIBILITY OF SUCH DAMAGE. } .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; } @@ -102,11 +102,11 @@ POSSIBILITY OF SUCH DAMAGE. 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; @@ -117,7 +117,7 @@ POSSIBILITY OF SUCH DAMAGE. height: 100%; } -// Only used by Animation Presets Panel currently +// Only used by Animation Presets Panel currently .treeComponent { @@ -134,7 +134,7 @@ POSSIBILITY OF SUCH DAMAGE. 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; @@ -154,7 +154,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 @@ -168,8 +168,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 { @@ -225,7 +225,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%; } @@ -323,12 +323,12 @@ ul.treeComponent > img:first-child } .splitterBackground { - background: $color-app-bg; + background: $color-app-bg; } -// Begin: Project Panel UI classes +// Begin: Project Panel UI classes .Project-Panel { height: 100%; } @@ -343,7 +343,7 @@ ul.treeComponent > img:first-child #pp-container h3 { font-weight: normal; padding-left: 2em; - color: $color-menu-hilite-bg; + color: $color-menu-hilite-bg; } #pp-col-buttons { position: absolute; @@ -369,14 +369,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; @@ -398,17 +398,17 @@ ul.treeComponent > img:first-child 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-header-container { position: relative; @@ -533,10 +533,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; @@ -574,7 +574,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; @@ -643,7 +643,7 @@ span.pp-span-all:focus { display: none; } -#pp-container-list span.pp-col-files, +#pp-container-list span.pp-col-files, #pp-container-list span.pp-col-size, #pp-container-list span.pp-col-date { display: block; @@ -675,8 +675,8 @@ span.pp-span-all:focus { } -// Buttons -.pp-button, +// Buttons +.pp-button, #pp-col-buttons .pp-button div { margin: 0px; padding: 0px; @@ -763,7 +763,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, @@ -792,7 +792,7 @@ div.pp-button.button-divider div { display: block; } -// New file flyout +// New file flyout .pp-popup { position: absolute; top: -53px; @@ -811,7 +811,7 @@ div.pp-button.button-divider div { margin: 0px; padding: 0px; } -// Search subwidget +// Search subwidget #pp-search { position: absolute; display: block; @@ -865,7 +865,7 @@ div.pp-button.button-divider div { } -// Inline editor styling +// Inline editor styling #pp-container-assets input.inline-editor { height: 11px; width: 80%; @@ -877,15 +877,15 @@ div.pp-button.button-divider div { } -// End: Tree component for Project Panel +// End: Tree component for Project Panel -// Begin: Properties Panel styles +// 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; @@ -926,7 +926,7 @@ button.panel-button { margin-left: 75%; } .properties_panel .hottextunit input { - width: 40px; + width: 40px; height: 12px; font-size: 10px; -webkit-appearance: none; @@ -934,10 +934,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; @@ -954,7 +954,7 @@ button.panel-button { margin-top: 5px; } -// control groups +// control groups .pp_group{ width: 100%; clear: both; @@ -971,7 +971,7 @@ button.panel-button { left: 25px; } -// controls +// controls .pp_proplabel{ float: left; width: auto; @@ -1006,7 +1006,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; @@ -1027,7 +1027,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, @@ -1081,7 +1081,7 @@ button.panel-button { margin-bottom: 10px; } -// Begin: Styles for DivPIProperties +// Begin: Styles for DivPIProperties .pp_colorpicker{ width: 35px; height: 20px; @@ -1102,13 +1102,13 @@ button.panel-button { border: 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 421b0731..39dc91f8 100755 --- a/scss/imports/scss/_ScrollBars.scss +++ b/scss/imports/scss/_ScrollBars.scss @@ -28,25 +28,25 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// 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; @@ -60,27 +60,27 @@ POSSIBILITY OF SUCH DAMAGE. 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; @@ -125,13 +125,13 @@ POSSIBILITY OF SUCH DAMAGE. } ::-webkit-scrollbar-corner { - // background-color: black; + // 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; } @@ -149,7 +149,7 @@ POSSIBILITY OF SUCH DAMAGE. background-repeat: no-repeat; } -// disabled state +// disabled state ::-webkit-scrollbar-track:disabled { display: none; } @@ -175,5 +175,5 @@ POSSIBILITY OF SUCH DAMAGE. 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 569d51c4..e7490d03 100644 --- a/scss/imports/scss/_Stage.scss +++ b/scss/imports/scss/_Stage.scss @@ -50,7 +50,7 @@ POSSIBILITY OF SUCH DAMAGE. border: none; margin: 4px; } - + @@ -68,14 +68,14 @@ POSSIBILITY OF SUCH DAMAGE. } #pasteBoard { - // position: relative; + // position: relative; top: 0px; left: 0px; margin: 0px; padding: 0px; border: none; - // overflow: scroll; + // overflow: scroll; } @@ -113,18 +113,18 @@ POSSIBILITY OF SUCH DAMAGE. // 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 { @@ -154,7 +154,7 @@ POSSIBILITY OF SUCH DAMAGE. } #iframeContainer iframe { - + } .drawingCanvas { diff --git a/scss/imports/scss/_Tools.scss b/scss/imports/scss/_Tools.scss index 23ab5add..d15b4ae7 100755 --- a/scss/imports/scss/_Tools.scss +++ b/scss/imports/scss/_Tools.scss @@ -28,13 +28,13 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// +// // Tools.scss // For individual tool styles in the toolbar, see toolbar.scss. -// Note that colors and font definitions go in +// Note that colors and font definitions go in // _scss/themes/themename/_colors.scss and _scss/themes/themename/_fonts.scss -// - +// + .subToolHolderPanel { margin-left: 42px; padding: 6px; @@ -71,8 +71,8 @@ POSSIBILITY OF SUCH DAMAGE. width: 18px; height: 18px; margin-top: 1px; - margin-left: 3px; - margin-right: 8px; + margin-left: 3px; + margin-right: 8px; border: 1px #777 solid; } @@ -113,12 +113,12 @@ POSSIBILITY OF SUCH DAMAGE. -webkit-transform: scale(1); } -// 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; @@ -131,7 +131,7 @@ POSSIBILITY OF SUCH DAMAGE. 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; @@ -147,8 +147,8 @@ POSSIBILITY OF SUCH DAMAGE. padding-top:3px; margin-left:10px; font-size:12px; - // display:inline; - // line-height:10px; + // display:inline; + // line-height:10px; float:left; margin-right:5px; } @@ -198,7 +198,7 @@ POSSIBILITY OF SUCH DAMAGE. { display:inline; float:left; - // margin-left: 20px; + // margin-left: 20px; } .leftLabel{ @@ -206,7 +206,7 @@ POSSIBILITY OF SUCH DAMAGE. float:left; } -// Skin Radio Buttons +// Skin Radio Buttons input[type="radio"] { -webkit-appearance: none; background: $color-radio-bg; @@ -219,7 +219,7 @@ input[type="radio"] { font-size:10px; color:$color-radio; margin:4px; - + } input[type="radio"]:hover { @@ -233,7 +233,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; @@ -255,8 +255,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; @@ -269,7 +269,7 @@ input[type="radio"]:disabled { margin-right:4em; margin-top:3px; height:15px; - + } .toolButtonColor { background: $color-tool-bg; @@ -283,7 +283,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; } @@ -325,7 +325,7 @@ input[type="radio"]:disabled { @include marginTop(5px); } -// Begin: styles for tag toolbar +// Begin: styles for tag toolbar .tagRadioButtons input.divTool { background-image: url("../images/optionsbar/tag/div-tag.png"); } @@ -358,7 +358,7 @@ input[type="radio"]:disabled { .tagRadioButtons select[disabled].nj-skinned { visibility: hidden; } -// End: styles for tag toolbar +// End: styles for tag toolbar #zoomToolOptionHolder .zoomOutToolIcon { background-image:url("../images/optionsbar/zoom/zoom_minus.png"); @@ -389,67 +389,67 @@ input[type="radio"]:disabled { } .alignTopIcon { - background-image: url("../images/optionsbar/selection/AlignTop.png"); + background-image: url("../images/optionsbar/selection/AlignTop.png"); } .alignMiddleIcon { - background-image: url("../images/optionsbar/selection/AlignMiddle.png"); + background-image: url("../images/optionsbar/selection/AlignMiddle.png"); } .alignBottomIcon { - background-image: url("../images/optionsbar/selection/AlignBottom.png"); + background-image: url("../images/optionsbar/selection/AlignBottom.png"); } .alignLeftIcon { - background-image: url("../images/optionsbar/selection/AlignLeft.png"); + background-image: url("../images/optionsbar/selection/AlignLeft.png"); } .alignCenterIcon { - background-image: url("../images/optionsbar/selection/AlignCenter.png"); + background-image: url("../images/optionsbar/selection/AlignCenter.png"); } .alignRightIcon { - background-image: url("../images/optionsbar/selection/AlignRight.png"); + background-image: url("../images/optionsbar/selection/AlignRight.png"); } .arrangeBringForwardIcon { - background-image: url("../images/optionsbar/selection/ArrangeBringForward.png"); + background-image: url("../images/optionsbar/selection/ArrangeBringForward.png"); } .arrangeSendBackwardIcon { - background-image: url("../images/optionsbar/selection/ArrangeSendBackward.png"); + background-image: url("../images/optionsbar/selection/ArrangeSendBackward.png"); } .arrangeBringToFrontIcon { - background-image: url("../images/optionsbar/selection/ArrangeBringToFront.png"); + background-image: url("../images/optionsbar/selection/ArrangeBringToFront.png"); } .arrangeSendToBackIcon { - background-image: url("../images/optionsbar/selection/ArrangeSendToBack.png"); + background-image: url("../images/optionsbar/selection/ArrangeSendToBack.png"); } .distTopIcon { - background-image: url("../images/optionsbar/selection/DistTop.png"); + background-image: url("../images/optionsbar/selection/DistTop.png"); } .distMiddleIcon { - background-image: url("../images/optionsbar/selection/DistMiddle.png"); + background-image: url("../images/optionsbar/selection/DistMiddle.png"); } .distBottomIcon { - background-image: url("../images/optionsbar/selection/DistBottom.png"); + background-image: url("../images/optionsbar/selection/DistBottom.png"); } .distLeftIcon { - background-image: url("../images/optionsbar/selection/DistLeft.png"); + background-image: url("../images/optionsbar/selection/DistLeft.png"); } .distCenterIcon { - background-image: url("../images/optionsbar/selection/DistCenter.png"); + background-image: url("../images/optionsbar/selection/DistCenter.png"); } .distRightIcon { - background-image: url("../images/optionsbar/selection/DistRight.png"); + background-image: url("../images/optionsbar/selection/DistRight.png"); } .optionsPenTool { diff --git a/scss/imports/scss/_mixins.scss b/scss/imports/scss/_mixins.scss index 989ec281..ab3313ba 100755 --- a/scss/imports/scss/_mixins.scss +++ b/scss/imports/scss/_mixins.scss @@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE. // mixins.scss -// Generic mixins. Theme-specific mixins (e.g. for sprites) +// Generic mixins. Theme-specific mixins (e.g. for sprites) // should go in the theme/themename/mixins.scss file. diff --git a/scss/imports/scss/_toolbar.scss b/scss/imports/scss/_toolbar.scss index 1e69e23e..3fa7fbd5 100755 --- a/scss/imports/scss/_toolbar.scss +++ b/scss/imports/scss/_toolbar.scss @@ -28,12 +28,12 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// +// // toolbar.scss // Styles governing the individual tools. -// Note that colors and font definitions go in +// Note that colors and font definitions go in // _scss/themes/themename/_colors.scss and _scss/themes/themename/_fonts.scss - + // New Tool List CSS #toolsPanelContent { diff --git a/scss/imports/themes/default/_colors.scss b/scss/imports/themes/default/_colors.scss index d22cb29a..8e67cfd7 100755 --- a/scss/imports/themes/default/_colors.scss +++ b/scss/imports/themes/default/_colors.scss @@ -34,7 +34,7 @@ POSSIBILITY OF SUCH DAMAGE. //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); @@ -49,27 +49,27 @@ $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 +// 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 +$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 -// Colors for main dropdown menus: background & text for both regular and highlighted states, dividers +// 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 $color-menu-bg: rgb(71,71,71); $color-menu-text: rgb(255,255,255); $color-menu-hilite-bg: rgb(178,178,178); @@ -79,7 +79,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); @@ -94,15 +94,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); @@ -110,7 +110,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/ninja.scss b/scss/ninja.scss index be323993..b2389e91 100755 --- a/scss/ninja.scss +++ b/scss/ninja.scss @@ -29,7 +29,7 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - + // ninja.scss @@ -44,7 +44,7 @@ POSSIBILITY OF SUCH DAMAGE. // Import generic mixins and styles @import "imports/scss/mixins"; @import "imports/scss/Base"; - + // Import everything else @import "imports/scss/MainWindow"; @import "imports/scss/Stage"; -- cgit v1.2.3