Merge pull request #1373 from NextDom/develop

0.5.0-RC0

.gitignore

@@ -35,13 +35,13 @@ tests/tests/chromedriver*
 
 core/config
 core/css
+core/js
+core/template
 
 /var.*
 /var
 /data.*
 /data
-/src/mobile/node_modules
-/src/mobile/src/assets/icons
 /mobile
 
 /assets/config/default.config.ini

CHANGELOG.md

@@ -1,5 +1,21 @@
 # NextDom Core Changelog
 ---
+## 0.4.2
+> ***Release Date : 13/09/2019***
+>
+> ***Statut : beta***
+
+#### FIXS
+* [liste ici](https://github.com/NextDom/nextdom-core/milestone/19?closed=1)
+---
+## 0.4.1
+> ***Release Date : 12/09/2019***
+>
+> ***Statut : beta***
+
+#### FIXS
+* [liste ici](https://github.com/NextDom/nextdom-core/milestone/20?closed=1)
+---
 ## 0.4.0
 > ***Release Date : 11/09/2019***
 >

assets/config/Nextdom_version

@@ -1 +1 @@
-0.4.0
+0.4.2

assets/css/compiled/pages/connection.scss

@@ -29,7 +29,8 @@
 }
 
 /* Boxs */
-.login-box {
+.login-box,
+#mobile-box {
     width: 380px;
     margin: 7% auto;
 }

assets/css/components/_eqlogics.scss

@@ -145,11 +145,10 @@
     font-size: 38px !important;
     font-weight: 900;
   }
-  .logoPrimary {
-    color: $nextdom_blue;
-  }
+  .logoPrimary,
   .logoSecondary {
-    color: $nextdom_bg;
+    display: flex;
+    flex-direction: column;
   }
   .info {
     color: $white;

assets/css/components/_labels.scss

@@ -142,3 +142,37 @@
 .callback {
     padding-top: 7px;
 }
+
+/* AdminLTE-Surcharge */
+.sidebar-menu > li .badge {
+    margin-top: -2px;
+}
+.scenario-label {
+    > i {
+      margin-right: 5px;
+    }
+    padding: 6px;
+    word-break: break-all;
+    position: absolute;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
+    max-width: calc(100% - 120px);
+    z-index: 0;
+}
+.scenario-state {
+    display: inline-flex;
+    float: right;
+    font-size: 14px;
+    padding: 8px;
+    margin: 1px;
+    position: relative;
+    z-index: 1;
+}
+.scenario-cmd {
+    display: inline-flex;
+    float: right;
+    align-items: center;
+    position: relative;
+    z-index: 1;
+}

assets/css/containers/_containers.scss

@@ -114,10 +114,44 @@
     }
 }
 
+.div_objectScenario {
+    margin-bottom: 10px;
+    margin-left: -5px;
+    margin-right: -5px;
+    > * {
+      margin: 0px;
+      padding: 2px 5px;
+    }
+}
+.div_objectScenario_none {
+    margin-bottom: 10px;
+    margin-left: 0px;
+    margin-right: 0px;
+}
+.div_scenario {
+    padding: 4px;
+    border-radius: 4px;
+    display: flow-root;
+    .btn {
+        height: 30px;
+        padding: 5px 10px;
+        margin: 1px 2px;
+    }
+}
+
+#room_filters {
+    .nav-tabs-custom {
+        margin-bottom: 0px;
+    }
+    .box-body {
+        padding: 0px;
+    }
+}
+
 /* jQuerty-Surcharge */
 .packery-drop-placeholder {
     outline: 1px dashed hsla(0, 0%, 0%, 0.5);
     outline-offset: -6px;
     -webkit-transition: -webkit-transform 0.2s;
-            transition: transform 0.2s;
+    transition: transform 0.2s;
 }

assets/css/graphics/_colors.scss

@@ -83,6 +83,12 @@ $good: #2ecc71;
 .text-gray{
     color: #707070 !important;
 }
+.text-critical{
+    color: $critical !important;
+}
+.text-good{
+    color: $good !important;
+}
 
 /* Background color */
 .bg-nextdom {

assets/css/sections/_headers.scss

@@ -80,13 +80,6 @@
 }
 
 /* Core-Surcharge */
-#dashboard-header {
-    position: fixed;
-    width: 100%;
-    padding-right: 65px;
-    z-index: 999;
-    display: none;
-}
 .content-header {
     background: transparent;
     position: fixed;

assets/icon/nextdom/style.css

@@ -9,6 +9,17 @@
 	font-style: normal;
 }
 
+@font-face {
+	font-family: 'jeedom';
+	src:url('fonts/nextdom.eot');
+	src:url('fonts/nextdom.eot') format('embedded-opentype'),
+	url('fonts/nextdom.woff') format('woff'),
+	url('fonts/nextdom.ttf') format('truetype'),
+	url('fonts/nextdom.svg') format('svg');
+	font-weight: normal;
+	font-style: normal;
+}
+
 [class^="nextdom-"], [class*=" nextdom-"],
 [class^="jeedom-"], [class*=" jeedom-"] {
 	font-family: 'nextdom';

assets/icon/nextdom2/style.css

@@ -2,9 +2,20 @@
 	font-family: 'nextdom2';
 	src:url('fonts/nextdom2.eot');
 	src:url('fonts/nextdom2.eot') format('embedded-opentype'),
-		url('fonts/nextdom2.woff') format('woff'),
-		url('fonts/nextdom2.ttf') format('truetype'),
-		url('fonts/nextdom2.svg') format('svg');
+	url('fonts/nextdom2.woff') format('woff'),
+	url('fonts/nextdom2.ttf') format('truetype'),
+	url('fonts/nextdom2.svg') format('svg');
+	font-weight: normal;
+	font-style: normal;
+}
+
+@font-face {
+	font-family: 'jeedom2';
+	src:url('fonts/nextdom2.eot');
+	src:url('fonts/nextdom2.eot') format('embedded-opentype'),
+	url('fonts/nextdom2.woff') format('woff'),
+	url('fonts/nextdom2.ttf') format('truetype'),
+	url('fonts/nextdom2.svg') format('svg');
 	font-weight: normal;
 	font-style: normal;
 }