Selaa lähdekoodia

Revert "HUE-8803 [frontend] Bundle common third party css into hue.css"

This reverts commit 4eb981e32aea35bd40339ebed7eccd01bd37b449.
Johan Ahlen 6 vuotta sitten
vanhempi
commit
0074b6a4e4

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
desktop/core/src/desktop/static/desktop/css/hue.css


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
desktop/core/src/desktop/static/desktop/ext/chosen/chosen.min.css


+ 5 - 5
desktop/core/src/desktop/static/desktop/ext/css/hue-charts.css

@@ -1,10 +1,10 @@
 @font-face {
 	font-family: 'HueCharts';
-	src:url('../ext/fonts/huecharts-regular.eot?121z71');
-	src:url('../ext/fonts/huecharts-regular.eot?#iefix121z71') format('embedded-opentype'),
-		url('../ext/fonts/huecharts-regular.woff?121z71') format('woff'),
-		url('../ext/fonts/huecharts-regular.ttf?121z71') format('truetype'),
-		url('../ext/fonts/huecharts-regular.svg?121z71#filetypes') format('svg');
+	src:url('../fonts/huecharts-regular.eot?121z71');
+	src:url('../fonts/huecharts-regular.eot?#iefix121z71') format('embedded-opentype'),
+		url('../fonts/huecharts-regular.woff?121z71') format('woff'),
+		url('../fonts/huecharts-regular.ttf?121z71') format('truetype'),
+		url('../fonts/huecharts-regular.svg?121z71#filetypes') format('svg');
 	font-weight: normal;
 	font-style: normal;
 }

+ 21 - 21
desktop/core/src/desktop/static/desktop/ext/select2/select2.css

@@ -105,7 +105,7 @@ html[dir="rtl"] .select2-container .select2-choice > .select2-chosen {
     text-decoration: none;
 
     border: 0;
-    background: url('../ext/select2/select2.png') right top no-repeat;
+    background: url('select2.png') right top no-repeat;
     cursor: pointer;
     outline: 0;
 }
