From 648ee61ae84216d0236e0dbc211addc13b2cfa3a Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 6 Jul 2012 11:52:06 -0700 Subject: Expand tabs --- scss/imports/scss/_Base.scss | 170 +++++++++--------- scss/imports/scss/_MainWindow.scss | 50 +++--- scss/imports/scss/_PanelUI.scss | 348 ++++++++++++++++++------------------- scss/imports/scss/_ScrollBars.scss | 8 +- scss/imports/scss/_Tools.scss | 124 ++++++------- scss/imports/themes/_test.scss | 14 +- 6 files changed, 357 insertions(+), 357 deletions(-) (limited to 'scss') diff --git a/scss/imports/scss/_Base.scss b/scss/imports/scss/_Base.scss index 78a3bbaf..45ff8975 100755 --- a/scss/imports/scss/_Base.scss +++ b/scss/imports/scss/_Base.scss @@ -45,9 +45,9 @@ POSSIBILITY OF SUCH DAMAGE. font-weight: bold; } :focus { - outline: none; - border: none; - -webkit-box-shadow: 0px 0px 1px 1px $color-focus-outline; + outline: none; + border: none; + -webkit-box-shadow: 0px 0px 1px 1px $color-focus-outline; } .layout-table { @@ -73,8 +73,8 @@ textarea.nj-skinned, button.nj-skinned, select.nj-skinned, select.nj-skinned option { - -webkit-appearance: none; - outline: none; + -webkit-appearance: none; + outline: none; } // Base styles @@ -84,11 +84,11 @@ input[type="search"].nj-skinned, textarea.nj-skinned, select.nj-skinned, select.nj-skinned option { - border: 1px solid $color-input-border; - color: $color-input; - background-color: $color-input-bg; - font-size: 12px; - font-family: 'Droid Sans', sans-serif; + border: 1px solid $color-input-border; + color: $color-input; + background-color: $color-input-bg; + font-size: 12px; + font-family: 'Droid Sans', sans-serif; } // Disabled styles @@ -96,7 +96,7 @@ input.nj-skinned:disabled, textarea.nj-skinned:disabled, select.nj-skinned:disabled, button.nj-skinned:disabled { - opacity: 0.4; + opacity: 0.4; } // Text inputs and select boxes @@ -105,7 +105,7 @@ input[type="password"].nj-skinned, input[type="search"].nj-skinned, select.nj-skinned, select.nj-skinned option { - height: 13px; + height: 13px; } // input[type="text"].nj-skinned:focus, @@ -114,7 +114,7 @@ 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; + -webkit-box-shadow: 0px 0px 3px $color-focus-outline; } @@ -122,99 +122,99 @@ 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; + font-size: 12px; + height: 16px; + padding-right: 20px; } input[type="search"].nj-skinned { - height: 17px ; - -webkit-box-shadow: none; + height: 17px ; + -webkit-box-shadow: none; } input[type="search"].nj-skinned::-webkit-search-cancel-button { - -webkit-appearance: none; - font-size: 10px; - height: 10px; - width: 10px; + -webkit-appearance: none; + font-size: 10px; + height: 10px; + width: 10px; } input[type="search"].nj-skinned::-webkit-search-cancel-button:after { - content:"\2716"; + content:"\2716"; } // Buttons button.nj-skinned { - font-size: 9px; + font-size: 9px; cursor: pointer; - display: block; - border: 0px; - margin: 0px; - padding: 4px; - border: 1px $color-input-border solid; - background-color: $color-menu-bg; - background-image: -webkit-linear-gradient(top, $color-formgrad-top 0%, $color-formgrad-bottom 100%); - border-radius: 4px; - color: $color-menu-text; - text-transform: uppercase; - cursor: pointer; - text-shadow: 1px 1px 1px $color-app-shadow + display: block; + border: 0px; + margin: 0px; + padding: 4px; + border: 1px $color-input-border solid; + background-color: $color-menu-bg; + background-image: -webkit-linear-gradient(top, $color-formgrad-top 0%, $color-formgrad-bottom 100%); + border-radius: 4px; + color: $color-menu-text; + text-transform: uppercase; + cursor: pointer; + 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; + -webkit-box-shadow: 0px 0px 3px $color-focus-outline; } // 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%); - color: $color-radio; - border: 2px solid $color-radio-border; - width: 12px; - height: 12px; - overflow: hidden; - border-radius: 10px; - font-size: 16px; - line-height: 7px; - text-indent: -7px; - cursor: pointer; + background-color: $color-menu-bg; + background-image: -webkit-linear-gradient(top, $color-radio-gradient-top 0%, $color-radio-gradient-bottom 100%); + color: $color-radio; + border: 2px solid $color-radio-border; + 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 $color-radio-shadow; -moz-box-shadow: 0px 0px 2px $color-radio-shadow; 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%), - -webkit-linear-gradient(top, $color-radio-gradient-top 0%, $color-radio-gradient-bottom 100%); - border: 2px solid $color-radio-border; + 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; + border: 2px solid $color-radio-border; } input[type="radio"].nj-skinned:active { - background-image: -webkit-linear-gradient(top, $color-radio-gradient-bottom 0%, $color-radio-gradient-top 100%); + background-image: -webkit-linear-gradient(top, $color-radio-gradient-bottom 0%, $color-radio-gradient-top 100%); } input[type="radio"].nj-skinned:disabled { - background-image: -webkit-linear-gradient(top, $color-radio-gradient-top 0%, $color-radio-gradient-bottom 100%); - border: 2px solid $color-radio-border; - cursor: default; + background-image: -webkit-linear-gradient(top, $color-radio-gradient-top 0%, $color-radio-gradient-bottom 100%); + border: 2px solid $color-radio-border; + cursor: default; } // 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%); - color: $color-radio; - border: 1px solid $color-radio-border; - width: 10px; - height: 10px; - font-size: 12px; - overflow: visible; - cursor: pointer; + background-color: $color-menu-bg; + background-image: -webkit-linear-gradient(top, $color-radio-gradient-top 0%, $color-radio-gradient-bottom 100%); + color: $color-radio; + border: 1px solid $color-radio-border; + width: 10px; + height: 10px; + font-size: 12px; + overflow: visible; + cursor: pointer; -webkit-box-shadow: 0px 0px 2px $color-radio-shadow; -moz-box-shadow: 0px 0px 2px $color-radio-shadow; box-shadow: 0px 0px 2px $color-radio-shadow; @@ -225,31 +225,31 @@ input[type="checkbox"].nj-skinned:checked { } input[type="checkbox"].nj-skinned:checked:after { - content:"\2714"; + content:"\2714"; } input[type="checkbox"].nj-skinned:active { - background-image: -webkit-linear-gradient(top, $color-radio-gradient-bottom 0%, $color-radio-gradient-top 100%); + background-image: -webkit-linear-gradient(top, $color-radio-gradient-bottom 0%, $color-radio-gradient-top 100%); } input[type="checkbox"].nj-skinned:disabled { - background-image: -webkit-linear-gradient(top, $color-radio-gradient-top 0%, $color-radio-gradient-bottom 100%); - cursor: default; + background-image: -webkit-linear-gradient(top, $color-radio-gradient-top 0%, $color-radio-gradient-bottom 100%); + cursor: default; } // End: Basic skinning for form fields // Begin: Basic skinning for visual dividers .nj-divider { - background-color: $color-divider-second; - border-width: 0px; - overflow: hidden; + background-color: $color-divider-second; + border-width: 0px; + overflow: hidden; } .nj-divider.divider-horizontal { - border-top: 1px solid $color-divider-first; - border-bottom: 1px solid $color-divider-third; - height: 1px; + border-top: 1px solid $color-divider-first; + border-bottom: 1px solid $color-divider-third; + height: 1px; } .nj-divider.divider-vertical { - border-left: 1px solid $color-divider-first; - border-right: 1px solid $color-divider-third; - width: 1px; + border-left: 1px solid $color-divider-first; + border-right: 1px solid $color-divider-third; + width: 1px; } // End: Basic skinning for visual dividers diff --git a/scss/imports/scss/_MainWindow.scss b/scss/imports/scss/_MainWindow.scss index f92c0f04..fee4f552 100755 --- a/scss/imports/scss/_MainWindow.scss +++ b/scss/imports/scss/_MainWindow.scss @@ -330,47 +330,47 @@ POSSIBILITY OF SUCH DAMAGE. } .openDocumentsTab { - height: 25px; + 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; + float: left; + height: 25px; + width: 100%; + font-size: 12px; + list-style: none; + margin: 0; + padding: 0; + position: relative; + text-decoration: none; } #openDocuments li { - border-right: 1px solid black; - cursor: pointer; - display: inline; - float: left; - padding: 0.5em 1em; - text-shadow: 1px 1px 1px #000000; - vertical-align: middle; + border-right: 1px solid black; + cursor: pointer; + display: inline; + float: left; + padding: 0.5em 1em; + text-shadow: 1px 1px 1px #000000; + vertical-align: middle; } #openDocuments li:hover, #openDocuments li:active, #openDocuments li.activeTab { - background-color: #7f7f7f; + background-color: #7f7f7f; } .documentBar { - height: 25px; - position: relative; - overflow: hidden; - color: white; + height: 25px; + position: relative; + overflow: hidden; + color: white; } .montage-popup-modal-mask { - opacity: 1; - background: -webkit-radial-gradient(center, ellipse cover, rgba(0,0,0,.65) 0%, rgba(0,0,0,0.8) 80%); + opacity: 1; + background: -webkit-radial-gradient(center, ellipse cover, rgba(0,0,0,.65) 0%, rgba(0,0,0,0.8) 80%); } diff --git a/scss/imports/scss/_PanelUI.scss b/scss/imports/scss/_PanelUI.scss index bce280cb..b3eeb1fa 100755 --- a/scss/imports/scss/_PanelUI.scss +++ b/scss/imports/scss/_PanelUI.scss @@ -125,7 +125,7 @@ POSSIBILITY OF SUCH DAMAGE. font-size : 11px; margin-left: 20px; cursor:default; - color: $color-panel-text; + color: $color-panel-text; } .treeComponent ul @@ -165,7 +165,7 @@ ul.treeComponent > img:first-child .treeItem { font-weight : normal; vertical-align:middle; - color: $color-panel-text; + color: $color-panel-text; } // ====== Used by Properties Panel ====== @@ -330,7 +330,7 @@ ul.treeComponent > img:first-child // Begin: Project Panel UI classes .Project-Panel { - height: 100%; + height: 100%; } #pp-container { height: 100%; @@ -379,40 +379,40 @@ ul.treeComponent > img:first-child .pp-scroll-main { - display: block; - position:absolute; - height:auto; - bottom:0; - top:0; - left:0; - right:0; - margin-top:18px; - overflow: auto; + 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; - + display: block; + position:absolute; + height: auto; + bottom:0; + top:0; + left:0; + right:0; + overflow: visible; + } #pp-view-assets { - display: none; + display: none; } // #pp-container-assets .pp-scroll-linked, #pp-container-list .pp-scroll-linked { - //width: 420px; + //width: 420px; } .pp-header-container { position: relative; - overflow: hidden; + overflow: hidden; border-bottom: 1px solid $color-menu-border; background-color: $color-panel-shadow; min-width: 390px; @@ -429,30 +429,30 @@ ul.treeComponent > img:first-child position: relative; } .pp-header .pp-resize-grip { - width: 7px; - height: 18px; - overflow: hidden; - position: absolute; - top: 0px; - right: 0px; - cursor: col-resize; - z-index: 10; + width: 7px; + height: 18px; + overflow: hidden; + position: absolute; + top: 0px; + right: 0px; + cursor: col-resize; + z-index: 10; } .pp-header-container .header-file { - min-width: 100px; - width: 160px; + min-width: 100px; + width: 160px; } .pp-header-container .header-size { - min-width: 50px; - width: 50px; + min-width: 50px; + width: 50px; } .pp-header-container .header-type { - min-width: 50px; - width: 50px; + min-width: 50px; + width: 50px; } .pp-header-container .header-date { - min-width: 100px; - width: 120px; + min-width: 100px; + width: 120px; } #pp-container-list ul { @@ -460,10 +460,10 @@ ul.treeComponent > img:first-child margin-left: 11px; } #pp-container-list ul.tree { - border-right: 1px solid $color-menu-divider; + border-right: 1px solid $color-menu-divider; } #pp-container-list ul.tree > li:first-child > .pp-span-all:first-child { - font-weight: bold; + font-weight: bold; } #pp-container-list ul ul { @@ -502,56 +502,56 @@ ul.treeComponent > img:first-child cursor: default; } span.pp-span-all { - display: block; + display: block; } span.pp-span-all:focus { - -webkit-box-shadow: none; - background-color: $color-focus-outline; - border-color: $color-focus-outline; - color: $color-menu-bg; + -webkit-box-shadow: none; + background-color: $color-focus-outline; + border-color: $color-focus-outline; + color: $color-menu-bg; } #pp-view-assets .pp-asset-col { - float: left; + float: left; } #pp-view-assets .pp-col-files { - width: 167px; + width: 167px; } #pp-view-assets .pp-col-size { - width: 57px; + width: 57px; } #pp-view-assets .pp-col-type { - width: 57px; + width: 57px; } #pp-view-assets .pp-col-date { - width: 127px; + width: 127px; } .pp-sort-arrow { - display: none; + 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; + 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; + background-position: 0 0; } .pp-sort.sort-descending .pp-sort-arrow { - background-position: 0px -5px; + background-position: 0px -5px; } #pp-view-assets .pp-asset-col div { - color: $color-panel-text; - padding-left: 5px; + color: $color-panel-text; + padding-left: 5px; border-bottom: 1px solid $color-menu-divider; padding-top: 3px; padding-bottom: 3px; @@ -561,17 +561,17 @@ span.pp-span-all:focus { border-right: 1px solid $color-menu-divider; } #pp-view-assets .focused { - background-color: #ccc; + background-color: #ccc; } #pp-view-assets :focus { - -webkit-box-shadow: none; + -webkit-box-shadow: none; } #pp-view-assets #pp-container-assets :focus, #pp-view-assets #pp-container-assets .focused { - background-color: $color-focus-outline; - border-color: $color-focus-outline; - color: $color-menu-bg; + background-color: $color-focus-outline; + border-color: $color-focus-outline; + color: $color-menu-bg; } // Icons! @@ -633,14 +633,14 @@ span.pp-span-all:focus { background-image: url("../images/panels/project-panel/icon-file-tag.png"); } #pp-view-assets .pp-col-files div { - background-repeat: no-repeat; - background-position: 7px 2px; - padding-left: 25px; + background-repeat: no-repeat; + background-position: 7px 2px; + padding-left: 25px; } #pp-view-assets h3 { - text-align: center; - display: none; + text-align: center; + display: none; } #pp-container-list span.pp-col-files, @@ -659,10 +659,10 @@ span.pp-span-all:focus { padding-left: 10px; } #pp-container-list span.pp-col-size { - width: 47px; + width: 47px; } #pp-container-list span.pp-col-date { - width: 97px; + width: 97px; } #pp-container-list span.pp-col-files { width: 151px; @@ -678,8 +678,8 @@ span.pp-span-all:focus { // Buttons .pp-button, #pp-col-buttons .pp-button div { - margin: 0px; - padding: 0px; + margin: 0px; + padding: 0px; width: 26px; height: 25px; background-repeat: no-repeat; @@ -692,31 +692,31 @@ span.pp-span-all:focus { left: 2px; } .pp-disabled .pp-button { - cursor: default; - opacity: 0.50; + cursor: default; + opacity: 0.50; } .pp-disabled .pp-button:focus { - -webkit-box-shadow: none; + -webkit-box-shadow: none; } #pp-container-list h3 { - display: none; + display: none; } .pp-disabled #pp-container-list h3 { - display: block; - text-align: center; + display: block; + text-align: center; } .pp-button.active { background-image: url("../images/panels/project-panel/icon-button-selected.png"); } .pp-disabled .pp-button.active { - background-image: none; + background-image: none; } .pp-button.active:focus { - outline: none; + outline: none; } .pp-button:active:focus { - outline: none; + outline: none; } .pp-button.button-project div { background-image: url("../images/panels/project-panel/icon-button-project.png") @@ -760,7 +760,7 @@ div.pp-button.button-divider div { } .pp-button.button-undefined { - display: none; + display: none; } // Hide and Show different types of assets @@ -770,59 +770,59 @@ div.pp-button.button-divider div { .pp-type-image, .pp-type-flash, .pp-type-other { - display: none; + display: none; } .pp-show-all .pp-asset-col div { - display: block; + display: block; } .pp-show-scripts .pp-type-script { - display: block; + display: block; } .pp-show-videos .pp-type-video { - display: block; + display: block; } .pp-show-audio .pp-type-audio { - display: block; + display: block; } .pp-show-images .pp-type-image { - display: block; + display: block; } .pp-show-flash .pp-type-flash { - display: block; + display: block; } // New file flyout .pp-popup { - position: absolute; - top: -53px; - left: -40px; - width: 80px; - height: 50px; - overflow: hidden; - border-radius: 5px; + position: absolute; + top: -53px; + left: -40px; + width: 80px; + height: 50px; + overflow: hidden; + border-radius: 5px; background-color: $color-tool-bg; border: 2px solid $color-app-border; z-index: 100; display: none; } .pp-popup p { - color: $color-menu-text; - margin: 0px; - padding: 0px; + color: $color-menu-text; + margin: 0px; + padding: 0px; } // Search subwidget #pp-search { - position: absolute; - display: block; + position: absolute; + display: block; height: 24px; - border: 2px solid $color-menu-border; - background-color: $color-menu-bg; - margin-left: 30px; - margin-right: 10px; - left: 0px; - bottom: 10px; - right: 0px; + border: 2px solid $color-menu-border; + background-color: $color-menu-bg; + margin-left: 30px; + margin-right: 10px; + left: 0px; + bottom: 10px; + right: 0px; } #pp-search label { position: absolute; @@ -835,7 +835,7 @@ div.pp-button.button-divider div { z-index: 10; } #pp-search input { - width: 100%; + width: 100%; height: 16px; margin-left: 7px; margin-top: 0px; @@ -844,15 +844,15 @@ div.pp-button.button-divider div { position: relative; } #pp-search div.pp-button { - position: relative; + position: relative; width: 20px; height: 20px; float: right; margin-left: 5px; background-repeat: no-repeat; background-position: 0 2px; - overflow: visible; - top: -6px; + overflow: visible; + top: -6px; } #pp-search div.button-add { background-image: url("../images/panels/project-panel/icon-button-plus.png"); @@ -861,19 +861,19 @@ div.pp-button.button-divider div { background-image: url("../images/panels/project-panel/icon-button-delete.png"); } #pp-view-assets #pp-container-assets .pp-filter-hidden { - display: none; + display: none; } // Inline editor styling #pp-container-assets input.inline-editor { - height: 11px; - width: 80%; - background-color: $color-panel-hilite-text !IMPORTANT; - color: $color-panel-hilite-bg !IMPORTANT; - top:-2px; - border-width: 0px; - font-size: 11px; + height: 11px; + width: 80%; + background-color: $color-panel-hilite-text !IMPORTANT; + color: $color-panel-hilite-bg !IMPORTANT; + top:-2px; + border-width: 0px; + font-size: 11px; } @@ -881,8 +881,8 @@ div.pp-button.button-divider div { // Begin: Properties Panel styles .properties_panel { - overflow-x: hidden; - color: $color-panel-text; + overflow-x: hidden; + color: $color-panel-text; } // Begin: styling the form elements @@ -890,7 +890,7 @@ div.pp-button.button-divider div { -webkit-appearance: none; font-size: 9px; color: $color-panel-text; - background-color: $color-panel-input-bg; + background-color: $color-panel-input-bg; border: 1px solid $color-panel-input-border; width : 120px; height: 15px; @@ -900,39 +900,39 @@ div.pp-button.button-divider div { background-position: right center; } .properties_panel select:focus { - outline: none; - border: 1px solid $color-panel-input-border; + outline: none; + border: 1px solid $color-panel-input-border; } .properties_panel .layout-table .layout-cell input[type="text"] { - height: 11px; - width: 120px; - font-size: 10px; + height: 11px; + width: 120px; + font-size: 10px; border: 1px solid $color-panel-input-border; - background-color: $color-panel-input-bg; - outline: none; + background-color: $color-panel-input-bg; + outline: none; } .properties_panel input[type="checkbox"] { - position: relative; - top: -2px; + position: relative; + top: -2px; } button.panel-button { - -webkit-appearance: none; - font-size: 9px; - color: $color-panel-text; - background-color: $color-panel-input-bg; + -webkit-appearance: none; + font-size: 9px; + color: $color-panel-text; + background-color: $color-panel-input-bg; border: 1px solid $color-panel-input-border; cursor: pointer; margin-left: 75%; } .properties_panel .hottextunit input { - width: 40px; - height: 12px; - font-size: 10px; - -webkit-appearance: none; - border-color: $color-panel-input-border; - background-color: $color-panel-input-bg; - color: $color-panel-input; + width: 40px; + height: 12px; + font-size: 10px; + -webkit-appearance: none; + border-color: $color-panel-input-border; + background-color: $color-panel-input-bg; + color: $color-panel-input; } // End: styling the form elements @@ -1019,13 +1019,13 @@ button.panel-button { margin-right: 7px; } .panel .layout-table.table-2col-wide { - width: 100%; + width: 100%; } .layout-table.table-2col-wide .layout-row { - width: 100%; + width: 100%; } .panel .layout-table.table-2col-wide .layout-cell { - width: 50%; + width: 50%; } // Slider properties .slider_props .layout-table.table-2col-wide .layout-cell:first-child, @@ -1034,27 +1034,27 @@ button.panel-button { .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%; + width: 100%; } .image_props .layout-table.table-2col-wide .layout-cell:first-child { - width: 200%; + width: 200%; } .hottext_props .layout-table.table-2col-wide .layout-cell { - margin-bottom: 6px; + margin-bottom: 6px; } .panel .layout-table.table-2col-wide .layout-cell:first-child { - text-align: right; + text-align: right; } .panel .layout-table.table-2col-wide .layout-cell:last-child { - padding-left: 7px; + padding-left: 7px; } .panel .layout-table.table-4col .layout-cell:first-child { - width: 30px; - text-align: right; - margin-right: 7px; + width: 30px; + text-align: right; + margin-right: 7px; } .panel .layout-table .flexor { - padding-right: 7px; + padding-right: 7px; } .panel .layout-table .flexor { @@ -1062,7 +1062,7 @@ button.panel-button { padding-right: 7px; } .panel .layout-table.table-4col .flexor { - width: 55px; + width: 55px; } @@ -1086,13 +1086,13 @@ button.panel-button { 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; + 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; diff --git a/scss/imports/scss/_ScrollBars.scss b/scss/imports/scss/_ScrollBars.scss index 6ed101aa..421b0731 100755 --- a/scss/imports/scss/_ScrollBars.scss +++ b/scss/imports/scss/_ScrollBars.scss @@ -127,10 +127,10 @@ POSSIBILITY OF SUCH DAMAGE. ::-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 + //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; } diff --git a/scss/imports/scss/_Tools.scss b/scss/imports/scss/_Tools.scss index 9aa3bd75..23ab5add 100755 --- a/scss/imports/scss/_Tools.scss +++ b/scss/imports/scss/_Tools.scss @@ -44,7 +44,7 @@ POSSIBILITY OF SUCH DAMAGE. .subToolHolderPanel .toolbutton { float:left; -webkit-transform: scale(0.6); - margin-top: -4px; + margin-top: -4px; } .subToolHolderPanel .toolbutton:hover, .subToolHolderPanel .toolbutton.active { @@ -67,8 +67,8 @@ POSSIBILITY OF SUCH DAMAGE. .toolColorChipContainer { - background: url(../../../../../images/colorpanel/transparent.png) repeat; - width: 18px; + background: url(../../../../../images/colorpanel/transparent.png) repeat; + width: 18px; height: 18px; margin-top: 1px; margin-left: 3px; @@ -86,30 +86,30 @@ POSSIBILITY OF SUCH DAMAGE. // generic styles for image radio button groups used in the tool options bar .subToolHolderPanel input.toolOptsRadioButton { - width: 24px; - height: 24px; - margin: 0px 5px 0px 0px; - padding: 0px; - cursor: pointer; - border-radius: 3px; - -webkit-user-select: none; - border: 1px solid transparent; - background: none; - background-repeat: no-repeat; - background-position: center center; - -webkit-transform: scale(0.9); + width: 24px; + height: 24px; + margin: 0px 5px 0px 0px; + padding: 0px; + cursor: pointer; + border-radius: 3px; + -webkit-user-select: none; + border: 1px solid transparent; + background: none; + background-repeat: no-repeat; + background-position: center center; + -webkit-transform: scale(0.9); } .subToolHolderPanel input.toolOptsRadioButton:hover { - box-shadow: 0px 0px 2px 2px #999; + box-shadow: 0px 0px 2px 2px #999; -webkit-transform: scale(1); } .subToolHolderPanel input.toolOptsRadioButton:checked { box-shadow: inset 0px 0px 2px 2px #999; background-color:#363636; - background-position: center center; - background-repeat: no-repeat; + background-position: center center; + background-repeat: no-repeat; -webkit-transform: scale(1); } @@ -172,26 +172,26 @@ POSSIBILITY OF SUCH DAMAGE. .cornerRadius.topLeft { -webkit-transform: rotate(0deg); - margin-top: 1px; - margin-right: 3px; + margin-top: 1px; + margin-right: 3px; } .cornerRadius.topRight { -webkit-transform: rotate(90deg); - margin-right: 3px; - margin-top: 1px; + margin-right: 3px; + margin-top: 1px; } .cornerRadius.bottomLeft { -webkit-transform: rotate(270deg); - margin-right: 2px; + margin-right: 2px; margin-top: -1px; } .cornerRadius.bottomRight { -webkit-transform: rotate(180deg); - margin-right: 4px; - margin-top: -1px; + margin-right: 4px; + margin-top: -1px; } #toolOptionsContainer @@ -202,8 +202,8 @@ POSSIBILITY OF SUCH DAMAGE. } .leftLabel{ - margin-top: 3px; - float:left; + margin-top: 3px; + float:left; } // Skin Radio Buttons @@ -327,36 +327,36 @@ input[type="radio"]:disabled { // Begin: styles for tag toolbar .tagRadioButtons input.divTool { - background-image: url("../images/optionsbar/tag/div-tag.png"); + background-image: url("../images/optionsbar/tag/div-tag.png"); } .tagRadioButtons input.imageTool { - background-image: url("../images/optionsbar/tag/img-tag.png"); + background-image: url("../images/optionsbar/tag/img-tag.png"); } .tagRadioButtons input.videoTool { - background-image: url("../images/optionsbar/tag/vid-tag.png"); + background-image: url("../images/optionsbar/tag/vid-tag.png"); } .tagRadioButtons input.canvasTool { - background-image: url("../images/optionsbar/tag/canvas-tag.png"); + background-image: url("../images/optionsbar/tag/canvas-tag.png"); } .tagRadioButtons input.customTool { - background-image: url("../images/optionsbar/tag/custom-tag.png"); + background-image: url("../images/optionsbar/tag/custom-tag.png"); } .tagRadioButtons .nj-divider { - height: 100%; - float: left; - position: relative; + height: 100%; + float: left; + position: relative; } .tagRadioButtons select.nj-skinned { - visibility: visible; - position: relative; - margin-top: 1px; + visibility: visible; + position: relative; + margin-top: 1px; } .tagRadioButtons select[disabled="true"].nj-skinned, .tagRadioButtons select[disabled].nj-skinned { - visibility: hidden; + visibility: hidden; } // End: styles for tag toolbar @@ -370,86 +370,86 @@ input[type="radio"]:disabled { // object 3D container styles .object3DToolContainer input.rotateLocally { - background-image: url("../images/optionsbar/options3D/rotate-locally.png"); + background-image: url("../images/optionsbar/options3D/rotate-locally.png"); } .object3DToolContainer input.rotateGlobally { - background-image: url("../images/optionsbar/options3D/rotate-globally.png"); + background-image: url("../images/optionsbar/options3D/rotate-globally.png"); } // Selection Tool Options Styles .optionsSelectionTool button { - padding-top: 0px; + padding-top: 0px; } .selectionToolIcon { - width: 16px; - height: 16px; - background-repeat:no-repeat; - background-position: 1px 2px; + width: 16px; + height: 16px; + background-repeat:no-repeat; + background-position: 1px 2px; } .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/themes/_test.scss b/scss/imports/themes/_test.scss index 0767c300..4e8b914a 100755 --- a/scss/imports/themes/_test.scss +++ b/scss/imports/themes/_test.scss @@ -39,13 +39,13 @@ POSSIBILITY OF SUCH DAMAGE. } .docAreaBackground { - color: black; - background: black; + color: black; + background: black; } .mainStageBackground { - color: white; - background: gray; + color: white; + background: gray; } .stageContentShadow { @@ -55,9 +55,9 @@ POSSIBILITY OF SUCH DAMAGE. } .panelBackground { - color: white; - /*border: solid 1px #333;*/ - background: rgba(41,41,41,1); + color: white; + /*border: solid 1px #333;*/ + background: rgba(41,41,41,1); } .panelCollapseControlBackground { -- cgit v1.2.3