merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5618 from deepaksinghgusain227/update-style-navbar-notification 

some style changes for notification and navbar
This commit is contained in:
Devansh 2022-01-21 18:55:20 +05:30 committed by GitHub
parent 4db3d89f09 b8c80b337b
commit d7a4d48e17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 606 additions and 510 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Admin/publishable/assets/css/admin.css vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Admin/publishable/assets/mix-manifest.json
View File

@ -1,4 +1,4 @@
{
"/js/admin.js": "/js/admin.js?id=94da304c8b02ad3ba649",
"/css/admin.css": "/css/admin.css?id=10abda80f2083f91a493"
"/css/admin.css": "/css/admin.css?id=025777d782eb9e678c8e"
}

40
packages/Webkul/Admin/src/Resources/assets/sass/_variables.scss vendored
View File

@ -24,9 +24,47 @@ $font-size-base: 14px;
$font-color: #3A3A3A;
$link-color: #a2a2a2;
$link-active-color: #a2a2a2;
//Switch Color
$dark-mode-switch-background: #000;
$dark-mode-switch-border: #24384c;
// Top nav color
$profile-info-icon: #3c41ff;
$role-text-color: #8e8e8e;
$profile-info-name: #000311;
$control-border-color: #c7c7c7;
// Navbar Color
$navbar-border-right-color: #ececec;
$submenu-shadow-color: #CDCECF;
$submenu-border-color: #eee;
$menu-item-hover-color: #f8f8f8;
$submenu-active-color: #e6e6e6;
//Notification Color
$notification-li-border-color: #ddd;
$pending-color: #f2c94c;
$processing-color: #399cdb;
$closed-color: #eb5757;
$read-background-color: #f6f6f6;
$read-all-text-color: #3a3a3a;
$menu-label-text-color: #B0BEC5;
// Dark Mode Color
$dark-mode-text-color: rgba(255,255,255,0.8);
$dark-mode-background-color: #02080d;
$dark-mode-read-color: rgba(255, 255, 255, 0.5);
$dark-mode-unread-color: rgba(255, 255, 255, 1);
$dark-mode-navtop-left-color: #071e37;
$dark-mode-notification-border-color: #232d36;
$dark-mode-left-menubar-background-color: rgba(1, 10, 20, .5);
$dark-mode-left-submenubar-active-background-color: #031425;
$dark-mode-left-submenubar-background-color: #020f1c;
$dark-mode-left-menubar-active-background-color: #051e37;
$dark-mode-body-background-color: #04101b;
$dark-mode-table-head-backgound-color: rgba(7, 30, 55,0.2);
$dark-mode-pagination-page-item-active-background-color:rgba(40, 69, 100, 0.2);
$dark-mode-pagination-page-item-active-border-color:rgba(2, 57, 83, 0.2);
$flatpickr-day-startRange-hover:rgb(5, 30, 55);

783
packages/Webkul/Admin/src/Resources/assets/sass/partials/_dark.scss vendored
View File

File diff suppressed because it is too large Load Diff

281
packages/Webkul/Admin/src/Resources/assets/sass/partials/_default.scss vendored
View File

