[Monitor Dashboard|Trunk]

move css to styles.css :
	clean up index.html
	fixes in main.css and minify



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@58895 d315682c-612b-4755-9ff5-7f18f6832af3

deploy/prepareDeploy.sh

@@ -31,10 +31,10 @@
 # read -n1 ans
 # pico ../src/robots.txt;
 # echo -n "Pressed";
-# rm -rf ../src/assets/common-assets/.svn/;
+ rm -rf ../src/assets/common-assets/.svn/;
-# rm -rf ../src/app/openaireLibrary/.svn/;
+ rm -rf ../src/app/openaireLibrary/.svn/;
 # cd ..; npm run build:ssr; cd deploy;
-# rm -rf ../src ../node_modules  ../.idea/ ../installOpenaireLib.sh; cd ../; rm -rf deploy;
+ rm -rf ../src ../node_modules  ../.idea/ ../installOpenaireLib.sh; cd ../; rm -rf deploy;
 # echo 'Now copy to the server!'
 
 ##<-- to here

package.json

@@ -15,7 +15,7 @@
     "start:prerender-beta": "npm run build:prerender-beta && npm run serve:prerender",
     "build": "ng build",
     "build:client-and-server-bundles": "ng build --prod --sourceMap --stats-json=true --base-href /dashboard/ && ng run ng-universal-demo:server:production",
-    "build:client-and-server-bundles-beta": "ng build --configuration=beta --sourceMap --stats-json=true && ng run ng-universal-demo:server:beta",
+    "build:client-and-server-bundles-beta": "ng build --configuration=beta --sourceMap --stats-json=true --base-href /dashboard/ && ng run ng-universal-demo:server:beta",
     "build:prerender": "npm run build:client-and-server-bundles && npm run webpack:server && npm run generate:prerender",
     "build:ssr": "npm run build:client-and-server-bundles  && npm run webpack:server",
     "build:prerender-beta": "npm run build:client-and-server-bundles-beta && npm run webpack:server && npm run generate:prerender",

src/assets/theme-assets/css/main.css

@@ -10401,7 +10401,7 @@ div.ganttview .ui-resizable-w {
 .tablesorter-altair .tablesorter-processing {
   background-position: center center !important;
   background-repeat: no-repeat !important;
-  background-image: url(../img/spinners/spinner_small.gif) !important;
+  /*background-image: url(../img/spinners/spinner_small.gif) !important;*/
 }
 .tablesorter-altair caption {
   background-color: #fff;
@@ -11199,7 +11199,7 @@ div.kineticjs-content {
   margin-left: 1px;
 }
 .editableform-loading {
-  background: url('../img/spinners/spinner.gif') center center no-repeat;
+  /*background: url('../img/spinners/spinner.gif') center center no-repeat;*/
   height: 32px;
   margin: 24px 0;
 }
@@ -12324,14 +12324,14 @@ a.editable-click.editable-disabled:hover {
   height: 89px;
   border-bottom: 1px solid rgba(0, 0, 0, 0.12);
   margin-bottom: 20px;
-  background-image: url("../img/sidebar_head_bg.png");
+  /*background-image: url("../img/sidebar_head_bg.png");*/
   background-repeat: no-repeat;
   background-position: 0 0;
   position: relative;
 }
 @media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min-device-pixel-ratio: 2), only screen and (-webkit-min-device-pixel-ratio: 192), only screen and (min-resolution: 192dppx), only screen and (min-resolution: 2dppx) {
   #sidebar_main .sidebar_main_header {
-    background-image: url("../img/sidebar_head_bg@2x.png");
+    /*background-image: url("../img/sidebar_head_bg@2x.png");*/
     background-size: 280px 90px;
   }
 }

src/index.html

@@ -26,24 +26,7 @@
     <meta name="msapplication-TileColor" content="#ffffff">
     <meta name="msapplication-TileImage" content="/ms-icon-144x144.png">
     <meta name="theme-color" content="#ffffff">
-    <link rel="stylesheet" href="assets/theme-assets/dashboard-custom.css?v=1">
-    <link rel="stylesheet" href="assets/monitor-custom.css?v=1">
-    <!-- uikit -->
-    <link rel="stylesheet" href="assets/theme-assets/uikit/css/uikit.min.css" media="all">
-<!--    <link rel="stylesheet" href="assets/theme-assets/uikit/css/uikit.almost-flat.min.css" media="all">-->
-    <!-- flag icons -->
-    <link rel="stylesheet" href="assets/theme-assets/icons/flags/flags.min.css" media="all">
-
-    <!-- style switcher -->
-    <link rel="stylesheet" href="assets/theme-assets/css/style_switcher.min.css" media="all">
-
-    <!-- altair admin -->
-    <link rel="stylesheet" href="assets/theme-assets/css/main.min.css" media="all">
-
-    <!-- themes -->
-    <link rel="stylesheet" href="assets/theme-assets/css/themes/my_theme.min.css" media="all">
     <script src="https://cdn.ckeditor.com/4.5.11/full-all/ckeditor.js"></script>
-
   </head>
   <body class="app_my_theme dashboard">
     <div>

src/styles.css

@@ -1 +1,9 @@
 /* You can add global styles to this file, and also import other style files */
+@import "assets/theme-assets/dashboard-custom.css";
+@import "assets/monitor-custom.css";
+@import "assets/theme-assets/uikit/css/uikit.min.css";
+@import "assets/theme-assets/icons/flags/flags.min.css";
+@import "assets/theme-assets/css/style_switcher.min.css";
+@import "assets/theme-assets/css/main.css";
+@import "assets/theme-assets/css/themes/my_theme.min.css";
+