aboutsummaryrefslogtreecommitdiff
path: root/scss/imports
diff options
context:
space:
mode:
authorJohn Mayhew2012-04-04 14:41:16 -0700
committerJohn Mayhew2012-04-04 14:41:16 -0700
commit7249d6377c8897b2f9d8115be99717be971a0981 (patch)
tree9415f5ba25ad643df678e561719d2708fd3ead5a /scss/imports
parentebdfa77a5399d245ddf134ee8110b2d046922a71 (diff)
parent8482e23cd9b8c4700b5130f2588e5eb24d376536 (diff)
downloadninja-7249d6377c8897b2f9d8115be99717be971a0981.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Conflicts: js/lib/drawing/world.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