Skip to content

Commit 57b6b8c

Browse files
leenooksleenooks
committed
Fix search close btn and other css fixes as need after upgrading to ArchitectUI v4
1 parent 4c09e76 commit 57b6b8c

File tree

11 files changed

+52
-94
lines changed

11 files changed

+52
-94
lines changed

‎.gitea/workflows/build_docker.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ run-name: ${{ gitea.actor }} Building Docker Image 🐳
33
on: [push]
44
env:
55
DOCKER_HOST: tcp://127.0.0.1:2375
6-
ASSETS: 41d6948
6+
ASSETS: b557522
77

88
jobs:
99
test:

‎public/css/fixes.css‎

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -143,11 +143,6 @@ ul.fancytree-container ul {
143143
opacity: 0;
144144
}
145145

146-
/* Fix ellipsis icon (top right) on small display with the light background */
147-
.closed-sidebar .app-header.header-text-light .app-header__menu .mobile-toggle-header-nav {
148-
background: #343a40;
149-
}
150-
151146
/* Hide tree when collapsed and show it when open */
152147
.sidebar-mobile-open:hover #tree, /* small */
153148
.fixed-sidebar #tree, /* wide */
@@ -181,47 +176,6 @@ ul.fancytree-container ul {
181176
font-size: 1.2rem;
182177
}
183178

184-
/*
185-
.font-icon-wrapper {
186-
text-align: center;
187-
border: $gray-200 solid 1px;
188-
@include border-radius($border-radius);
189-
margin: 0 0 10px;
190-
padding: 5px;
191-
192-
&.font-icon-lg {
193-
float: left;
194-
padding: 10px;
195-
text-align: center;
196-
margin-right: 15px;
197-
min-width: 64px;
198-
199-
i {
200-
font-size: $h1-font-size;
201-
}
202-
}
203-
204-
&:hover {
205-
background: $gray-100;
206-
color: $primary;
207-
208-
p {
209-
color: $gray-600;
210-
}
211-
}
212-
213-
i {
214-
font-size: ($font-size-base * 1.5);
215-
}
216-
217-
p {
218-
color: $gray-500;
219-
font-size: calc($font-size-sm / 1.2);
220-
margin: 5px 0 0;
221-
}
222-
}
223-
*/
224-
225179
/** Ensure our DN menu is at the top **/
226180
.app-page-title .page-title-wrapper {
227181
align-items: start;

‎resources/themes/architect/src/components/bootstrap5/_close.scss‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,23 @@
33
// If you want the anchor version, it requires `href="#"`.
44
// See https://developer.mozilla.org/en-US/docs/Web/Events/click#Safari_Mobile
55

6+
.header-text-dark * .btn-close {
7+
--#{$prefix}btn-close-color: #{$btn-close-color-dark};
8+
--#{$prefix}btn-close-bg: #{ escape-svg($btn-close-bg-dark) };
9+
}
10+
.header-text-light *.btn-close {
11+
--#{$prefix}btn-close-color: #{$btn-close-color-light};
12+
--#{$prefix}btn-close-bg: #{ escape-svg($btn-close-bg-light) };
13+
}
14+
615
.btn-close {
716
// scss-docs-start close-css-vars
817
--#{$prefix}btn-close-color: #{$btn-close-color};
918
--#{$prefix}btn-close-bg: #{ escape-svg($btn-close-bg) };
19+
--#{$prefix}btn-close-color-light: #{$btn-close-color-light};
20+
--#{$prefix}btn-close-bg-light: #{ escape-svg($btn-close-bg-light) };
21+
--#{$prefix}btn-close-color-dark: #{$btn-close-color-dark};
22+
--#{$prefix}btn-close-bg-dark: #{ escape-svg($btn-close-bg-dark) };
1023
--#{$prefix}btn-close-opacity: #{$btn-close-opacity};
1124
--#{$prefix}btn-close-hover-opacity: #{$btn-close-hover-opacity};
1225
--#{$prefix}btn-close-focus-shadow: #{$btn-close-focus-shadow};

‎resources/themes/architect/src/components/bootstrap5/_variables.scss‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1705,6 +1705,10 @@ $btn-close-padding-x: .25em !default;
17051705
$btn-close-padding-y: $btn-close-padding-x !default;
17061706
$btn-close-color: $black !default;
17071707
$btn-close-bg: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='#{$btn-close-color}'><path d='M.293.293a1 1 0 0 1 1.414 0L8 6.586 14.293.293a1 1 0 1 1 1.414 1.414L9.414 8l6.293 6.293a1 1 0 0 1-1.414 1.414L8 9.414l-6.293 6.293a1 1 0 0 1-1.414-1.414L6.586 8 .293 1.707a1 1 0 0 1 0-1.414z'/></svg>") !default;
1708+
$btn-close-color-dark: $black !default;
1709+
$btn-close-color-light: $gray-100 !default;
1710+
$btn-close-bg-dark: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='#{$btn-close-color-dark}'><path d='M.293.293a1 1 0 0 1 1.414 0L8 6.586 14.293.293a1 1 0 1 1 1.414 1.414L9.414 8l6.293 6.293a1 1 0 0 1-1.414 1.414L8 9.414l-6.293 6.293a1 1 0 0 1-1.414-1.414L6.586 8 .293 1.707a1 1 0 0 1 0-1.414z'/></svg>") !default;
1711+
$btn-close-bg-light: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='#{$btn-close-color-light}'><path d='M.293.293a1 1 0 0 1 1.414 0L8 6.586 14.293.293a1 1 0 1 1 1.414 1.414L9.414 8l6.293 6.293a1 1 0 0 1-1.414 1.414L8 9.414l-6.293 6.293a1 1 0 0 1-1.414-1.414L6.586 8 .293 1.707a1 1 0 0 1 0-1.414z'/></svg>") !default;
17081712
$btn-close-focus-shadow: $focus-ring-box-shadow !default;
17091713
$btn-close-opacity: .5 !default;
17101714
$btn-close-hover-opacity: .75 !default;

‎resources/themes/architect/src/layout/header/_header-base.scss‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,6 @@
2626
align-items: center;
2727
}
2828

29-
.header-menu {
30-
.nav-link {
31-
color: $gray-600;
32-
33-
i {
34-
color: $gray-500;
35-
}
36-
37-
&:hover {
38-
color: $gray-900;
39-
}
40-
}
41-
}
42-
4329
.app-header-right {
4430
align-items: center;
4531
display: flex;

‎resources/themes/architect/src/layout/header/themes/_header-dark.scss‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -114,14 +114,6 @@
114114
}
115115
}
116116

