Merge branch 'develop' into feature/shopping-ui

# Conflicts:
#	vue/src/locales/en.json
This commit is contained in:
vabene1111
2024-01-03 15:09:30 +01:00
30 changed files with 1098 additions and 803 deletions

View File

@@ -4457,28 +4457,28 @@ input[type=button].btn-block, input[type=reset].btn-block, input[type=submit].bt
}
.navbar-light .navbar-brand, .navbar-light .navbar-brand:focus, .navbar-light .navbar-brand:hover {
color: rgba(46, 46, 46, .9)
color: rgba(0, 0, 0, .9)
}
.navbar-light .navbar-nav .nav-link {
color: rgba(46, 46, 46, .5)
color: rgba(0, 0, 0, .5)
}
.navbar-light .navbar-nav .nav-link:focus, .navbar-light .navbar-nav .nav-link:hover {
color: rgba(46, 46, 46, .7)
color: rgba(0, 0, 0, .7)
}
.navbar-light .navbar-nav .nav-link.disabled {
color: rgba(46, 46, 46, .3)
color: rgba(0, 0, 0, .3)
}
.navbar-light .navbar-nav .active > .nav-link, .navbar-light .navbar-nav .nav-link.active, .navbar-light .navbar-nav .nav-link.show, .navbar-light .navbar-nav .show > .nav-link {
color: rgba(46, 46, 46, .9)
color: rgba(0, 0, 0, .9)
}
.navbar-light .navbar-toggler {
color: rgba(46, 46, 46, .5);
border-color: rgba(46, 46, 46, .1)
color: rgba(0, 0, 0, .5);
border-color: rgba(0, 0, 0, .1)
}
.navbar-light .navbar-toggler-icon {
@@ -4486,11 +4486,7 @@ input[type=button].btn-block, input[type=reset].btn-block, input[type=submit].bt
}
.navbar-light .navbar-text {
color: rgba(46, 46, 46, .5)
}
.navbar-light .navbar-text a, .navbar-light .navbar-text a:focus, .navbar-light .navbar-text a:hover {
color: rgba(46, 46, 46, .9)
color: rgba(0, 0, 0, .5)
}
.navbar-dark .navbar-brand, .navbar-dark .navbar-brand:focus, .navbar-dark .navbar-brand:hover {
@@ -4498,24 +4494,24 @@ input[type=button].btn-block, input[type=reset].btn-block, input[type=submit].bt
}
.navbar-dark .navbar-nav .nav-link {
color: hsla(0, 0%, 18%, .5)
color: rgba(255, 255, 255, .5)
}
.navbar-dark .navbar-nav .nav-link:focus, .navbar-dark .navbar-nav .nav-link:hover {
color: hsla(0, 0%, 18%, .75)
color: rgba(255, 255, 255, .75)
}
.navbar-dark .navbar-nav .nav-link.disabled {
color: hsla(0, 0%, 18%, .25)
color: rgba(255, 255, 255, .25)
}
.navbar-dark .navbar-nav .active > .nav-link, .navbar-dark .navbar-nav .nav-link.active, .navbar-dark .navbar-nav .nav-link.show, .navbar-dark .navbar-nav .show > .nav-link {
color: #2e2e2e
color: #FFF
}
.navbar-dark .navbar-toggler {
color: rgba(46, 46, 46, 0.5);
border-color: rgba(46, 46, 46, 0.5);
color: rgba(255, 255, 255, .5);
border-color: rgba(255, 255, 255, .1)
}
.navbar-dark .navbar-toggler-icon {
@@ -4523,7 +4519,7 @@ input[type=button].btn-block, input[type=reset].btn-block, input[type=submit].bt
}
.navbar-dark .navbar-text {
color: hsla(0, 0%, 18%, .5)
color: rgba(255, 255, 255, .5)
}
.navbar-dark .navbar-text a, .navbar-dark .navbar-text a:focus, .navbar-dark .navbar-text a:hover {

View File

@@ -4412,28 +4412,28 @@ input[type=button].btn-block, input[type=reset].btn-block, input[type=submit].bt
}
.navbar-light .navbar-brand, .navbar-light .navbar-brand:focus, .navbar-light .navbar-brand:hover {
color: rgba(46, 46, 46, .9)
color: rgba(0, 0, 0, .9)
}
.navbar-light .navbar-nav .nav-link {
color: rgba(46, 46, 46, .5)
color: rgba(0, 0, 0, .5)
}
.navbar-light .navbar-nav .nav-link:focus, .navbar-light .navbar-nav .nav-link:hover {
color: rgba(46, 46, 46, .7)
color: rgba(0, 0, 0, .7)
}
.navbar-light .navbar-nav .nav-link.disabled {
color: rgba(46, 46, 46, .3)
color: rgba(0, 0, 0, .3)
}
.navbar-light .navbar-nav .active > .nav-link, .navbar-light .navbar-nav .nav-link.active, .navbar-light .navbar-nav .nav-link.show, .navbar-light .navbar-nav .show > .nav-link {
color: rgba(46, 46, 46, .9)
color: rgba(0, 0, 0, .9)
}
.navbar-light .navbar-toggler {
color: rgba(46, 46, 46, .5);
border-color: rgba(46, 46, 46, .1)
color: rgba(0, 0, 0, .5);
border-color: rgba(0, 0, 0, .1)
}
.navbar-light .navbar-toggler-icon {
@@ -4441,11 +4441,11 @@ input[type=button].btn-block, input[type=reset].btn-block, input[type=submit].bt
}
.navbar-light .navbar-text {
color: rgba(46, 46, 46, .5)
color: rgba(0, 0, 0, .5)
}
.navbar-light .navbar-text a, .navbar-light .navbar-text a:focus, .navbar-light .navbar-text a:hover {
color: rgba(46, 46, 46, .9)
color: rgba(0, 0, 0, .9)
}
.navbar-dark .navbar-brand, .navbar-dark .navbar-brand:focus, .navbar-dark .navbar-brand:hover {
@@ -4453,24 +4453,24 @@ input[type=button].btn-block, input[type=reset].btn-block, input[type=submit].bt
}
.navbar-dark .navbar-nav .nav-link {
color: hsla(0, 0%, 5%, .5)
color: rgba(255, 255, 255, .5)
}
.navbar-dark .navbar-nav .nav-link:focus, .navbar-dark .navbar-nav .nav-link:hover {
color: hsla(0, 0%, 5%, .75)
color: rgba(255, 255, 255, .75)
}
.navbar-dark .navbar-nav .nav-link.disabled {
color: hsla(0, 0%, 5%, .25)
color: rgba(255, 255, 255, .25)
}
.navbar-dark .navbar-nav .active > .nav-link, .navbar-dark .navbar-nav .nav-link.active, .navbar-dark .navbar-nav .nav-link.show, .navbar-dark .navbar-nav .show > .nav-link {
color: #1E1E1E
color: #FFF
}
.navbar-dark .navbar-toggler {
color: rgba(46, 46, 46, 0.5);
border-color: rgba(46, 46, 46, 0.5);
color: rgba(255, 255, 255, .5);
border-color: rgba(255, 255, 255, .1)
}
.navbar-dark .navbar-toggler-icon {
@@ -4478,7 +4478,7 @@ input[type=button].btn-block, input[type=reset].btn-block, input[type=submit].bt
}
.navbar-dark .navbar-text {
color: hsla(0, 0%, 18%, .5)
color: rgba(255, 255, 255, .5)
}
.navbar-dark .navbar-text a, .navbar-dark .navbar-text a:focus, .navbar-dark .navbar-text a:hover {