aboutsummaryrefslogtreecommitdiff
path: root/scss/imports
diff options
context:
space:
mode:
authorhwc4872012-04-04 16:32:53 -0700
committerhwc4872012-04-04 16:32:53 -0700
commit6ee8b65742fbe61b4429dc8c7dc9ca33a3e43600 (patch)
treef267e05f623ed90d1cc841b8c79a338d6d8e807c /scss/imports
parent16f62ca09cc428043e8fef8bdeea11a989e62bc0 (diff)
parent17ca01f54591187f5c0812c0fd2cb7260afa9639 (diff)
downloadninja-6ee8b65742fbe61b4429dc8c7dc9ca33a3e43600.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Snapping
Conflicts: js/panels/presets/animations-presets.reel/animations-presets.js js/panels/presets/style-presets.reel/style-presets.js js/panels/presets/transitions-presets.reel/transitions-presets.js
Diffstat (limited to 'scss/imports')
-rwxr-xr-xscss/imports/scss/_MainWindow.scss2
-rwxr-xr-xscss/imports/scss/_PanelUI.scss2
2 files changed, 2 insertions, 2 deletions
diff --git a/scss/imports/scss/_MainWindow.scss b/scss/imports/scss/_MainWindow.scss
index ba9851da..f6068ddb 100755
--- a/scss/imports/scss/_MainWindow.scss
+++ b/scss/imports/scss/_MainWindow.scss
@@ -89,7 +89,7 @@
89 min-height:46px; 89 min-height:46px;
90 max-height:50%; 90 max-height:50%;
91 overflow:auto; 91 overflow:auto;
92 92 -webkit-transition: all 0.15s linear;
93} 93}
94 94
95.panelContainer { 95.panelContainer {
diff --git a/scss/imports/scss/_PanelUI.scss b/scss/imports/scss/_PanelUI.scss
index f76d3e20..d60dae59 100755
--- a/scss/imports/scss/_PanelUI.scss
+++ b/scss/imports/scss/_PanelUI.scss
@@ -1088,7 +1088,7 @@ button.panel-button {
1088 margin: -1px 8px 0px 27px; 1088 margin: -1px 8px 0px 27px;
1089} 1089}
1090.pp_filllabel{ 1090.pp_filllabel{
1091 border-width: none; 1091 border: none;
1092 margin: -1px 8px 0px 34px; 1092 margin: -1px 8px 0px 34px;
1093} 1093}
1094// End Styles for DivPIProperties 1094// End Styles for DivPIProperties