Browse Source

HUE-7743 [frontend] Allow adaption of clearable background image in embedded mode

Johan Ahlen 8 years ago
parent
commit
4619cb29cb

File diff suppressed because it is too large
+ 0 - 0
desktop/core/src/desktop/static/desktop/css/hue-embedded.css


File diff suppressed because it is too large
+ 0 - 0
desktop/core/src/desktop/static/desktop/css/hue.css


File diff suppressed because it is too large
+ 0 - 0
desktop/core/src/desktop/static/desktop/css/hue3-extra.css


+ 0 - 1
desktop/core/src/desktop/static/desktop/less/hue-cross-version.less

@@ -19,7 +19,6 @@
 @import (reference) "hue-mixins.less";
 
 @import "components/hue-breadcrumbs.less";
-@import "components/hue-clearable.less";
 @import "components/hue-demi-modal.less";
 @import "components/hue-filechooser.less";
 @import "components/hue-gridster.less";

+ 20 - 0
desktop/core/src/desktop/static/desktop/less/hue-embedded.less

@@ -49,6 +49,26 @@
     box-sizing: content-box;
   }
 
+  .clearable {
+    border: 1px solid @cui-gray-600;
+    padding: 3px 18px 3px 4px;
+    border-radius: 3px;
+  }
+
+  @media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
+    .clearable {
+      background-size: 10px 10px;
+    }
+  }
+
+  .clearable.x {
+    background-position: right 5px center;
+  }
+
+  .clearable.onX {
+    cursor: pointer !important;
+  }
+
   @import "hue-assist.less";
   @import "hue-autocomplete.less";
   @import "hue-cui-overrides.less";

+ 1 - 0
desktop/core/src/desktop/static/desktop/less/hue.less

@@ -23,6 +23,7 @@
 @import "hue-cui-overrides.less";
 @import "hue-cross-version.less";
 
+@import "components/hue-clearable.less";
 @import "components/hue-sidebar.less";
 @import "components/hue-hamburger.less";
 @import "hue4.less";

+ 2 - 0
desktop/core/src/desktop/static/desktop/less/hue3-extra.less

@@ -23,6 +23,8 @@
 @import "hue-cui-overrides.less";
 @import "hue-cross-version.less";
 
+@import "components/hue-clearable.less";
+
 .svg-hue-logo-main {
   fill: #f2f2f2;
 }

+ 5 - 0
desktop/core/src/desktop/templates/hue.mako

@@ -104,6 +104,11 @@
       }
     }
   }
+
+  // Add modified URL for .clearable background
+  var originalClearableImgUrl = '${ static('desktop/art/clearField@2x.png') }';
+  var clearableImgUrl = typeof adaptHueEmbeddedUrls !== 'undefined' ? adaptHueEmbeddedUrls(originalClearableImgUrl) : originalClearableImgUrl;
+  document.styleSheets[0].insertRule('.clearable { background: url(' + clearableImgUrl + ') no-repeat right -10px center; }');
 % endif
   </script>
 

Some files were not shown because too many files changed in this diff