ソースを参照

HUE-3294 [editor] Improved integration CSS

Enrico Berti 9 年 前
コミット
5d3494e

+ 15 - 2
desktop/core/src/desktop/static/desktop/css/responsive.css

@@ -299,7 +299,6 @@ body {
 .page-content {
   -ms-flex: 1;
   flex: 1;
-  padding: 1em;
   position: relative;
 }
 
@@ -915,6 +914,20 @@ h6 {
   background-color: #e5e5e5;
 }
 
+/* styling for the imported apps */
 .page-content .navbar.navbar-inverse.navbar-fixed-top {
   position: static;
-}
+}
+
+.page-content .navbar .navbar-inner {
+  box-shadow: none;
+}
+
+/* editor */
+.progress {
+  border: none;
+}
+
+.context-panel {
+  display: none;
+}

+ 6 - 3
desktop/core/src/desktop/templates/responsive.mako

@@ -37,6 +37,7 @@
   <meta name="author" content="">
 
   <link href="${ static('desktop/ext/css/bootplus.css') }" rel="stylesheet">
+  <link href="${ static('desktop/css/hue3.css') }" rel="stylesheet">
   <link href="${ static('desktop/ext/css/font-awesome.min.css') }" rel="stylesheet">
   <link href="${ static('desktop/css/responsive.css') }" rel="stylesheet">
   <link href="${ static('desktop/css/jquery-ui.css') }" rel="stylesheet">
@@ -255,10 +256,12 @@ ${ hueIcons.symbols() }
 
 
     <div class="page-content">
+      <!-- ko ifnot: currentApp() -->
       Load
       <a href="#" data-bind="click: function(){ currentApp('editor') }">editor</a> |
       <a href="#" data-bind="click: function(){ currentApp('metastore') }">metastore</a> |
       <a href="#" data-bind="click: function(){ currentApp('search') }">search</a>
+      <!-- /ko -->
 
       <!-- ko if: isLoadingEmbeddable -->
       <i class="fa fa-spinner fa-spin"></i>
@@ -585,8 +588,8 @@ ${ assist.assistPanel() }
     })();
 
     window.hueDebug = {
-      viewModel: function () {
-        return window.hueDebug.onePageViewModel();
+      viewModel: function (element) {
+        return element ? ko.dataFor(element) : window.hueDebug.onePageViewModel();
       },
       onePageViewModel: function () {
         return ko.dataFor($('.page-content')[0]);
@@ -773,4 +776,4 @@ ${ assist.assistPanel() }
     %endif
 </script>
 </body>
-</html>
+</html>

+ 1 - 1
desktop/libs/notebook/src/notebook/templates/editor_components.mako

@@ -1026,7 +1026,7 @@ ${ hueIcons.symbols() }
   </div>
   <div class="resizer" data-bind="visible: isLeftPanelVisible() && assistAvailable(), splitDraggable : { appName: 'notebook', leftPanelVisible: isLeftPanelVisible, onPosition: function(){ huePubSub.publish('split.draggable.position') } }"><div class="resize-bar">&nbsp;</div></div>
   % endif
-  <div class="content-panel" data-bind="event: { scroll: function(){ var ls = $('.content-panel').data('lastScroll'); if (ls && ls != $('.content-panel').scrollTop()){ $(document).trigger('hideAutocomplete'); }; $('.content-panel').data('lastScroll', $('.content-panel').scrollTop()) } }, niceScroll, with: selectedNotebook">
+  <div class="content-panel" data-bind="event: { scroll: function(){ var ls = $('.content-panel').data('lastScroll'); if (ls && ls != $('.content-panel').scrollTop()){ $(document).trigger('hideAutocomplete'); }; $('.content-panel').data('lastScroll', $('.content-panel').scrollTop()) } }, with: selectedNotebook">
     <div>
       <div class="row-fluid row-container sortable-snippets" data-bind="css: {'is-editing': $root.isEditing},
         sortable: {