@@ -218,7 +218,7 @@ html[dir="rtl"] .select2-container .select2-choice .select2-arrow {
     display: block;
     width: 100%;
     height: 100%;
-    background: url('../ext/select2/select2.png') no-repeat 0 1px;
+    background: url('select2.png') no-repeat 0 1px;
 }
 
 html[dir="rtl"] .select2-container .select2-choice .select2-arrow b {
@@ -256,21 +256,21 @@ html[dir="rtl"] .select2-container .select2-choice .select2-arrow b {
     -webkit-box-shadow: none;
             box-shadow: none;
 
-    background: #fff url('../ext/select2/select2.png') no-repeat 100% -22px;
-    background: url('../ext/select2/select2.png') no-repeat 100% -22px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, #fff), color-stop(0.99, #eee));
-    background: url('../ext/select2/select2.png') no-repeat 100% -22px, -webkit-linear-gradient(center bottom, #fff 85%, #eee 99%);
-    background: url('../ext/select2/select2.png') no-repeat 100% -22px, -moz-linear-gradient(center bottom, #fff 85%, #eee 99%);
-    background: url('../ext/select2/select2.png') no-repeat 100% -22px, linear-gradient(to bottom, #fff 85%, #eee 99%) 0 0;
+    background: #fff url('select2.png') no-repeat 100% -22px;
+    background: url('select2.png') no-repeat 100% -22px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, #fff), color-stop(0.99, #eee));
+    background: url('select2.png') no-repeat 100% -22px, -webkit-linear-gradient(center bottom, #fff 85%, #eee 99%);
+    background: url('select2.png') no-repeat 100% -22px, -moz-linear-gradient(center bottom, #fff 85%, #eee 99%);
+    background: url('select2.png') no-repeat 100% -22px, linear-gradient(to bottom, #fff 85%, #eee 99%) 0 0;
 }
 
 html[dir="rtl"] .select2-search input {
     padding: 4px 5px 4px 20px;
 
-    background: #fff url('../ext/select2/select2.png') no-repeat -37px -22px;
-    background: url('../ext/select2/select2.png') no-repeat -37px -22px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, #fff), color-stop(0.99, #eee));
-    background: url('../ext/select2/select2.png') no-repeat -37px -22px, -webkit-linear-gradient(center bottom, #fff 85%, #eee 99%);
-    background: url('../ext/select2/select2.png') no-repeat -37px -22px, -moz-linear-gradient(center bottom, #fff 85%, #eee 99%);
-    background: url('../ext/select2/select2.png') no-repeat -37px -22px, linear-gradient(to bottom, #fff 85%, #eee 99%) 0 0;
+    background: #fff url('select2.png') no-repeat -37px -22px;
+    background: url('select2.png') no-repeat -37px -22px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, #fff), color-stop(0.99, #eee));
+    background: url('select2.png') no-repeat -37px -22px, -webkit-linear-gradient(center bottom, #fff 85%, #eee 99%);
+    background: url('select2.png') no-repeat -37px -22px, -moz-linear-gradient(center bottom, #fff 85%, #eee 99%);
+    background: url('select2.png') no-repeat -37px -22px, linear-gradient(to bottom, #fff 85%, #eee 99%) 0 0;
 }
 
 .select2-drop.select2-drop-above .select2-search input {
@@ -278,11 +278,11 @@ html[dir="rtl"] .select2-search input {
 }
 
 .select2-search input.select2-active {
-    background: #fff url('../ext/select2/select2-spinner.gif') no-repeat 100%;
-    background: url('../ext/select2/select2-spinner.gif') no-repeat 100%, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, #fff), color-stop(0.99, #eee));
-    background: url('../ext/select2/select2-spinner.gif') no-repeat 100%, -webkit-linear-gradient(center bottom, #fff 85%, #eee 99%);
-    background: url('../ext/select2/select2-spinner.gif') no-repeat 100%, -moz-linear-gradient(center bottom, #fff 85%, #eee 99%);
-    background: url('../ext/select2/select2-spinner.gif') no-repeat 100%, linear-gradient(to bottom, #fff 85%, #eee 99%) 0 0;
+    background: #fff url('select2-spinner.gif') no-repeat 100%;
+    background: url('select2-spinner.gif') no-repeat 100%, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, #fff), color-stop(0.99, #eee));
+    background: url('select2-spinner.gif') no-repeat 100%, -webkit-linear-gradient(center bottom, #fff 85%, #eee 99%);
+    background: url('select2-spinner.gif') no-repeat 100%, -moz-linear-gradient(center bottom, #fff 85%, #eee 99%);
+    background: url('select2-spinner.gif') no-repeat 100%, linear-gradient(to bottom, #fff 85%, #eee 99%) 0 0;
 }
 
 .select2-container-active .select2-choice,
@@ -451,7 +451,7 @@ disabled look for disabled choices in the results dropdown
 }
 
 .select2-more-results.select2-active {
-    background: #f4f4f4 url('../ext/select2/select2-spinner.gif') no-repeat 100%;
+    background: #f4f4f4 url('select2-spinner.gif') no-repeat 100%;
 }
 
 .select2-results .select2-ajax-error {
@@ -551,7 +551,7 @@ html[dir="rtl"] .select2-container-multi .select2-choices li
 }
 
 .select2-container-multi .select2-choices .select2-search-field input.select2-active {
-    background: #fff url('../ext/select2/select2-spinner.gif') no-repeat 100% !important;
+    background: #fff url('select2-spinner.gif') no-repeat 100% !important;
 }
 
 .select2-default {
@@ -610,7 +610,7 @@ html[dir="rtl"] .select2-container-multi .select2-choices .select2-search-choice
 
     font-size: 1px;
     outline: none;
-    background: url('../ext/select2/select2.png') right top no-repeat;
+    background: url('select2.png') right top no-repeat;
 }
 html[dir="rtl"] .select2-search-choice-close {
     right: auto;
@@ -693,7 +693,7 @@ html[dir="rtl"] .select2-container-multi .select2-search-choice-close {
     .select2-search-choice-close,
     .select2-container .select2-choice abbr,
     .select2-container .select2-choice .select2-arrow b {
-        background-image: url('../ext/select2/select2x2.png') !important;
+        background-image: url('select2x2.png') !important;
         background-repeat: no-repeat !important;
         background-size: 60px 40px !important;
     }

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

@@ -28,15 +28,6 @@
 @import "components/hue-multi-cluster-sidebar.less";
 @import "hue4.less";
 
-@import (inline) "../ext/chosen/chosen.min.css";
-@import (inline) "../ext/select2/select2.css";
-@import (inline) "../ext/css/hue-charts.css";
-@import (inline) "../ext/css/leaflet.css";
-@import (inline) "../ext/css/leaflet.markercluster.css";
-@import (inline) "../ext/css/leaflet.zoombox.css";
-@import (inline) "../ext/css/nv.d3.min.css";
-@import (inline) "../css/nv.d3.css";
-
 html {
   height: 100%;
   width: 100%;

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

@@ -89,6 +89,15 @@
   <link href="${ static('desktop/css/jquery-ui.css') }" rel="stylesheet">
   <link href="${ static('desktop/css/home.css') }" rel="stylesheet">
 % endif
+  <link rel="stylesheet" href="${ static('desktop/ext/chosen/chosen.min.css') }">
+  <link rel="stylesheet" href="${ static('desktop/ext/select2/select2.css') }">
+
+  <link rel="stylesheet" href="${ static('desktop/ext/css/hue-charts.css') }">
+  <link rel="stylesheet" href="${ static('desktop/ext/css/leaflet.css') }">
+  <link rel="stylesheet" href="${ static('desktop/ext/css/leaflet.markercluster.css') }">
+  <link rel="stylesheet" href="${ static('desktop/ext/css/leaflet.zoombox.css') }">
+  <link rel="stylesheet" href="${ static('desktop/ext/css/nv.d3.min.css') }">
+  <link rel="stylesheet" href="${ static('desktop/css/nv.d3.css') }">
 
   <script type="text/javascript">
 % if IS_EMBEDDED.get():

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä