From abb3e1bdc15e8ba74ffad4cca63c656b718f7890 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Thu, 23 Feb 2012 15:55:15 -0800
Subject: Fixing the selection tool properties icons.

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 scss/imports/scss/_toolbar.scss | 87 ++++++++++++++++++++---------------------
 1 file changed, 43 insertions(+), 44 deletions(-)

(limited to 'scss')

diff --git a/scss/imports/scss/_toolbar.scss b/scss/imports/scss/_toolbar.scss
index 00d8b5f0..9bf540cd 100755
--- a/scss/imports/scss/_toolbar.scss
+++ b/scss/imports/scss/_toolbar.scss
@@ -186,72 +186,71 @@
     /*opacity: 0.7;*/
 /*}*/
 
-/*//  Selection Tool Options  */
-/*.topAlignUp {*/
+//  Selection Tool Options
+.topAlignUp {
 
-  /*@include background-pos(8,2,26px,23px);*/
-/*}*/
+  @include background-pos(8,2,26px,23px);
+}
 
-/*.rightAlignUp {*/
+.rightAlignUp {
 
-  /*@include background-pos(9,2,26px,23px);*/
-/*}*/
+  @include background-pos(9,2,26px,23px);
+}
 
-/*.bottomAlignUp {*/
+.bottomAlignUp {
 
-  /*@include background-pos(10,2,26px,23px);*/
-/*}*/
+  @include background-pos(10,2,26px,23px);
+}
 
-/*.verticalLeftUp {*/
+.verticalLeftUp {
 
-  /*@include background-pos(11,2,26px,23px);*/
-/*}*/
+  @include background-pos(11,2,26px,23px);
+}
 
-/*.verticalCenterUp {*/
+.verticalCenterUp {
 
-  /*@include background-pos(12,2,26px,23px);*/
-/*}*/
+  @include background-pos(12,2,26px,23px);
+}
 
-/*.verticalRightUp {*/
+.verticalRightUp {
 
-  /*@include background-pos(13,2,26px,23px);*/
-/*}*/
+  @include background-pos(13,2,26px,23px);
+}
 
-/*.distRightUp {*/
+.distRightUp {
 
-  /*@include background-pos(0,3,26px,23px);*/
-/*}*/
+  @include background-pos(0,3,26px,23px);
+}
 
-/*.distLeftUp {*/
+.distLeftUp {
 
-  /*@include background-pos(14,2,26px,23px);*/
-/*}*/
+  @include background-pos(14,2,26px,23px);
+}
 
-/*.distCenterUp {*/
+.distCenterUp {
 
-  /*@include background-pos(2,3,26px,23px);*/
-/*}*/
+  @include background-pos(2,3,26px,23px);
+}
 
-/*.distTopUp {*/
+.distTopUp {
 
-  /*@include background-pos(1,3,26px,23px);*/
-/*}*/
-
-/*.distBottomUp {*/
+  @include background-pos(1,3,26px,23px);
+}
 
-  /*@include background-pos(3,3,26px,23px);*/
-/*}*/
+.distBottomUp {
 
-/*.distVCenterUp {*/
+  @include background-pos(3,3,26px,23px);
+}
 
-  /*@include background-pos(15,2,26px,23px);*/
-/*}*/
+.distVCenterUp {
 
-/*.bucketToolUp {*/
-   /*@include background-pos(11,0,26px,23px);*/
-/*}*/
+  @include background-pos(15,2,26px,23px);
+}
 
-/*.pencilToolUp {*/
-   /*@include background-pos(9,1,26px,23px);*/
-/*}*/
+.bucketToolUp {
+   @include background-pos(11,0,26px,23px);
+}
 
+.pencilToolUp {
+   @include background-pos(9,1,26px,23px);
+}
-- 
cgit v1.2.3


From ecbada601290456e63233968ad8794869c4880b1 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Fri, 24 Feb 2012 13:25:01 -0800
Subject: fixing the right panel disappearing when collapsed and re-enabled

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 scss/imports/scss/_MainWindow.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scss')

diff --git a/scss/imports/scss/_MainWindow.scss b/scss/imports/scss/_MainWindow.scss
index 97344b1e..4c1ed592 100755
--- a/scss/imports/scss/_MainWindow.scss
+++ b/scss/imports/scss/_MainWindow.scss
@@ -93,7 +93,7 @@
 }
 
 .panelContainer {
-    display:block;
+    display: -webkit-box;
     -webkit-box-orient: vertical;
     position:relative;
 }
-- 
cgit v1.2.3