From 2f21eb37a4e7afb4ba3273b3ec50964717448b2f Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Thu, 3 May 2012 17:16:04 -0700 Subject: Removing more id and changing the appropriate CSS for them Signed-off-by: Valerio Virgillito --- css/ninja.css | 14 ++++---- js/components/about-box.reel/about-box.html | 2 +- .../layout/document-entry.reel/document-entry.html | 2 +- .../pen-properties.reel/pen-properties.html | 2 +- .../selection-properties.html | 2 +- js/components/treeview/branch.reel/branch.html | 8 ++--- js/components/treeview/leaf.reel/leaf.html | 4 +-- .../treeview/ninja-branch.reel/ninja-branch.html | 10 +++--- .../treeview/ninja-leaf.reel/ninja-leaf.html | 4 +-- js/components/treeview/treeview.reel/treeview.html | 4 +-- js/io/ui/cloudpopup.reel/cloudpopup.html | 2 +- js/ninja.reel/ninja.html | 42 +++++++++++----------- scss/imports/scss/_MainWindow.scss | 13 +++---- scss/imports/scss/_PanelUI.scss | 1 + 14 files changed, 51 insertions(+), 59 deletions(-) diff --git a/css/ninja.css b/css/ninja.css index 297ed7cd..7fa654bd 100755 --- a/css/ninja.css +++ b/css/ninja.css @@ -118,9 +118,9 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co #sceneBar { height: 70px; background-color: #474747; } -#mainContainer #rulerTop { display: none; background: gray url("../images/temp/ruler-top.png"); height: 15px; margin-bottom: 0px; border-right: 11px solid black; } +#mainContainer .rulerTop { display: none; background: gray url("../images/temp/ruler-top.png"); height: 15px; margin-bottom: 0px; border-right: 11px solid black; } -#rulerLeft { display: none; background: gray url("../images/temp/ruler-left.png"); width: 16px; border-bottom: 11px solid black; } +.rulerLeft { display: none; background: gray url("../images/temp/ruler-left.png"); width: 16px; border-bottom: 11px solid black; } #stateBar { height: 20px; background-color: #282828; margin-bottom: 0px; } @@ -164,9 +164,7 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co .verticalBox { -webkit-box-orient: vertical; -moz-box-orient: vertical; box-orient: vertical; } -#rightPanelContent { overflow-y: hidden; } - -#openDocumentsTabComponent { height: 25px; position: relative; overflow: hidden; color: white; } +.openDocumentsTab { height: 25px; position: relative; overflow: hidden; color: white; } #openDocuments { float: left; height: 25px; width: 100%; font-size: 12px; list-style: none; margin: 0; padding: 0; position: relative; text-decoration: none; } @@ -174,7 +172,7 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co #openDocuments li:hover, #openDocuments li:active, #openDocuments li.activeTab { background-color: #7f7f7f; } -#documentBar { height: 25px; width: 1000px; position: relative; overflow: hidden; color: white; } +.documentBar { height: 25px; width: 1000px; position: relative; overflow: hidden; color: white; } .montage-popup-modal-mask { opacity: 1; background: -webkit-radial-gradient(center, ellipse cover, rgba(0, 0, 0, 0.65) 0%, rgba(0, 0, 0, 0.8) 80%); } @@ -212,7 +210,7 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co #mainContent .CodeMirror { width: 100%; height: 100%; background: white; } -#mainContent .CodeMirror-scroll { height: 100%; overflow:auto; } +#mainContent .CodeMirror-scroll { height: 100%; overflow: auto; } .montage-editor-frame { position: absolute; z-index: 7; top: 0; left: 0; display: none; -webkit-user-select: initial; } @@ -648,7 +646,7 @@ button.panel-button { -webkit-appearance: none; font-size: 9px; color: white; ba .panel.collapsed .arrowIcon { -webkit-transform: rotate(-90deg); } -.rightPanelContent { position: absolute; height: 100%; width: 100%; } +.rightPanelContent { position: absolute; overflow-y: hidden; height: 100%; width: 100%; } #rightPanelContainer .panel { -webkit-box-flex: 100; } diff --git a/js/components/about-box.reel/about-box.html b/js/components/about-box.reel/about-box.html index 1f41699e..ecdd4389 100644 --- a/js/components/about-box.reel/about-box.html +++ b/js/components/about-box.reel/about-box.html @@ -21,7 +21,7 @@ -
+

Version: 0.0.0.0

