From ae69319f2ffb5eb83c69f4cc174c3651667ec291 Mon Sep 17 00:00:00 2001 From: Lieu Le Date: Fri, 27 Sep 2019 11:05:45 +0700 Subject: [PATCH] update --- assets/opalestate.css | 50 ++++++++++++++++--------- assets/scss/opalestate/_dashboard.scss | 51 +++++++++++++++++--------- templates/user-management.php | 2 +- templates/user/profile.php | 15 ++++++-- 4 files changed, 77 insertions(+), 41 deletions(-) diff --git a/assets/opalestate.css b/assets/opalestate.css index 70c58dfd..b07af0a3 100755 --- a/assets/opalestate.css +++ b/assets/opalestate.css @@ -3702,14 +3702,12 @@ header#masthead { display: flex; } .opalestate-user-greeting .howdy { - float: right; - padding-left: 5px; + padding-right: 5px; padding-top: 5px; font-weight: 700; } -.opalestate-user-greeting .opalestate-popup -.popup-head { - float: left; } +.opalestate-user-greeting .popup-head { + float: right; } .opalestate-user-greeting .popup-head a { color: #FFF; @@ -3733,11 +3731,28 @@ header#masthead { padding: 0; margin: 0; list-style: none; } + .opalestate-user-greeting ul li:hover .count { + background-color: #2f73e9; + color: #FFF; } + +.opalestate-user-greeting .count { + color: #2f73e9; + padding: 3px 8px; + font-size: 11px; + min-width: 20px; + text-align: center; + background-color: #ebebeb; + border-radius: 50%; + -webkit-border-radius: 50%; + -moz-border-radius: 50%; + -ms-border-radius: 50%; + -o-border-radius: 50%; + margin-left: 5px; } .dashboard-navbar { background-color: #1d2329; padding: 20px 30px; - border-left: 1px solid #282d33; + border-left: 1px solid #181c21; margin-bottom: 15px; } .dashboard-navbar ul { margin-bottom: 0; } @@ -3794,7 +3809,7 @@ header#masthead { content: ""; z-index: 2; transform: translateX(-50%); - right: 25%; + right: -15px; top: -14px; border-bottom: 25px solid white; border-left: 20px solid transparent; @@ -3894,17 +3909,15 @@ header#masthead { background-color: #1d2329; min-height: 900px; position: fixed; - left: 0; width: 251px; height: 100%; z-index: 100; - top: 0px; } + top: 0px; + left: 0; + border-right: 1px solid #21272e; } .opalestate-user-management .user-dasboard-sidebar .navbar-brand { text-align: center; - margin: 50px 0 60px 0; } - .opalestate-user-management .user-dasboard-sidebar .navbar-brand .custom-logo-link { - padding: 60px 30px; - border-bottom: 1px solid rgba(255, 255, 255, 0.1); } + margin: 30px 0; } .opalestate-user-management .user-dasboard-sidebar .user-dasboard-sidebar-inner { padding-top: 20px; } .opalestate-user-management .navbar-brand { @@ -3948,15 +3961,16 @@ header#masthead { -o-border-radius: 50%; margin-left: 5px; } .opalestate-user-management .account-links a:hover, .opalestate-user-management .account-links a:focus { - color: #fff; } + color: #FFF; } .opalestate-user-management .account-links a:hover i, .opalestate-user-management .account-links a:focus i { - color: #fff; } + color: #FFF; } .opalestate-user-management .account-links li.active a { - color: #fff; } + color: #FFF; } .opalestate-user-management .account-links li.active a i { - color: #fff; } + color: #FFF; } .opalestate-user-management .site-main { - padding-top: 15px; } + padding-top: 60px; + padding-bottom: 60px; } .opalestate-my-reviews .commentlist { margin: 0; } diff --git a/assets/scss/opalestate/_dashboard.scss b/assets/scss/opalestate/_dashboard.scss index fb40448d..febbd45b 100755 --- a/assets/scss/opalestate/_dashboard.scss +++ b/assets/scss/opalestate/_dashboard.scss @@ -81,13 +81,12 @@ .opalestate-user-greeting { .howdy { - float: right; - padding-left: 5px; + padding-right: 5px; padding-top: 5px; font-weight: 700; - }.opalestate-popup + } .popup-head { - float:left; + float:right; } .popup-head a { color:$white; @@ -114,6 +113,25 @@ padding:0; margin :0 ; list-style:none; + li { + &:hover { + .count { + background-color:$primary; + color:$white; + } + } + } + } + + .count { + color:$primary; + padding:3px 8px; + font-size: 11px; + min-width: 20px; + text-align: center; + background-color: $border-color; + @include border-radius(50%); + margin-left:5px; } } @@ -121,7 +139,7 @@ .dashboard-navbar { background-color: #1d2329; padding:20px $grid-gutter-width; - border-left: 1px solid #282d33; + border-left: 1px solid #181c21; margin-bottom: $grid-gutter-width/2; ul{ margin-bottom: 0; @@ -198,7 +216,7 @@ content: ""; z-index: 2; transform: translateX(-50%); - right:25%; + right:-15px; top: -14px; border-bottom: 25px solid rgb(255, 255, 255); border-left: 20px solid transparent; @@ -321,18 +339,15 @@ background-color:#1d2329; min-height:900px; position:fixed; - left:0; width:251px; height:100%; z-index:100; top:0px; + left:0; + border-right:1px solid #21272e; .navbar-brand { text-align: center; - margin: 50px 0 60px 0; - .custom-logo-link { - padding: $grid-gutter-width*2 $grid-gutter-width; - border-bottom:1px solid rgba(255,255,255, 0.1); - } + margin: $grid-gutter-width 0; } .user-dasboard-sidebar-inner{ padding-top:20px; @@ -385,26 +400,26 @@ &:hover, &:focus { //background-color:#0073aa; - color:#fff; + color:$white; i { - color:#fff; + color:$white; } } } li.active { a { //background-color:#0073aa; - color:#fff; + color:$white; i { - color:#fff; + color:$white; } } } } .site-main { - padding-top:$padding-base; - $padding-bottom:$padding-base; + padding-top: $grid-gutter-width*2; + padding-bottom: $grid-gutter-width*2; } } diff --git a/templates/user-management.php b/templates/user-management.php index 29c72a8d..3ed7d7e1 100755 --- a/templates/user-management.php +++ b/templates/user-management.php @@ -66,7 +66,7 @@ if ( $current_user->display_name !== $current_user->user_login ) {
-
+
diff --git a/templates/user/profile.php b/templates/user/profile.php index 8e5a8c06..be1bbf02 100755 --- a/templates/user/profile.php +++ b/templates/user/profile.php @@ -20,7 +20,7 @@ if ( ! defined( 'ABSPATH' ) ) { -
+
({$current_user->user_login})"; } ?> -

 

+
+ +   + +
-
+
-

+
+ + +