You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2016/02/01 18:52:02 UTC

[18/50] [abbrv] brooklyn-ui git commit: remove responsiveness and unnecessary html and (some of the many unnecessary) css elements, and improving how things line up in some edge cases (viewed at different sizes)

remove responsiveness and unnecessary html and (some of the many unnecessary) css elements, and improving how things line up in some edge cases (viewed at different sizes)


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/46b57025
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/46b57025
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/46b57025

Branch: refs/heads/0.6.0
Commit: 46b57025baf6a9b7a7045b4a9eba0a8eade56cd4
Parents: 108cdfd
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Sat Sep 14 22:54:30 2013 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Sep 18 09:30:05 2013 +0100

----------------------------------------------------------------------
 usage/jsgui/src/main/webapp/assets/css/base.css | 44 ++++++++++++--------
 .../src/main/webapp/assets/css/brooklyn.css     |  4 +-
 .../jsgui/src/main/webapp/assets/css/styles.css |  1 -
 usage/jsgui/src/main/webapp/index.html          |  8 +---
 4 files changed, 28 insertions(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/46b57025/usage/jsgui/src/main/webapp/assets/css/base.css
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/webapp/assets/css/base.css b/usage/jsgui/src/main/webapp/assets/css/base.css
index d294b12..b1f6791 100644
--- a/usage/jsgui/src/main/webapp/assets/css/base.css
+++ b/usage/jsgui/src/main/webapp/assets/css/base.css
@@ -29,7 +29,7 @@ add-app .tab-content-scroller {
     overflow: auto !important;
 }
 #application-content div#application-explorer {
-    padding-left: 52px;
+    /* padding-left: 52px; */
 }
 #application-content div#details {
 	margin-left: 8px !important;
@@ -158,6 +158,7 @@ ul.dropdown-menu {
 	border-bottom: 1px solid #DDD;
 	padding-left: 8px;
 	padding-right: 8px;
+	height: 35px;
 }
 
 .nav-tabs>li>a {
@@ -444,6 +445,27 @@ input[type="color"]:focus,.uneditable-input:focus {
     border-left: 1px solid #DDD;
     min-height: 300px;
 }
+
+.navbar_top {
+    background-color: #D0D8D0;
+    padding: 8px 12px 12px 12px;
+    -webkit-border-radius: 4px 4px 0 0;
+    -moz-border-radius: 4px 4px 0 0;
+    border-radius: 4px 4px 0 0;
+}
+.navbar_main_wrapper {
+    background-color: #F0F4F0;
+    -webkit-border-radius: 0 0 4px 4px;
+    -moz-border-radius: 0 0 4px 4px;
+    border-radius: 0 0 4px 4px;
+}
+.navbar_main {
+    overflow-x: auto;
+    margin: 0;
+    white-space: nowrap;
+}
+
+/* traditional tree-style (clickable + icons) tree-list */
 #tree-list {
 }
 ol.tree {
@@ -470,25 +492,11 @@ ol.tree {
 #tree-list li input + ol {
     height: auto;
 }
-.navbar_top {
-	background-color: #D0D8D0;
-	padding: 8px 12px 12px 12px;
-    -webkit-border-radius: 4px 4px 0 0;
-    -moz-border-radius: 4px 4px 0 0;
-    border-radius: 4px 4px 0 0;
-}
-.navbar_main_wrapper {
-    background-color: #F0F4F0;
+.navbar_main_wrapper.treelist {
     padding: 12px 6px 4px 6px;
-    -webkit-border-radius: 0 0 4px 4px;
-    -moz-border-radius: 0 0 4px 4px;
-    border-radius: 0 0 4px 4px;
 }
-.navbar_main {
-	padding: 0px 8px 6px 2px;
-	overflow-x: auto;
-	margin: 0;
-	white-space: nowrap;
+.navbar_main.treelist {
+    padding: 0px 8px 6px 2px;
 }
 
 .label-message {

http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/46b57025/usage/jsgui/src/main/webapp/assets/css/brooklyn.css
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/webapp/assets/css/brooklyn.css b/usage/jsgui/src/main/webapp/assets/css/brooklyn.css
index 6f4a626..f2cf895 100644
--- a/usage/jsgui/src/main/webapp/assets/css/brooklyn.css
+++ b/usage/jsgui/src/main/webapp/assets/css/brooklyn.css
@@ -99,14 +99,12 @@ textarea {
 .row-fluid .span4 {
     width: 300px !important;
     margin-left: 34px !important;
-    float: left !important;
     margin-top: 10px !important
 }
 
 .row-fluid .span8 {
-    width: 607px !important;
+    width: 618px !important;
     margin-right: -26px !important;
-    float: left !important;
     margin-top: 10px !important
 }
 

http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/46b57025/usage/jsgui/src/main/webapp/assets/css/styles.css
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/webapp/assets/css/styles.css b/usage/jsgui/src/main/webapp/assets/css/styles.css
index 1b69921..0643cf8 100644
--- a/usage/jsgui/src/main/webapp/assets/css/styles.css
+++ b/usage/jsgui/src/main/webapp/assets/css/styles.css
@@ -1,5 +1,4 @@
 @import url('bootstrap.css');
-@import url('bootstrap-responsive.css');
 @import url('jquery.dataTables.css');
 @import url('cssninja-tree.css');
 @import url('base.css');
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/46b57025/usage/jsgui/src/main/webapp/index.html
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/webapp/index.html b/usage/jsgui/src/main/webapp/index.html
index 47474f5..b4a2f0b 100644
--- a/usage/jsgui/src/main/webapp/index.html
+++ b/usage/jsgui/src/main/webapp/index.html
@@ -26,16 +26,11 @@
 <div class="navbar navbar-fixed-top">
     <div class="navbar-inner">
         <div class="container">
-            <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-            </a>
             <a class="brand" href="#"></a>
 
             <div class="logo"><!-- added via CSS --></div>
             
-            <div class="nav-collapse menubar-top">
+            <div class="menubar-top">
                 <ul class="nav">
                     <li><a href="#/v1/home" class="nav1 nav1_home">Home</a></li>
                     <li><a href="#/v1/applications" class="nav1 nav1_apps">Applications</a></li>
@@ -50,7 +45,6 @@
                     <li><a href="#/v1/help" class="nav1 nav1_help"><b>?</b></a></li>
                 </ul>
             </div>
-            <!--/.nav-collapse -->
         </div>
     </div>
 </div>