diff --git a/.gitea/workflows/build_docker.yaml b/.gitea/workflows/build_docker.yaml index 3b578dd5..c78ded69 100644 --- a/.gitea/workflows/build_docker.yaml +++ b/.gitea/workflows/build_docker.yaml @@ -3,7 +3,7 @@ run-name: ${{ gitea.actor }} Building Docker Image 🐳 on: [push] env: DOCKER_HOST: tcp://127.0.0.1:2375 - ASSETS: 41d6948 + ASSETS: b557522 jobs: test: diff --git a/public/css/fixes.css b/public/css/fixes.css index 070a2839..0a3dbb8b 100644 --- a/public/css/fixes.css +++ b/public/css/fixes.css @@ -143,11 +143,6 @@ ul.fancytree-container ul { opacity: 0; } -/* Fix ellipsis icon (top right) on small display with the light background */ -.closed-sidebar .app-header.header-text-light .app-header__menu .mobile-toggle-header-nav { - background: #343a40; -} - /* Hide tree when collapsed and show it when open */ .sidebar-mobile-open:hover #tree, /* small */ .fixed-sidebar #tree, /* wide */ @@ -181,47 +176,6 @@ ul.fancytree-container ul { font-size: 1.2rem; } -/* -.font-icon-wrapper { - text-align: center; - border: $gray-200 solid 1px; - @include border-radius($border-radius); - margin: 0 0 10px; - padding: 5px; - -&.font-icon-lg { - float: left; - padding: 10px; - text-align: center; - margin-right: 15px; - min-width: 64px; - -i { - font-size: $h1-font-size; -} -} - -&:hover { - background: $gray-100; - color: $primary; - -p { - color: $gray-600; -} -} - -i { - font-size: ($font-size-base * 1.5); -} - -p { - color: $gray-500; - font-size: calc($font-size-sm / 1.2); - margin: 5px 0 0; -} -} -*/ - /** Ensure our DN menu is at the top **/ .app-page-title .page-title-wrapper { align-items: start; diff --git a/resources/themes/architect/src/components/bootstrap5/_close.scss b/resources/themes/architect/src/components/bootstrap5/_close.scss index 4d6e73c1..f55798bc 100644 --- a/resources/themes/architect/src/components/bootstrap5/_close.scss +++ b/resources/themes/architect/src/components/bootstrap5/_close.scss @@ -3,10 +3,23 @@ // If you want the anchor version, it requires `href="#"`. // See https://developer.mozilla.org/en-US/docs/Web/Events/click#Safari_Mobile +.header-text-dark * .btn-close { + --#{$prefix}btn-close-color: #{$btn-close-color-dark}; + --#{$prefix}btn-close-bg: #{ escape-svg($btn-close-bg-dark) }; +} +.header-text-light *.btn-close { + --#{$prefix}btn-close-color: #{$btn-close-color-light}; + --#{$prefix}btn-close-bg: #{ escape-svg($btn-close-bg-light) }; +} + .btn-close { // scss-docs-start close-css-vars --#{$prefix}btn-close-color: #{$btn-close-color}; --#{$prefix}btn-close-bg: #{ escape-svg($btn-close-bg) }; + --#{$prefix}btn-close-color-light: #{$btn-close-color-light}; + --#{$prefix}btn-close-bg-light: #{ escape-svg($btn-close-bg-light) }; + --#{$prefix}btn-close-color-dark: #{$btn-close-color-dark}; + --#{$prefix}btn-close-bg-dark: #{ escape-svg($btn-close-bg-dark) }; --#{$prefix}btn-close-opacity: #{$btn-close-opacity}; --#{$prefix}btn-close-hover-opacity: #{$btn-close-hover-opacity}; --#{$prefix}btn-close-focus-shadow: #{$btn-close-focus-shadow}; diff --git a/resources/themes/architect/src/components/bootstrap5/_variables.scss b/resources/themes/architect/src/components/bootstrap5/_variables.scss index 5429c017..d680118c 100644 --- a/resources/themes/architect/src/components/bootstrap5/_variables.scss +++ b/resources/themes/architect/src/components/bootstrap5/_variables.scss @@ -1705,6 +1705,10 @@ $btn-close-padding-x: .25em !default; $btn-close-padding-y: $btn-close-padding-x !default; $btn-close-color: $black !default; $btn-close-bg: url("data:image/svg+xml,") !default; +$btn-close-color-dark: $black !default; +$btn-close-color-light: $gray-100 !default; +$btn-close-bg-dark: url("data:image/svg+xml,") !default; +$btn-close-bg-light: url("data:image/svg+xml,") !default; $btn-close-focus-shadow: $focus-ring-box-shadow !default; $btn-close-opacity: .5 !default; $btn-close-hover-opacity: .75 !default; diff --git a/resources/themes/architect/src/layout/header/_header-base.scss b/resources/themes/architect/src/layout/header/_header-base.scss index 71605860..4f4f9233 100644 --- a/resources/themes/architect/src/layout/header/_header-base.scss +++ b/resources/themes/architect/src/layout/header/_header-base.scss @@ -26,20 +26,6 @@ align-items: center; } - .header-menu { - .nav-link { - color: $gray-600; - - i { - color: $gray-500; - } - - &:hover { - color: $gray-900; - } - } - } - .app-header-right { align-items: center; display: flex; diff --git a/resources/themes/architect/src/layout/header/themes/_header-dark.scss b/resources/themes/architect/src/layout/header/themes/_header-dark.scss index 79286c86..c76ac2ec 100644 --- a/resources/themes/architect/src/layout/header/themes/_header-dark.scss +++ b/resources/themes/architect/src/layout/header/themes/_header-dark.scss @@ -114,14 +114,6 @@ } } - .app-header__mobile-menu { - .hamburger-inner, - .hamburger-inner::before, - .hamburger-inner::after { - background: $gray-800; - } - } - } } diff --git a/resources/themes/architect/src/layout/header/themes/_header-light.scss b/resources/themes/architect/src/layout/header/themes/_header-light.scss index 8aac88c4..89279168 100644 --- a/resources/themes/architect/src/layout/header/themes/_header-light.scss +++ b/resources/themes/architect/src/layout/header/themes/_header-light.scss @@ -128,7 +128,7 @@ .hamburger-inner, .hamburger-inner::before, .hamburger-inner::after { - background: $gray-800; + background: rgba(0, 0, 0, .8); } } diff --git a/resources/themes/architect/src/layout/responsive/_responsive-base.scss b/resources/themes/architect/src/layout/responsive/_responsive-base.scss index c54bf86d..2019e16b 100644 --- a/resources/themes/architect/src/layout/responsive/_responsive-base.scss +++ b/resources/themes/architect/src/layout/responsive/_responsive-base.scss @@ -173,6 +173,7 @@ & > .btn { background: rgba(255, 255, 255, .1); border-color: rgba(255, 255, 255, .1); + color: rgba(0, 0, 0, .9); } } @@ -448,4 +449,4 @@ } } } -} \ No newline at end of file +} diff --git a/resources/themes/architect/views/auth/login.blade.php b/resources/themes/architect/views/auth/login.blade.php index 731a2d4c..c38446a9 100644 --- a/resources/themes/architect/views/auth/login.blade.php +++ b/resources/themes/architect/views/auth/login.blade.php @@ -13,20 +13,20 @@
-
+
-
- {{ csrf_field() }} + + @csrf -
+