diff --git a/js/components/layout/document-entry.reel/document-entry.html b/js/components/layout/document-entry.reel/document-entry.html index 8fd978a3..679ebb62 100755 --- a/js/components/layout/document-entry.reel/document-entry.html +++ b/js/components/layout/document-entry.reel/document-entry.html @@ -25,7 +25,7 @@
  • - +
    • diff --git a/js/components/tools-properties/pen-properties.reel/pen-properties.html b/js/components/tools-properties/pen-properties.reel/pen-properties.html index b3221456..68ab85f6 100755 --- a/js/components/tools-properties/pen-properties.reel/pen-properties.html +++ b/js/components/tools-properties/pen-properties.reel/pen-properties.html @@ -38,7 +38,7 @@
    -
    +
    diff --git a/js/components/tools-properties/selection-properties.reel/selection-properties.html b/js/components/tools-properties/selection-properties.reel/selection-properties.html index 728ffb0a..b93aacd0 100755 --- a/js/components/tools-properties/selection-properties.reel/selection-properties.html +++ b/js/components/tools-properties/selection-properties.reel/selection-properties.html @@ -26,7 +26,7 @@
    - +
    diff --git a/js/components/treeview/branch.reel/branch.html b/js/components/treeview/branch.reel/branch.html index 97b03382..d3060d96 100644 --- a/js/components/treeview/branch.reel/branch.html +++ b/js/components/treeview/branch.reel/branch.html @@ -129,11 +129,11 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot -
    - +
    + -
      -
    • +
        +
    diff --git a/js/components/treeview/leaf.reel/leaf.html b/js/components/treeview/leaf.reel/leaf.html index 360b85a9..a644d4f9 100644 --- a/js/components/treeview/leaf.reel/leaf.html +++ b/js/components/treeview/leaf.reel/leaf.html @@ -34,8 +34,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot -
    - +
    +
    \ No newline at end of file diff --git a/js/components/treeview/ninja-branch.reel/ninja-branch.html b/js/components/treeview/ninja-branch.reel/ninja-branch.html index 3a3f3658..60894fbc 100644 --- a/js/components/treeview/ninja-branch.reel/ninja-branch.html +++ b/js/components/treeview/ninja-branch.reel/ninja-branch.html @@ -131,11 +131,11 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot -
    -
    -
    -
      -
    • +
      +
      +
      +
        +
      diff --git a/js/components/treeview/ninja-leaf.reel/ninja-leaf.html b/js/components/treeview/ninja-leaf.reel/ninja-leaf.html index b759b723..6d00bb21 100644 --- a/js/components/treeview/ninja-leaf.reel/ninja-leaf.html +++ b/js/components/treeview/ninja-leaf.reel/ninja-leaf.html @@ -34,8 +34,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot -
      -
      +
      +
      \ No newline at end of file diff --git a/js/components/treeview/treeview.reel/treeview.html b/js/components/treeview/treeview.reel/treeview.html index 3ef9f116..1bed0f0b 100644 --- a/js/components/treeview/treeview.reel/treeview.html +++ b/js/components/treeview/treeview.reel/treeview.html @@ -43,8 +43,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot -
      -
      +
      +
      \ No newline at end of file diff --git a/js/io/ui/cloudpopup.reel/cloudpopup.html b/js/io/ui/cloudpopup.reel/cloudpopup.html index a75266a3..753597e7 100755 --- a/js/io/ui/cloudpopup.reel/cloudpopup.html +++ b/js/io/ui/cloudpopup.reel/cloudpopup.html @@ -28,7 +28,7 @@ -
      +

      Cloud Service Dialog

      diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html index 34dc8135..b18c79b9 100755 --- a/js/ninja.reel/ninja.html +++ b/js/ninja.reel/ninja.html @@ -364,10 +364,10 @@ -
      +
      - +
      @@ -377,22 +377,20 @@
      -
      +
      -
      +
      -
      - -
      +
      -
      +
      -
      +
      @@ -400,33 +398,33 @@
      -
      +
      -
      +
      -
      -
      -
      +
      +
      +
      -
      +
      - - +
      HTML
      +
      - -
      +
      +
      -
      -
      +
      +
      @@ -436,7 +434,7 @@ -
      +
      diff --git a/scss/imports/scss/_MainWindow.scss b/scss/imports/scss/_MainWindow.scss index f6068ddb..ace890aa 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,7 +338,7 @@ background-color: #7f7f7f; } -#documentBar { +.documentBar { height: 25px; width: 1000px; position: relative; 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%; } -- cgit v1.2.3