Merge branch 'refs/heads/master' into CSSPanelUpdates

Conflicts:
	js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html

4 files changed, 9 insertions, 42 deletions

diff --git a/scss/imports/scss/_MainWindow.scss b/scss/imports/scss/_MainWindow.scss
index f6068ddb..2fdf0ac6 100755
--- a/scss/imports/scss/_MainWindow.scss
+++ b/scss/imports/scss/_MainWindow.scss
@@ -200,7 +200,7 @@
     background-color: #474747;
 }
 
-#mainContainer #rulerTop {
+#mainContainer .rulerTop {
   display: none;
     // TODO: temporary background please replace when component is implemented
     background:$color-stage url('../images/temp/ruler-top.png');
@@ -209,7 +209,7 @@
   border-right: 11px solid black;
 }
 
-#rulerLeft {
+.rulerLeft {
   display: none;
     // TODO: temporary background please replace when component is implemented
     background:$color-stage url('../images/temp/ruler-left.png');
@@ -305,12 +305,7 @@
     box-orient: vertical;
 }
 
-// TODO: REMOVE THIS
-#rightPanelContent {
-    overflow-y:hidden;
-}
-
-#openDocumentsTabComponent {
+.openDocumentsTab {
         height: 25px;
     position: relative;
     overflow: hidden;
@@ -343,9 +338,8 @@
         background-color: #7f7f7f;
 }
 
-#documentBar {
+.documentBar {
         height: 25px;
-        width: 1000px;
         position: relative;
         overflow: hidden;
         color: white;
diff --git a/scss/imports/scss/_PanelUI.scss b/scss/imports/scss/_PanelUI.scss
index d60dae59..dd8cee04 100755
--- a/scss/imports/scss/_PanelUI.scss
+++ b/scss/imports/scss/_PanelUI.scss
@@ -1240,6 +1240,7 @@ display: -webkit-box;
 
 .rightPanelContent {
     position:absolute;
+    overflow-y:hidden;
     height:100%;
     width:100%;
 }
diff --git a/scss/imports/scss/_Stage.scss b/scss/imports/scss/_Stage.scss
index 587903d2..ed8d0656 100644
--- a/scss/imports/scss/_Stage.scss
+++ b/scss/imports/scss/_Stage.scss
@@ -133,7 +133,7 @@
    
 }
 
-#drawingCanvas {
+.drawingCanvas {
     position: absolute;
     margin: 0px;
     border: none;
@@ -144,7 +144,7 @@
 }
 
 
-#stageCanvas {
+.stageCanvas {
     position: absolute;
     margin: 0px;
     border: none;
@@ -154,7 +154,7 @@
     z-index: 5;
 }
 
-#layoutCanvas {
+.layoutCanvas {
     position: absolute;
     margin: 0px;
     border: none;
@@ -164,35 +164,6 @@
     z-index: 4;
 }
 
-#codeViewContainer {
-    position: absolute;
-    top: 0px;
-    left: 0px;
-    margin: 0px;
-    padding: 0px;
-    background: $color-app-bg;
-    width:100%;
-    height:100%;
-    display:none;
-}
-
-#mainContent #codeMirror_1 {
-    height:100%;
-}
-
-#mainContent .CodeMirror {
-    width: 100%;
-    height: 100%;
-    background: white;
-}
-
-#mainContent .CodeMirror-scroll {
-    height: 100%;
-    overflow: scroll;
-    overflow-x: auto;
-    overflow-y: auto;
-}
-
 .montage-editor-frame {
     position:absolute;
     z-index:7;
diff --git a/scss/imports/scss/_toolbar.scss b/scss/imports/scss/_toolbar.scss
index 9bf540cd..e4bf64bf 100755
--- a/scss/imports/scss/_toolbar.scss
+++ b/scss/imports/scss/_toolbar.scss
@@ -26,6 +26,7 @@
     border-top: 1px solid #232323;
     border-bottom: 1px solid #3A3A3A;
     margin:2px;
+    width:100%;
 }
 
 .toolbutton {