Merge branch 'pentool' into brushtool

1 files changed, 35 insertions, 4 deletions

diff --git a/js/panels/properties.reel/properties.css b/js/panels/properties.reel/properties.css
index eee44561..84f52ed4 100755
--- a/js/panels/properties.reel/properties.css
+++ b/js/panels/properties.reel/properties.css
@@ -271,20 +271,21 @@ padding-right:6px;
     content: "•";
 }
 
-.propertiesPanel input.nj-skinned label {
+.propertiesPanel .checkbox-label {
     position: absolute;
-    top: 0;
-    left: 15px;
+    top: 4px;
+    padding-left: 5px;
+    /*left: 15px;*/
     font-size: 10px;
     width:55px;
     text-align: left;
     font-weight: normal;
     color:#FFF;
 }
-
 .propertiesPanel input[type='radio'].nj-skinned {
     text-indent: 0px;
     line-height: 5px;
+    margin: -4px 0 0 0;
 }
 
 .propertiesPanel input[type='radio'].nj-skinned label {
@@ -303,4 +304,34 @@ input label {
 .propertiesPanel .rotation .fieldRow {
     -webkit-box-flex:0;
     width:45px;
+}
+
+.propertiesPanel div.montage-button:disabled {
+    opacity: 0.4;
+}
+
+.propertiesPanel div.montage-button {
+    font-size: 9px;
+    cursor: pointer;
+    display: block;
+    margin: -3px 0 0 -12px;
+    padding: 4px;
+    border: 1px #313131 solid;
+    background-color: #474747;
+    background-image: -webkit-linear-gradient(top, #505050 0%, #3c3c3c 100%);
+    border-radius: 4px;
+    color: white;
+    text-transform: uppercase;
+    cursor: pointer;
+    text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);
+    width: 18px;
+    height: 14px;
+}
+
+.propertiesPanel div.montage-button:active {
+    background-image: -webkit-linear-gradient(top, #3c3c3c 0%, #505050 100%);
+}
+
+.propertiesPanel div.montage-button:hover {
+    -webkit-box-shadow: 0px 0px 3px #b4b4b4;
 }
\ No newline at end of file