diff --git a/package.json b/package.json
index 7cf3f3d..4d67b95 100755
--- a/package.json
+++ b/package.json
@@ -65,4 +65,4 @@
"popper.js": "^1.12.6",
"skycons": "^1.0.0"
}
-}
+}
\ No newline at end of file
diff --git a/server.js b/server.js
index 16c5e1d..1518bf3 100644
--- a/server.js
+++ b/server.js
@@ -9,4 +9,3 @@ app.use('/', express.static(__dirname + '/build'));
const server = app.listen(process.env.PORT || 3000, function () {
console.log('Server started at http://localhost:%s', server.address().port);
-});
diff --git a/src/assets/scripts/charts/chartJS/index.js b/src/assets/scripts/charts/chartJS/index.js
index 58e0de1..1d02273 100755
--- a/src/assets/scripts/charts/chartJS/index.js
+++ b/src/assets/scripts/charts/chartJS/index.js
@@ -15,19 +15,19 @@ export default (function () {
new Chart(lineCtx, {
type: 'line',
data: {
- labels: ['January', 'February', 'March', 'April', 'May', 'June', 'July'],
+ labels: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul'],
datasets: [{
label : 'Series A',
backgroundColor : 'rgba(237, 231, 246, 0.5)',
borderColor : COLORS['deep-purple-500'],
- pointBackgroundColor : COLORS['deep-purple-700'],
+ pointBackgroundColor : COLORS['white'],
borderWidth : 2,
- data : [60, 50, 70, 60, 50, 70, 60],
+ data : [60, 50, 70, 85, 50, 70, 60],
}, {
label : 'Series B',
- backgroundColor : 'rgba(232, 245, 233, 0.5)',
- borderColor : COLORS['blue-500'],
- pointBackgroundColor : COLORS['blue-700'],
+ backgroundColor : 'rgba(189, 225, 242, 0.5)',
+ borderColor : COLORS['cyan-200'],
+ pointBackgroundColor : COLORS['white'],
borderWidth : 2,
data : [70, 75, 85, 70, 75, 85, 70],
}],
diff --git a/src/assets/scripts/charts/easyPieChart/index.js b/src/assets/scripts/charts/easyPieChart/index.js
index 4eea285..4a76898 100755
--- a/src/assets/scripts/charts/easyPieChart/index.js
+++ b/src/assets/scripts/charts/easyPieChart/index.js
@@ -4,6 +4,10 @@ import 'easy-pie-chart/dist/jquery.easypiechart.min.js';
export default (function () {
if ($('.easy-pie-chart').length > 0) {
$('.easy-pie-chart').easyPieChart({
+ lineWidth:7,
+ lineCap:"square",
+ scaleColor:false,
+ animate: 2500,
onStep(from, to, percent) {
this.el.children[0].innerHTML = `${Math.round(percent)} %`;
},
diff --git a/src/assets/scripts/charts/sparkline/index.js b/src/assets/scripts/charts/sparkline/index.js
index 6ef99d3..7d2abdd 100755
--- a/src/assets/scripts/charts/sparkline/index.js
+++ b/src/assets/scripts/charts/sparkline/index.js
@@ -10,7 +10,7 @@ export default (function () {
const drawSparklines = () => {
if ($('#sparklinedash').length > 0) {
- $('#sparklinedash').sparkline([0, 5, 6, 10, 9, 12, 4, 9], {
+ $('#sparklinedash').sparkline([0, 55, 45, 54, 29, 33, 32, 57, 33, 69, 35], {
type: 'bar',
height: '20',
barWidth: '3',
@@ -21,7 +21,7 @@ export default (function () {
}
if ($('#sparklinedash2').length > 0) {
- $('#sparklinedash2').sparkline([0, 5, 6, 10, 9, 12, 4, 9], {
+ $('#sparklinedash2').sparkline([0, 55, 45, 54, 29, 33, 32, 57, 33, 69, 35], {
type: 'bar',
height: '20',
barWidth: '3',
@@ -32,7 +32,7 @@ export default (function () {
}
if ($('#sparklinedash3').length > 0) {
- $('#sparklinedash3').sparkline([0, 5, 6, 10, 9, 12, 4, 9], {
+ $('#sparklinedash3').sparkline([0, 55, 45, 54, 29, 33, 32, 57, 33, 69, 35], {
type: 'bar',
height: '20',
barWidth: '3',
@@ -43,7 +43,7 @@ export default (function () {
}
if ($('#sparklinedash4').length > 0) {
- $('#sparklinedash4').sparkline([0, 5, 6, 10, 9, 12, 4, 9], {
+ $('#sparklinedash4').sparkline([0, 5, 15, 10, 9, 1, 4, 9, 3, 12, 7,3, 9, 5], {
type: 'bar',
height: '20',
barWidth: '3',
diff --git a/src/assets/scripts/vectorMaps/index.js b/src/assets/scripts/vectorMaps/index.js
index f8d4426..c583916 100755
--- a/src/assets/scripts/vectorMaps/index.js
+++ b/src/assets/scripts/vectorMaps/index.js
@@ -15,7 +15,7 @@ export default (function () {
+
+
diff --git a/src/assets/static/images/wisp_logo_white_vertical.svg b/src/assets/static/images/wisp_logo_white_vertical.svg
new file mode 100644
index 0000000..46b8833
--- /dev/null
+++ b/src/assets/static/images/wisp_logo_white_vertical.svg
@@ -0,0 +1,120 @@
+
+
+
diff --git a/src/assets/styles/spec/components/pageContainer.scss b/src/assets/styles/spec/components/pageContainer.scss
index 1c632e3..705f7b9 100755
--- a/src/assets/styles/spec/components/pageContainer.scss
+++ b/src/assets/styles/spec/components/pageContainer.scss
@@ -25,6 +25,13 @@
}
}
+.content-title{
+ font-weight: bolder;
+ font-size: 20pt;
+ color: $default-dark-wisp;
+ margin-top: 20px;
+}
+
// ---------------------------------------------------------
// @Main Content
// ---------------------------------------------------------
diff --git a/src/assets/styles/spec/components/sidebar.scss b/src/assets/styles/spec/components/sidebar.scss
index 838c16d..79d8c92 100755
--- a/src/assets/styles/spec/components/sidebar.scss
+++ b/src/assets/styles/spec/components/sidebar.scss
@@ -13,7 +13,8 @@
// ---------------------------------------------------------
.sidebar {
- background-color: $default-white;
+ //background-color: $default-white;
+background-image: linear-gradient(#fe4cb8, #793fcc);
bottom: 0;
overflow: hidden;
position: fixed;
@@ -75,7 +76,7 @@
.sidebar-inner {
.sidebar-logo {
border-bottom: 1px solid $border-color;
- padding: 0 20px;
+ padding: 0 40px;
}
.sidebar-menu {
@@ -125,10 +126,10 @@
// ---------------------------------------------------------
.sidebar-logo {
- border-bottom: 1px solid $border-color;
border-right: 1px solid $border-color;
line-height: 0;
- padding: 0 20px;
+
+ padding: 0 35%;
transition: all 0.2s ease;
a {
@@ -136,12 +137,13 @@
width: 100%;
.logo {
- background-position: center left;
+ background-position: center;
+ margin-top: 30px;
background-repeat: no-repeat;
- display: inline-block;
+ display: block;
min-height: calc(#{$header-height} - 1px);
width: 100%;
- width: 70px;
+ width: 80px;
}
.logo-text {
@@ -178,18 +180,20 @@
border-right: 1px solid $border-color;
height: calc(100vh - #{$header-height});
list-style: none;
- margin: 0;
+ margin: 0px;
overflow: auto;
- padding: 0;
+ padding: 10px;
position: relative;
.dropdown-toggle::after {
display: none;
}
+ //cerchietto vicino la voce selezionata
.sidebar-link {
&.active::before {
background: $md-blue-500;
+ background: white;
border-radius: 50%;
content: '';
display: block;
@@ -245,16 +249,18 @@
}
a {
- color: $default-text-color;
+ color: $default-white;
transition: all 0.3s ease;
-
+ font-weight: normal;
&:hover,
&:focus {
- color: $default-dark;
+ color: $default-white;
text-decoration: none;
-
+ font-weight: bold;
+
.icon-holder {
color: $default-info;
+ font-weight: bold;
}
}
}
@@ -334,6 +340,9 @@
.sidebar-logo {
border-bottom: 1px solid transparent;
padding: 0;
+ margin-left: auto;
+ margin-right: auto;
+
}
.sidebar-menu {
@@ -370,6 +379,8 @@
.sidebar-logo {
border-bottom: 1px solid $border-color;
padding: 0 20px;
+ margin-left: auto;
+ margin-right: auto;
}
.sidebar-menu {
diff --git a/src/assets/styles/spec/components/topbar.scss b/src/assets/styles/spec/components/topbar.scss
index 996acc6..3b385bf 100755
--- a/src/assets/styles/spec/components/topbar.scss
+++ b/src/assets/styles/spec/components/topbar.scss
@@ -68,6 +68,7 @@
.notifications {
position: relative;
+ font-size: 20px;
.counter {
background-color: $default-danger;
@@ -77,8 +78,14 @@
line-height: 1;
padding: 3px 5.5px;
position: absolute;
- right: 6px;
- top: 12px;
+ right: 2px;
+ top: 20px;
+ z-index: 1;
+ }
+ .top-notification{
+ z-index: 4;
+ position: relative;
+ background-color: $default-white;
}
.dropdown-menu {
@@ -144,6 +151,8 @@
}
.search-box {
+
+
.search-icon-close {
display: none;
}
@@ -168,13 +177,16 @@
input {
background-color: transparent;
- border: 0;
+ border: 1;
+ border-color: #501db9;
+ border-radius: 50px;
box-shadow: none;
- font-size: 18px;
+ font-size: 13px;
height: 40px;
- margin-top: 12px;
+ width: 350px;
+ margin-top: calc((#{$header-height} - 40px)/2);
outline: none;
- padding: 5px;
+ padding: 10px;
@include to($breakpoint-sm) {
width: 85px;
@@ -186,6 +198,38 @@
}
}
}
+ .btn-gradient {
+ color: #fff;
+ background-image: linear-gradient(to right,#ee38a4, #501db9);
+ border-radius: 50px;
+ border: none;
+ height: 40px;
+ width: 180px;
+ margin-top: calc((#{$header-height} - 40px)/2);
+ margin-left: 15px;
+ outline: none;
+ padding: 5px;
+ }
+
+ .nomit-logo-top{
+ width: 60px ;
+ margin-right: 0px;
+ }
+
+ .verticalLine{
+ border-left:1.5px solid $grey-400;
+ height:30px;
+ margin-top: calc((#{$header-height} - 30px)/2);
+ margin-left: 12px;
+ margin-right: 12px;
+ }
+
+ .logo-top-bar{
+ width: 70px;
+ margin-top: calc((#{$header-height} - 20px)/2);
+ margin-right: 55px;
+ margin-left: 16px;
+ }
}
// ---------------------------------------------------------
diff --git a/src/assets/styles/spec/settings/baseColors.scss b/src/assets/styles/spec/settings/baseColors.scss
index 70947ca..23f4cb3 100755
--- a/src/assets/styles/spec/settings/baseColors.scss
+++ b/src/assets/styles/spec/settings/baseColors.scss
@@ -67,6 +67,9 @@ $default-text-color : #72777a;
$default-warning : #fc0;
$default-white : #fff;
+$default-dark-wisp : #501db9;
+$default-light-wisp : #ee38a4;
+
// ---------------------------------------------------------
// @Inverted Colors
// ---------------------------------------------------------
@@ -83,7 +86,7 @@ $inverse-warning : lighten($default-warning, 45%);
$border-color : #e6ecf5;
$collapsed-size : 70px;
-$header-height : 65px;
+$header-height : 80px;
$offscreen-size : 280px;
$side-nav-dark : #313644;
$side-nav-dark-border : rgba(120, 130, 140, 0.3);
diff --git a/src/assets/styles/spec/utils/layout/utils/peers.scss b/src/assets/styles/spec/utils/layout/utils/peers.scss
index 1f08616..917564e 100755
--- a/src/assets/styles/spec/utils/layout/utils/peers.scss
+++ b/src/assets/styles/spec/utils/layout/utils/peers.scss
@@ -21,8 +21,8 @@
// overflow: hidden;
}
-.peers-greed > .peer,
-.peers-greed > .peers {
+.-greed > .peer,
+.-greed > .peers {
flex: 1 1 auto;
}
diff --git a/src/charts.html b/src/charts.html
old mode 100755
new mode 100644
index 6bd6c99..f9e74fa
--- a/src/charts.html
+++ b/src/charts.html
@@ -3,7 +3,8 @@
-
Charts
+
Dashboard
+
+
+
+
+
+
@@ -88,7 +92,20 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
-
- Moo Doe
- liked your cover image
+
+
+
+ Want to create your own customized data generator for your app...
-
-
- 7 mins ago
-
+
@@ -363,14 +319,19 @@
-
- Lee Doe
- commented on your video
+
+
+
+ Want to create your own customized data generator for your app...
-
-
- 10 mins ago
-
+
@@ -378,21 +339,21 @@
- View All Notifications
+ View All Email
+
- 3
+ 3
-
+
-
-
-
-
- Want to create your own customized data generator for your app...
+
+ John Doe
+ liked your post
-
+
+
+ 5 mins ago
+
@@ -424,19 +380,14 @@
-
-
-
- Want to create your own customized data generator for your app...
+
+ Moo Doe
+ liked your cover image
-
+
+
+ 7 mins ago
+
@@ -446,19 +397,14 @@
-
-
-
- Want to create your own customized data generator for your app...
+
+ Lee Doe
+ commented on your video
-
+
+
+ 10 mins ago
+
@@ -466,19 +412,26 @@
- View All Email
+ View All Notifications
+
+
+
+
+
+
-
-

-
- John Doe
+ Nomit Admin
+
+
+
+
+
+
+
+
+
+
+
+

+
+
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
jQuery Sparkline
-
-
-
-
-
- Spark Tristate
-
-
-
-
-
-
-
- Spark Discrete
-
-
-
-
-
-
-
- Spark Bullet
-
-
-
-
-
-
-
-
Spark Box
+
+
+
+
+
+
+
+
-
-
-
Easy Pie Charts
-
-
-
-
-
-
-
New Users
+
+
+
+
+
+
Successful Matches
-
-
+
+
+
+
+
+
New Ads (last month)
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+