117-
.app-header__mobile-menu {
118-
.hamburger-inner,
119-
.hamburger-inner::before,
120-
.hamburger-inner::after {
121-
background: $gray-800;
122-
}
123-
}
124-
125117
}
126118

127119
}

‎resources/themes/architect/src/layout/header/themes/_header-light.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
.hamburger-inner,
129129
.hamburger-inner::before,
130130
.hamburger-inner::after {
131-
background: $gray-800;
131+
background: rgba(0, 0, 0, .8);
132132
}
133133
}
134134

‎resources/themes/architect/src/layout/responsive/_responsive-base.scss‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@
173173
& > .btn {
174174
background: rgba(255, 255, 255, .1);
175175
border-color: rgba(255, 255, 255, .1);
176+
color: rgba(0, 0, 0, .9);
176177
}
177178
}
178179

@@ -448,4 +449,4 @@
448449
}
449450
}
450451
}
451-
}
452+
}

‎resources/themes/architect/views/auth/login.blade.php‎

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,28 +13,30 @@
1313
<div class="mx-auto app-login-box col-md-8">
1414
<x-file-note file="login-note.html"/>
1515

16-
<div class="modal-dialog w-100 mx-auto">
16+
<div class="modal-dialog modal-lg">
1717
<div class="modal-content">
18-
<form class="needs-validation" novalidate method="post">
19-
{{ csrf_field() }}
18+
<form class="form-control needs-validation p-0" novalidate method="post">
19+
@csrf
2020

21-
<div class="modal-body">
21+
<div class="modal-body p-3">
2222
<div class="h5 modal-title text-center">
2323
<h4 class="mt-2">
2424
<div class="app-logo mx-auto mb-3"><img class="w-75" src="{{ url('images/logo-h-lg.png') }}"></div>
25-
<small>@lang('Sign in to <strong>:server</strong>',['server'=>config('ldap.connections.default.name')])</small>
25+
<small>@lang('Sign in to') <strong>{{ config('server')->name }}</strong></small>
2626
</h4>
2727
</div>
2828

29-
<div class="form-row">
29+
<div class="row">
3030
<div class="col-md-12 mt-3">
3131
<label class="mb-1">{{ login_attr_description() }}</label>
3232
<input name="{{ login_attr_name() }}" id="user" placeholder="" type="@if(in_array(login_attr_name(),['mail','email'])) email @else text @endif" class="form-control" required="">
3333
<div class="invalid-feedback">
3434
@lang('Please enter your '.strtolower(login_attr_description()))
3535
</div>
3636
</div>
37+
</div>
3738

39+
<div class="row">
3840
<div class="col-md-12 mt-2">
3941
<label class="mb-1">@lang('Password')</label>
4042
<input name="password" id="password" placeholder="" type="password" class="form-control" required>
@@ -43,21 +45,28 @@
4345
</div>
4446
</div>
4547
</div>
46-
</div>
4748

48-
<div class="modal-footer">
4949
@if (count($errors) > 0)
50-
<div class="alert alert-danger w-100">
51-
<strong>Whoops!</strong> Something went wrong?<br><br>
52-
<ul>
53-
@foreach ($errors->all() as $error)
54-
<li>{{ $error }}</li>
55-
@endforeach
56-
</ul>
50+
<div class="row">
51+
<div class="col">
52+
<div class="alert alert-danger m-3">
53+
<strong>Whoops!</strong> Something went wrong?<br><br>
54+
<ul>
55+
@foreach ($errors->all() as $error)
56+
<li>{{ $error }}</li>
57+
@endforeach
58+
</ul>
59+
</div>
60+
</div>
5761
</div>
5862
@endif
59-
<div class="float-end">
60-
<button class="btn btn-lg btn-primary">Login</button>
63+
</div>
64+
65+
<div class="modal-footer p-2 border-top">
66+
<div class="row">
67+
<div class="col float-end">
68+
<button class="btn btn-lg btn-primary">Login</button>
69+
</div>
6170
</div>
6271
</div>
6372
</form>

‎resources/themes/architect/views/layouts/partials/contentheader.blade.php‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@
66
<i class="@yield('page_icon','')"></i>
77
</div>
88
@endif
9-
<div>
10-
@yield('page_title','Page Title')
11-
<div class="page-title-subheading">
12-
@yield('page_subtitle','')
13-
</div>
9+
10+
@yield('page_title','Page Title')
11+
<div class="page-title-subheading">
12+
@yield('page_subtitle','')
1413
</div>
1514
</div>
1615

0 commit comments

Comments
 (0)