diff --git a/Gulpfile.js b/Gulpfile.js index 00cce050..9b912c8e 100755 --- a/Gulpfile.js +++ b/Gulpfile.js @@ -101,7 +101,6 @@ gulp.task('babel-admin-opaljob-admin', function () { }); - gulp.task('babel-admin-opaljob', function () { }); diff --git a/assets/opalestate.css b/assets/opalestate.css index 44697e97..a03613df 100755 --- a/assets/opalestate.css +++ b/assets/opalestate.css @@ -3254,7 +3254,8 @@ p.stars.selected a:not(.active)::before { z-index: 999; min-width: 300px; top: 40px; - margin: 0 0 0 -194px; + margin: 0; + right: 0; padding: 30px; background-color: #FFF; box-shadow: 0px 2px 8px 4px rgba(0, 0, 0, 0.12); } @@ -3279,18 +3280,16 @@ p.stars.selected a:not(.active)::before { border-left: 20px solid transparent; border-right: 20px solid transparent; transform: translateX(-50%); - left: 50%; + right: 30px; top: -14px; } .opalestate-popup.active .popup-body { - display: block; } + display: block; + padding-top: 30px; + min-width: 300px; } .opalestate-popup.hover-align-right:hover .popup-body { display: block; - right: 0; padding-top: 30px; - min-width: 250px; } - .opalestate-popup.hover-align-right:hover .popup-body .account-dashboard-content:before { - right: -15px; - left: auto; } + min-width: 300px; } .opalestate-popup .popup-close { position: absolute; top: 10px; @@ -3693,8 +3692,15 @@ header#masthead { .navbar-left { display: flex; } -.opalestate-user-greeting .popup-head { - float: right; } +.opalestate-user-greeting .howdy { + float: right; + padding-left: 5px; + padding-top: 5px; + font-weight: 700; } + +.opalestate-user-greeting .opalestate-popup +.popup-head { + float: left; } .opalestate-user-greeting .popup-head a { color: #FFF; @@ -3720,9 +3726,9 @@ header#masthead { list-style: none; } .dashboard-navbar { - background-color: #FFF; - padding: 15px 30px; - border-bottom: 1px solid #ebebeb; + background-color: #1d2329; + padding: 20px 30px; + border-left: 1px solid #282d33; margin-bottom: 15px; } .dashboard-navbar ul { margin-bottom: 0; } @@ -3763,7 +3769,7 @@ header#masthead { background-color: #FFF !important; } .page-template-user-management .body-inner { - background-color: #f1f1f1; } + background-color: #f8f8f8; } .page-template-user-management .opalestate-popup .popup-body { padding: 0 !important; @@ -3773,15 +3779,13 @@ header#masthead { .page-template-user-management .opalestate-popup .popup-body .account-dashboard-content a:not(:hover) { color: #7e7e7e; } .page-template-user-management .opalestate-popup .popup-body .account-dashboard-content::before { - right: -15px; - left: auto; position: absolute; width: 0px; height: 0px; content: ""; z-index: 2; transform: translateX(-50%); - left: 50%; + right: 25%; top: -14px; border-bottom: 25px solid white; border-left: 20px solid transparent; @@ -3810,7 +3814,12 @@ header#masthead { .card-item { background-color: #FFF; - box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1); + box-shadow: 1px 1px 2px 0 rgba(0, 0, 0, 0.05); + border-radius: 5px; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + -ms-border-radius: 5px; + -o-border-radius: 5px; padding: 15px; } .card-item .heading { margin-bottom: 30px; @@ -3839,11 +3848,11 @@ header#masthead { .opalestate-user-management .property-submission-form .opalestate-box { margin-right: 0; } .opalestate-user-management .user-dasboard-sidebar { - background-color: #23282d; + background-color: #1d2329; min-height: 900px; position: fixed; left: 0; - width: 250px; + width: 251px; height: 100%; z-index: 100; top: 0px; } @@ -3860,20 +3869,18 @@ header#masthead { width: 100%; display: block; font-weight: 500; - color: #eee; } + color: #616a75; } .opalestate-user-management .account-links a i { margin-right: 6px; - color: #a0a5aa; } + color: #616a75; } .opalestate-user-management .account-links a:hover, .opalestate-user-management .account-links a:focus { - background-color: #0073aa; color: #fff; } .opalestate-user-management .account-links a:hover i, .opalestate-user-management .account-links a:focus i { - color: #00b9eb; } + color: #fff; } .opalestate-user-management .account-links li.active a { - background-color: #0073aa; color: #fff; } .opalestate-user-management .account-links li.active a i { - color: #00b9eb; } + color: #fff; } .opalestate-user-management .site-main { padding-top: 15px; } diff --git a/assets/scss/opalestate/_dashboard.scss b/assets/scss/opalestate/_dashboard.scss index 513c7136..33a27a06 100755 --- a/assets/scss/opalestate/_dashboard.scss +++ b/assets/scss/opalestate/_dashboard.scss @@ -79,8 +79,14 @@ } .opalestate-user-greeting { + .howdy { + float: right; + padding-left: 5px; + padding-top: 5px; + font-weight: 700; + }.opalestate-popup .popup-head { - float:right; + float:left; } .popup-head a { color:$white; @@ -111,15 +117,15 @@ } - .dashboard-navbar { - background-color: $white; - padding:$grid-gutter-width/2 $grid-gutter-width; - border-bottom:1px solid $border-color; - margin-bottom: $grid-gutter-width/2; +.dashboard-navbar { + background-color: #1d2329; + padding:20px $grid-gutter-width; + border-left: 1px solid #282d33; + margin-bottom: $grid-gutter-width/2; ul{ margin-bottom: 0; } - } +} .page-template-user-management { .opalestate-box{ @@ -171,7 +177,7 @@ .page-template-user-management { .body-inner { - background-color: #f1f1f1; + background-color: #f8f8f8; } .opalestate-popup .popup-body { @@ -185,15 +191,13 @@ } } &::before { - right: -15px; - left: auto; position: absolute; width: 0px; height: 0px; content: ""; z-index: 2; transform: translateX(-50%); - left: 50%; + right:25%; top: -14px; border-bottom: 25px solid rgb(255, 255, 255); border-left: 20px solid transparent; @@ -233,8 +237,8 @@ .card-item { background-color:$white; - //border:solid 1px $border-color; - box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.1); + box-shadow: 1px 1px 2px 0 rgba(0, 0, 0, 0.05); + @include border-radius(5px); padding:$padding-base; .heading { margin-bottom: $grid-gutter-width; @@ -273,11 +277,11 @@ } } .user-dasboard-sidebar { - background-color:#23282d; + background-color:#1d2329; min-height:900px; position:fixed; left:0; - width:250px; + width:251px; height:100%; z-index:100; top:0px; @@ -298,26 +302,26 @@ width:100%; display:block; font-weight:500 ; - color:#eee; + color:#616a75; i { margin-right:6px; - color:#a0a5aa; + color:#616a75; } &:hover, &:focus { - background-color:#0073aa; + //background-color:#0073aa; color:#fff; i { - color:#00b9eb; + color:#fff; } } } li.active { a { - background-color:#0073aa; + //background-color:#0073aa; color:#fff; i { - color:#00b9eb; + color:#fff; } } } diff --git a/assets/scss/opalestate/_elements.scss b/assets/scss/opalestate/_elements.scss index 6a9ec5ca..5c11f8d5 100755 --- a/assets/scss/opalestate/_elements.scss +++ b/assets/scss/opalestate/_elements.scss @@ -565,7 +565,8 @@ p.stars { z-index: 999; min-width: 300px; top: 40px; - margin:0 0 0 -194px; + margin:0; + right: 0; padding: $grid-gutter-width; background-color: $white; box-shadow: $box-shadow-base; @@ -587,25 +588,20 @@ p.stars { &:before { @include triangle(top, 0px, $white, 20px); transform: translateX(-50%); - left: 50%; + right:30px; top: -14px; } } } &.active .popup-body{ display: block; + padding-top:30px; + min-width: 300px; } &.hover-align-right:hover .popup-body { display:block; - right:0; padding-top:30px; - min-width: 250px; - .account-dashboard-content{ - &:before { - right:-15px; - left:auto; - } - } + min-width: 300px; } .popup-close{ diff --git a/package-lock.json b/package-lock.json index 0f5d9c4b..dbdebf31 100755 --- a/package-lock.json +++ b/package-lock.json @@ -1074,9 +1074,9 @@ } }, "caniuse-db": { - "version": "1.0.30000994", - "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000994.tgz", - "integrity": "sha512-7KjfAAhO0qJOs92z8lMWkcRA2ig7Ewv5SQSAy+dik8MFQCDSua+j4RbPFnGrXuOSFe/3RhmGr+68DxKZrbJQGg==" + "version": "1.0.30000997", + "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000997.tgz", + "integrity": "sha512-rK1Jo9VT5F/cJ333iLURdNXecYvVn3erJheoPAETrccJVw4w/557HfkNPADB5agHKjGuhJETf1l6lssvgbqA0Q==" }, "caseless": { "version": "0.12.0", @@ -1713,9 +1713,9 @@ "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" }, "electron-to-chromium": { - "version": "1.3.257", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.257.tgz", - "integrity": "sha512-EcKVmUeHCZelPA0wnIaSmpAN8karKhKBwFb+xLUjSVZ8sGRE1l3fst1zQZ7KJUkyJ7H5edPd4RP94pzC9sG00A==" + "version": "1.3.266", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.266.tgz", + "integrity": "sha512-UTuTZ4v8T0gLPHI7U75PXLQePWI65MTS3mckRrnLCkNljHvsutbYs+hn2Ua/RFul3Jt/L3Ht2rLP+dU/AlBfrQ==" }, "encodeurl": { "version": "1.0.2", @@ -1723,9 +1723,9 @@ "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=" }, "end-of-stream": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz", - "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==", + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.3.tgz", + "integrity": "sha512-cbNhPFS6MlYlWTGncSiDYbdqKhwWFy7kNeb1YSOG6K65i/wPTkLVCJQj0hXA4j0m5Da+hBWnqopEnu1FFelisQ==", "requires": { "once": "^1.4.0" } @@ -1751,6 +1751,18 @@ "ms": "2.0.0" } }, + "engine.io-parser": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.3.tgz", + "integrity": "sha512-6HXPre2O4Houl7c4g7Ic/XzPnHBvaEmN90vtRO9uLmwtRqQmTOw0QMevL1TOfL2Cpu1VzsaTmMotQgMdkzGkVA==", + "requires": { + "after": "0.8.2", + "arraybuffer.slice": "~0.0.7", + "base64-arraybuffer": "0.1.5", + "blob": "0.0.5", + "has-binary2": "~1.0.2" + } + }, "ws": { "version": "3.3.3", "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz", @@ -1764,14 +1776,14 @@ } }, "engine.io-client": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.3.2.tgz", - "integrity": "sha512-y0CPINnhMvPuwtqXfsGuWE8BB66+B6wTtCofQDRecMQPYX3MYUZXFNKDhdrSe3EVjgOu4V3rxdeqN/Tr91IgbQ==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.4.0.tgz", + "integrity": "sha512-a4J5QO2k99CM2a0b12IznnyQndoEvtA4UAldhGzKqnHf42I3Qs2W5SPnDvatZRcMaNZs4IevVicBPayxYt6FwA==", "requires": { "component-emitter": "1.2.1", "component-inherit": "0.0.3", - "debug": "~3.1.0", - "engine.io-parser": "~2.1.1", + "debug": "~4.1.0", + "engine.io-parser": "~2.2.0", "has-cors": "1.1.0", "indexof": "0.0.1", "parseqs": "0.0.5", @@ -1782,19 +1794,24 @@ }, "dependencies": { "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", "requires": { - "ms": "2.0.0" + "ms": "^2.1.1" } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" } } }, "engine.io-parser": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.3.tgz", - "integrity": "sha512-6HXPre2O4Houl7c4g7Ic/XzPnHBvaEmN90vtRO9uLmwtRqQmTOw0QMevL1TOfL2Cpu1VzsaTmMotQgMdkzGkVA==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.2.0.tgz", + "integrity": "sha512-6I3qD9iUxotsC5HEMuuGsKA0cXerGz+4uGcXQEkfBidgKf0amsjrrtwcbwK/nzpZBxclXlV7gGl9dgWvu4LF6w==", "requires": { "after": "0.8.2", "arraybuffer.slice": "~0.0.7", @@ -6383,6 +6400,18 @@ "yeast": "0.1.2" } }, + "engine.io-parser": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.3.tgz", + "integrity": "sha512-6HXPre2O4Houl7c4g7Ic/XzPnHBvaEmN90vtRO9uLmwtRqQmTOw0QMevL1TOfL2Cpu1VzsaTmMotQgMdkzGkVA==", + "requires": { + "after": "0.8.2", + "arraybuffer.slice": "~0.0.7", + "base64-arraybuffer": "0.1.5", + "blob": "0.0.5", + "has-binary2": "~1.0.2" + } + }, "socket.io-client": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.1.1.tgz", @@ -6432,16 +6461,16 @@ "integrity": "sha1-KoBeihTWNyEk3ZFZrUUC+MsH8Gs=" }, "socket.io-client": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.2.0.tgz", - "integrity": "sha512-56ZrkTDbdTLmBIyfFYesgOxsjcLnwAKoN4CiPyTVkMQj3zTUh0QAx3GbvIvLpFEOvQWu92yyWICxB0u7wkVbYA==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.3.0.tgz", + "integrity": "sha512-cEQQf24gET3rfhxZ2jJ5xzAOo/xhZwK+mOqtGRg5IowZsMgwvHwnf/mCRapAAkadhM26y+iydgwsXGObBB5ZdA==", "requires": { "backo2": "1.0.2", "base64-arraybuffer": "0.1.5", "component-bind": "1.0.0", "component-emitter": "1.2.1", - "debug": "~3.1.0", - "engine.io-client": "~3.3.1", + "debug": "~4.1.0", + "engine.io-client": "~3.4.0", "has-binary2": "~1.0.2", "has-cors": "1.1.0", "indexof": "0.0.1", @@ -6453,12 +6482,17 @@ }, "dependencies": { "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", "requires": { - "ms": "2.0.0" + "ms": "^2.1.1" } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" } } }, @@ -7057,9 +7091,9 @@ "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" }, "type": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/type/-/type-1.0.3.tgz", - "integrity": "sha512-51IMtNfVcee8+9GJvj0spSuFcZHe9vSib6Xtgsny1Km9ugyz2mbS08I3rsUIRYgJohFRFU1160sgRodYz378Hg==" + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz", + "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==" }, "ua-parser-js": { "version": "0.7.17",