- @lang('Sign in to :server',['server'=>config('ldap.connections.default.name')]) + @lang('Sign in to') {{ config('server')->name }}

-
+
@@ -34,7 +34,9 @@ @lang('Please enter your '.strtolower(login_attr_description()))
+
+
@@ -43,21 +45,28 @@
-
-
@if (count($errors) > 0) -
- Whoops! Something went wrong?

-
    - @foreach ($errors->all() as $error) -
  • {{ $error }}
    • - @endforeach -
+
+
+
+ Whoops! Something went wrong?

+
    + @foreach ($errors->all() as $error) +
  • {{ $error }}
    • + @endforeach +
+
+
@endif -
- +
+ +
+
+
+ +
diff --git a/resources/themes/architect/views/layouts/partials/contentheader.blade.php b/resources/themes/architect/views/layouts/partials/contentheader.blade.php index dbfa256f..636927bf 100644 --- a/resources/themes/architect/views/layouts/partials/contentheader.blade.php +++ b/resources/themes/architect/views/layouts/partials/contentheader.blade.php @@ -6,11 +6,10 @@
@endif -
- @yield('page_title','Page Title') -
- @yield('page_subtitle','') -
+ + @yield('page_title','Page Title') +
+ @yield('page_subtitle','')
diff --git a/resources/views/fragment/dn/header.blade.php b/resources/views/fragment/dn/header.blade.php index cf221d76..1317de64 100644 --- a/resources/views/fragment/dn/header.blade.php +++ b/resources/views/fragment/dn/header.blade.php @@ -3,7 +3,7 @@ {!! $x ? $x->render(FALSE,TRUE) : sprintf('
',$o->icon() ?? "fas fa-info") !!} - {{ $o->getDn() }} + {{ $o->getDn() }}