@ -9,7 +9,7 @@ body {
background-color: $body-background;
}
.dark-mode-button{
.dark-mode-button {
background: $blue;
border: none;
padding: 10px 30px;
@ -38,18 +38,18 @@ body {
height: 60px;
display: flex;
justify-content: space-between;
align-items: center;
align-items: center;
.hamburger{
.hamburger {
display: block;
width: 48px;
height: 48px;
&::before{
&::before {
content: "";
width: 24px;
height: 24px;
background-color: rebeccapurple;
background-color: rebeccapurple;
background-image: url("../assets/image/Icon-Sortable.svg");
display: block;
}
@ -84,21 +84,21 @@ body {
margin-bottom: -10px;
display: block;
cursor: default;
color: #a2a2a2;
color: $link-color;
}
.profile-info-div{
.profile-info-div {
display: flex;
.profile-info-icon{
.profile-info-icon {
height: 31px;
width: 30px;
background: #3c41ff;
background: $profile-info-icon;
padding: 6px;
text-align: center;
font-size: 17px;
font-weight: 600;
color: #fff;
color: $white;
border-radius: 50%;
margin-right: 6px;
margin-top: 3px;
@ -112,13 +112,14 @@ body {
}
.name {
color: #000311;
color: $profile-info-name;
display: block;
text-align: left;
}
.role {
font-size: 12px;
color: #8e8e8e;
color: $role-text-color;
display: block;
text-align: left;
}
@ -144,13 +145,14 @@ body {
}
.name {
color: #000311;
color: $profile-info-name;
display: block;
text-align: left;
}
.role {
font-size: 12px;
color: #8e8e8e;
color: $role-text-color;
display: block;
text-align: left;
}
@ -171,12 +173,12 @@ body {
font-size: 15px;
cursor: pointer;
position: relative;
border-left: 1px solid $seprator;
border-left: 1px solid $seprator;
}
}
}
.navbar-left {
.navbar-left {
left: 0;
bottom: 0;
top: 60px;
@ -184,9 +186,9 @@ body {
width: 56px;
height: 100vh !important;
position: fixed;
background-color: $white;
border-right:1px solid #ececec;
background-color: $white;
border-right: 1px solid $navbar-border-right-color;
ul.menubar {
li.menu-item {
@ -194,7 +196,7 @@ body {
position: relative;
overflow: hidden;
> a {
>a {
padding: 5px 2px;
display: block;
color: $black;
@ -208,15 +210,16 @@ body {
.menu-label {
display: none;
color: #B0BEC5;
color: $menu-label-text-color;
}
.arrow-icon{
.arrow-icon {
display: none;
}
&.active,&:hover {
padding: 5px 2px;
&.active,
&:hover {
padding: 5px 2px;
}
}
@ -232,40 +235,42 @@ body {
top: 0;
left: 56px;
background-color: $white;
box-shadow: 2px 1px 3px #CDCECF;
border: 1px solid #eee;
box-shadow: 2px 1px 3px $submenu-shadow-color;
border: 1px solid $submenu-border-color;
border-left: 0;
border-radius: 0 3px 3px 0;
li.sub-menu-item {
a {
display: block;
padding: 8px 12px;
color: $black;
font-size: 12px;
}
}
}
}
&:hover {
overflow: visible;
background: $menu-item-hover-color;
ul.sub-menubar {
display: block;
.sub-menu-item {
.menu-label {
color: $black;
color: $black;
}
&.active {
background-color: #e6e6e6;
background-color: $submenu-active-color;
.menu-label {
color: $blue;
}
}
&:hover{
&:hover {
.menu-label {
color: $blue;
}
@ -278,7 +283,7 @@ body {
&.open {
width: 200px;
ul.menubar {
height: 86vh;
@ -309,7 +314,7 @@ body {
border-radius: 0;
box-shadow: unset;
border: 0;
li.sub-menu-item {
a {
padding-left: 52px;
@ -319,7 +324,7 @@ body {
&.active {
background: $white;
width: calc(100% - 1px);
width: 100%;
.menu-label {
color: $black;
@ -327,25 +332,27 @@ body {
ul.sub-menubar {
display: block;
background-color: $white;
border:none !important;
background-color: $menu-item-hover-color;
border: none !important;
.sub-menu-item {
.menu-label {
color: $black;
}
&.active, &:hover {
background-color: #e6e6e6;
&.active,
&:hover {
background-color: $submenu-border-color;
.menu-label {
color: #000 !important;
color: $black !important;
}
}
}
}
}
&:hover {
&:hover {
.menu-label {
color: $black;
}
@ -358,7 +365,7 @@ body {
padding: 12px;
cursor: pointer;
position: fixed;
bottom:0;
bottom: 0;
background-color: $white;
width: 56px;
}
@ -372,7 +379,7 @@ body {
.control {
background: $white;
border: 1px solid #c7c7c7;
border: 1px solid $control-border-color;
@include border-radius(3px);
width: 150px;
height: 36px;
@ -413,7 +420,7 @@ body {
.locale {
float: right;
color: #8e8e8e;
color: $role-text-color;
}
}
@ -478,7 +485,7 @@ body {
}
.content-container {
padding-left: 56px;
padding-left: 56px;
height: calc(100% - 60px);
width: 100%;
margin-top: 60px;
@ -488,7 +495,7 @@ body {
}
.content-wrapper {
margin-top:1px;
margin-top: 1px;
}
.content {
@ -500,8 +507,8 @@ body {
position: sticky;
top: 60px;
z-index: 3;
background-color: $white;
@include box-shadow(0 3px 6px 0 rgba(0, 0, 0, 0.05));
background-color: $white;
@include box-shadow(0 3px 6px 0 rgba(0, 0, 0, 0.05));
.page-title {
float: left;
@ -525,7 +532,7 @@ body {
.page-action {
float: right;
margin-top:-5px;
margin-top: -5px;
* {
display: inline-block;
@ -557,22 +564,22 @@ body {
}
}
.notif{
.notif {
background-color: $white;
li {
padding: 10px;
border-bottom: 1px solid #c7c7c7;
border-bottom: 1px solid $notification-li-border-color;
position: relative;
.notif-icon{
.notif-icon {
position: absolute;
height: 40px;
width: 40px;
left: 12px;
border-radius: 5px;
span {
position: absolute;
background-repeat: no-repeat;
@ -580,49 +587,49 @@ body {
top: 5px;
left: 5px;
}
}
}
.notif-content > a{
.notif-content>a {
text-decoration: none;
color: rgba(58, 58, 58, 1);
}
.pending{
background-color: #f2c94c;
.pending {
background-color: $pending-color;
}
.processing{
background-color: #399cdb;
.processing {
background-color: $processing-color;
}
.canceled{
.canceled {
background-color: $red;
}
.closed{
background-color: #eb5757;
.closed {
background-color: $closed-color;
}
.completed{
.completed {
background-color: $green;
}
.notif-content {
margin-left: 50px;
margin-left: 50px;
}
}
.read{
.read {
color: rgba(58, 58, 58, 0.5);
.notif-content > a{
.notif-content>a {
text-decoration: none;
color: rgba(58, 58, 58, 0.5);
}
}
}
}
.notification-badge{
.notification-badge {
position: absolute;
right: 13px;
top: 6px;
@ -635,77 +642,77 @@ body {
font-weight: 900;
}
#search-icon{
#search-icon {
position: absolute;
margin-top: 6px;
margin-left: 151px;
}
.notif-filter{
.notif-filter {
margin-top: 0px !important;
}
.read{
background-color: #e8e8e8;
.read {
background-color: $read-background-color;
}
.page-item.active {
.page-link {
color: $white !important;
}
.page-link {
color: $white !important;
}
}
.switch-dark{
.switch-dark {
width: 75%;
}
.read-all{
color: #3a3a3a;
background:none;
border:none;
.read-all {
color: $read-all-text-color;
background: none;
border: none;
}
#notif-title{
#notif-title {
height: 50px;
padding: 14px 10px;
border-bottom: 1px solid #c7c7c7;
border-bottom: 1px solid $control-border-color;
cursor: default;
}
@media only screen and (min-width: 768px){
.navbar-left{
@media only screen and (min-width: 768px) {
.navbar-left {
display: block;
}
}
.navbar-top {
.navbar-top {
.navbar-top-right {
.profile {
.profile-info{
display: inline-block;
.profile-info {
display: inline-block;
}
}
}
}
#search-icon{
#search-icon {
position: absolute;
margin-top: 6px;
margin-left: 151px;
}
.notif-filter{
.notif-filter {
margin-top: 0px !important;
}
.switch-dark{
.switch-dark {
width: 75%;
}
}
}
@media only screen and (max-width: 768px){
@media only screen and (max-width: 768px) {
h1 {
font-size: 18px;
@ -715,26 +722,26 @@ body {
padding: 4px 6px;
}
.navbar-top {
.navbar-top-left {
.hamburger{
.navbar-top {
.navbar-top-left {
.hamburger {
display: block;
}
}
.navbar-top-right {
.profile {
.profile-info{
.profile-info {
display: none;
}
}
}
}
.navbar-left{
.navbar-left {
left: 0px;
display: none;
}
@ -749,13 +756,13 @@ body {
bottom: 0px;
height: calc(100% - 60px);
width: 100%;
.aside-nav {
display: none;
}
.content {
.page-header {
.control-group {
@ -770,58 +777,58 @@ body {
.page-title {
float: left;
width: 100%;
.back-link {
.back-link {
margin-top: 0px;
margin-right: -1px;
height: 22px !important;
width: 22px !important;
}
}
}
.page-action {
position: absolute;
right: 10px;
margin-top: 0px;
margin-top: 0px;
.export-import{
.export-import {
margin-top: -15px;
}
* {
display: inline-block;
}
display: inline-block;
}
}
}
}
.content-wrapper {
margin-left: 0px;
margin-top:1px;
}
margin-top: 1px;
}
}
#search-icon{
#search-icon {
position: absolute;
margin-top: 6px;
right: 16px;
}
.notif-filter{
.notif-filter {
margin-top: 12px !important;
}
.switch-dark{
.switch-dark {
width: 100%;
}
}
@media only screen and (max-width: 411px){
@media only screen and (max-width: 411px) {
.content-container {
.content {
.page-header {
.control-group {
@ -833,15 +840,15 @@ body {
margin-top: 40px;
}
}
}
}
}
}
@media only screen and (max-width: 385px){
@media only screen and (max-width: 385px) {
.content-container {
.content {
.page-header {
.control-group {
@ -853,15 +860,15 @@ body {
margin-top: 40px;
}
}
}
}
}
}
@media only screen and (max-width: 320px){
@media only screen and (max-width: 320px) {
.content-container {
.content {
.page-header {
.control-group {
@ -873,6 +880,6 @@ body {
margin-top: 40px;
}
}
}
}
}
}
}

2
packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php
View File

@ -61,7 +61,7 @@
<div class="dropdown-toggle">
<i class="icon locale-icon-bold" style="height:26px;width:26px"></i>
<i class="icon locale-icon-bold"></i>
</div>
<div class="dropdown-list bottom-right">

2
packages/Webkul/Ui/publishable/assets/css/ui.css vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Ui/publishable/assets/mix-manifest.json
View File

@ -1,4 +1,4 @@
{
"/js/ui.js": "/js/ui.js?id=99de3c7f62be5fb50eaf",
"/css/ui.css": "/css/ui.css?id=cd88292a65dfcf07d879"
"/css/ui.css": "/css/ui.css?id=31bef3cce7a4a1b9e172"
}

2
packages/Webkul/Ui/src/Resources/assets/sass/main/_icons.scss vendored
View File

@ -169,6 +169,8 @@
.locale-icon-bold {
@extend %menu-properties;
background-image: url("../images/Local-Icon-bold.svg");
height: 26px;
width: 26px;
}
.store-icon {