Skip to content

Commit 91807e7

Browse files
committed
Merge branch 'development'
2 parents f3ad436 + 363e772 commit 91807e7

7 files changed

Lines changed: 62 additions & 3 deletions

File tree

resources/css/components/_buttons.scss

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,11 +129,13 @@
129129

130130
background: transparent;
131131
border: 0;
132-
padding: 0;
132+
padding: 10px 12px;
133133
margin: 0;
134134

135135
display: inline-flex;
136136
align-items: center;
137+
justify-content: center;
138+
min-height: 44px;
137139

138140
color: $brand-red;
139141
cursor: pointer;

resources/css/components/_cards.scss

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,24 @@
146146
background-color: #eeeff9;
147147
}
148148

149+
.card.faq .card-header .btn.faq {
150+
min-height: 44px;
151+
width: 100%;
152+
padding: 12px 0;
153+
white-space: normal;
154+
border: 0;
155+
background: transparent;
156+
box-shadow: none;
157+
}
158+
159+
.card.faq .card-header .btn.faq:hover,
160+
.card.faq .card-header .btn.faq:focus,
161+
.card.faq .card-header .btn.faq:active {
162+
border: 0;
163+
background: transparent;
164+
box-shadow: none;
165+
}
166+
149167
.project-banner {
150168
position: relative;
151169
cursor: pointer;

resources/css/components/_dropdowns.scss

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44

55
.dropdown-item {
66
transition: all .2s ease-in-out;
7+
min-height: 44px;
8+
display: flex;
9+
align-items: center;
10+
padding: 10px 1.5rem;
711
}
812

913
.dropdown-item:focus, .dropdown-item:hover, .dropdown-item:active {
@@ -18,8 +22,9 @@
1822

1923
@media only screen and (max-width: 768px) {
2024
.dropdown-item {
21-
padding: .25rem 1.5rem;
25+
padding: 10px 1.5rem;
2226
text-align: center;
2327
font-size: 1.125rem !important;
28+
justify-content: center;
2429
}
2530
}

resources/css/components/_navbar.scss

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,25 @@ header.header .navbar .navbar-toggler .hamburger .line,
9696
width: 100%;
9797
}
9898

99+
.navbar-nav .nav-item {
100+
display: flex;
101+
align-items: center;
102+
}
103+
99104
.navbar-nav .nav-link {
100105
color: white !important;
101106
z-index: 2;
102107
text-align: center;
108+
display: inline-flex;
109+
align-items: center;
110+
justify-content: center;
111+
min-height: 44px;
112+
padding: 10px 12px;
113+
}
114+
115+
li.nav-btn .nav-link {
116+
min-height: 44px;
117+
padding: 10px 16px;
103118
}
104119

105120
/* ==========================================================================

resources/css/layout/_base.scss

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,3 +88,10 @@ hr.white {
8888
hr.header {
8989
border: 1px solid rgba($brand-red, 1) !important;
9090
}
91+
92+
.project-wide + .col-12 + hr + .col-12 a,
93+
.project-wide + .col-12 + hr + .col-12 p > a {
94+
display: inline-flex;
95+
align-items: center;
96+
min-height: 44px;
97+
}

resources/css/layout/_footer.scss

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,15 @@ footer p, footer a, footer .fa, footer i, footer li, footer svg, footer h6 {
1515
color: #e1e1e1;
1616
text-rendering: optimizeLegibility;
1717
}
18+
19+
footer p > a {
20+
display: inline-flex;
21+
align-items: center;
22+
min-height: 44px;
23+
}
24+
25+
footer a:hover,
26+
footer a:focus {
27+
color: #ffffff;
28+
text-decoration: underline;
29+
}

resources/views/front/faq/partials/category-loop.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
@foreach($category->faqs as $key => $faq)
55
<div class="card faq">
66
<div class="card-header" id="heading{{ $faq->id }}">
7-
<button class="faq btn text-left p-0" data-toggle="collapse"
7+
<button class="faq btn text-left d-block w-100" data-toggle="collapse"
88
data-target="#collapse{{ $faq->id }}" aria-expanded="true"
99
aria-controls="collapse{{ $faq->id }}">
1010
{{ $faq->question }}

0 commit comments

Comments
 (0)