Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed phpmyfaq/assets/fonts/AtkinsonHyperlegible-Bold.ttf
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
5 changes: 5 additions & 0 deletions phpmyfaq/assets/scss/_global.scss
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,8 @@ body {
background-color: var(--bs-info);
border-color: var(--bs-info);
}

// required-asterisk
.pmf-required-asterisk {
color: var(--bs-danger);
}
129 changes: 87 additions & 42 deletions phpmyfaq/assets/scss/layout/_theme-switcher.scss
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,10 @@
color: var(--bs-light);
}
}

// required-asterisk
.pmf-required-asterisk {
color: var(--bs-danger);
}
// Dropdowns
.dropdown-menu {
background-color: var(--bs-gray-800);
Expand Down Expand Up @@ -252,8 +255,8 @@
// Global background with maximum contrast
html,
body {
background: #000000 !important;
color: #ffffff !important;
background: var(--bs-dark) !important;
color: var(--bs-light) !important;
}

//Theme Switcher Button for high contrast mode
Expand All @@ -267,14 +270,14 @@

&:hover {
color: var(--bs-dark) !important;
background: #ffffff !important;
background: var(--bs-light) !important;
opacity: 1;
}

&.active {
color: var(--bs-dark) !important;
opacity: 1;
background: #ffff00 !important;
background: var(--bs-primary) !important;
}

i {
Expand All @@ -287,31 +290,31 @@

// Navigation adjustments for high contrast mode
.text-bg-pmf-nav {
background-color: #000000 !important;
border: 2px solid #ffffff !important;
background-color: var(--bs-dark) !important;
border: 2px solid var(--bs-light) !important;
}

// Search form high contrast mode
.search {
.form-control {
background-color: #000000;
border: 2px solid #ffffff;
color: #ffffff;
background-color: var(--bs-dark);
border: 2px solid var(--bs-light);
color: var(--bs-light);

&:focus {
background-color: #000000;
border: 2px solid #ffff00;
color: #ffffff;
background-color: var(--bs-dark);
border: 2px solid var(--bs-primary);
color: var(--bs-light);
box-shadow: 0 0 0 0.25rem rgba(255, 255, 0, 0.5);
}

&::placeholder {
color: #ffffff;
color: var(--bs-light);
}
}

.bi-search {
color: #ffffff;
color: var(--bs-light);
}
}

Expand Down Expand Up @@ -348,84 +351,126 @@

// Links in high contrast mode - yellow for maximum visibility
a {
color: #ffff00;
color: var(--bs-primary);
text-decoration: underline;
font-size: 1.3rem;
font-weight: 800;

&:hover {
color: #ffff00;
color: var(--bs-dark);
text-decoration: none;
background-color: #333333;
background-color: var(--bs-primary);
border-radius: 4px;
}
}
//Logo link exception - yellow border on hover instead of background
#phpmyfaq-logo {
border: 5px solid transparent;
border-radius: 8px;
padding: 2px;
display: inline-block;

&:hover {
background-color: transparent !important;
text-decoration: none;
border-color: var(--bs-primary) !important;
}
}
#phpmyfaq-logo img {
filter: brightness(0) invert(1) saturate(2);
transform: scale(1.3);
display: block;
border: 3px solid var(--bs-primary);
border-radius: 6px;
padding: 3px;
}

#phpmyfaq-logo:hover img {
border-color: var(--bs-primary);
box-shadow: 0 0 0 2px var(--bs-primary);
}
// Heading style exceptions
h1.pmf-start-page,
.pmf-start-page.h1 {
background:var(--bs-primary);
-webkit-background-clip:text;
background-clip: text;
border: 3px dashed var(--bs-primary);
border-radius: 8px;
}

// Form elements
.form-control,
.form-select {
background-color: #ffff00;
border: 2px solid #ffff00;
color: #000000;
background-color: var(--bs-primary);
border: 2px solid var(--bs-primary);
color: var(--bs-dark);
font-size: 1.3rem;

&:focus {
background-color: #000000;
border: 2px solid #ffff00;
color: #ffffff;
background-color: var(--bs-dark);
border: 2px solid var(--bs-primary);
color: var(--bs-light);
}
}

// required-asterisk
.pmf-required-asterisk {
color: var(--bs-primary);
font-weight: bold;
}
// Dropdowns
.dropdown-menu {
background-color: #000000;
border: 2px solid #ffffff;
background-color: var(--bs-dark);
border: 2px solid var(--bs-light);
font-size: 1.3rem;

.dropdown-item {
color: #ffffff;
color: var(--bs-light);

&:hover,
&:focus {
background-color: #ffff00;
background-color: var(--bs-primary);
color: #000000;
}
}

.dropdown-divider {
border-color: #ffffff;
border-color: var(--bs-light);
}
}

// Buttons
.btn {
border: 2px solid #ffffff;
border: 2px solid var(--bs-light);
}

.btn-outline-primary {
color: #ffff00;
border: 2px solid #ffff00;
color: var(--bs-primary);
border: 2px solid var(--bs-primary);

&:hover {
background-color: #ffff00;
background-color: var(--bs-primary);
color: #000000;
}
}

.btn-primary {
background-color: #ffff00;
background-color: var(--bs-primary);
color: #000000;
border: 2px solid #ffff00;
border: 2px solid var(--bs-primary);

&:hover {
background-color: #ffff66;
border-color: #ffff66;
background-color: var(--bs-primary);
border-color: var(--bs-primary);
}
}

// Improve readability of badges
.badge {
border: 1px solid #ffffff;
border: 3px solid var(--bs-light);

&.bg-info {
background-color: #00ffff !important;
background-color: var(--bs-primary) !important;
color: #000000;
}

Expand Down Expand Up @@ -512,7 +557,7 @@

// Text muted still needs to be visible
.text-muted {
color: #cccccc !important;
color: #e0e0e0 !important;
}

// Navigation text
Expand All @@ -521,7 +566,7 @@
color: #ffffff !important;

&:hover {
background-color: #ffff00;
background-color: var(--bs-primary);
color: #000!important;
border-radius: 5px;
}
Expand Down
12 changes: 6 additions & 6 deletions phpmyfaq/assets/templates/default/add.twig
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
{% if id3_label is defined %}
<div class="row mb-2">
<label class="col-sm-3 form-control-label" for="name">{{ id3_label }}:
{% if id3_required == 'required' %}<span style="color: red"> *</span>{% endif %}
{% if id3_required == 'required' %}<span class="pmf-required-asterisk"> *</span>{% endif %}
</label>
<div class="col-sm-9">
<input type="text" class="form-control" name="name" id="name" value="{{ defaultContentName }}" {{ id3_required }}>
Expand All @@ -39,7 +39,7 @@
{% if id4_label is defined %}
<div class="row mb-2">
<label class="col-sm-3 form-control-label" for="email">{{ id4_label }}:
{% if id4_required == 'required' %}<span style="color: red"> *</span>{% endif %}
{% if id4_required == 'required' %}<span class="pmf-required-asterisk"> *</span>{% endif %}
</label>
<div class="col-sm-9">
<input type="email" class="form-control" name="email" id="email" value="{{ defaultContentMail }}" {{ id4_required }}>
Expand All @@ -50,7 +50,7 @@
{% if (id5_active == true) or (displayFullForm == true) %}
<div class="row mb-2">
<label class="col-sm-3 form-control-label" for="rubrik">{{ id5_label }}:
{% if id5_required == 'required' %}<span style="color: red"> *</span>{% endif %}
{% if id5_required == 'required' %}<span class="pmf-required-asterisk"> *</span>{% endif %}
</label>
<div class="col-sm-9">
<select name="rubrik" class="form-control" id="rubrik" multiple="multiple" size="5" {{ id5_required }}>
Expand All @@ -68,7 +68,7 @@
{% if id6_label is defined %}
<div class="row mb-2">
<label class="col-sm-3 form-control-label" for="question">{{ id6_label }}:
{% if id6_required == 'required' %}<span style="color: red"> *</span>{% endif %}
{% if id6_required == 'required' %}<span class="pmf-required-asterisk"> *</span>{% endif %}
</label>
<div class="col-sm-9">
<textarea class="form-control" cols="37" rows="3" name="question" id="question" {{ id6_required }} {{ readonly }}>
Expand All @@ -81,7 +81,7 @@
{% if (id7_active == true) or (displayFullForm == true) %}
<div class="row mb-2">
<label class="col-sm-3 form-control-label" for="answer">{{ id7_label }}:
{% if id7_required == 'required' %}<span style="color: red"> *</span>{% endif %}
{% if id7_required == 'required' %}<span class="pmf-required-asterisk"> *</span>{% endif %}
</label>
<div class="col-sm-9">
<textarea class="form-control" cols="37" rows="10" name="answer" id="answer" {{ id7_required }}></textarea>
Expand All @@ -92,7 +92,7 @@
{% if (id8_active == true) or (displayFullForm == true) %}
<div class="row mb-2">
<label class="col-sm-3 form-control-label" for="keywords">{{ id8_label }}:
{% if id8_required == 'required' %}<span style="color: red"> *</span>{% endif %}
{% if id8_required == 'required' %}<span class="pmf-required-asterisk"> *</span>{% endif %}
</label>
<div class="col-sm-9">
<input type="text" class="form-control" name="keywords" id="keywords" {{ id8_required }}>
Expand Down
8 changes: 4 additions & 4 deletions phpmyfaq/assets/templates/default/ask.twig
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

<div class="row mb-2">
<label class="col-sm-3 col-form-label" for="name">
{{ id3_label }}*:
{{ id3_label }}:<span class="pmf-required-asterisk"> *</span>
</label>
<div class="col-sm-9">
<input type="text" class="form-control" name="name" id="name" value="{{ defaultContentName }}" required>
Expand All @@ -41,7 +41,7 @@

<div class="row mb-2">
<label class="col-sm-3 col-form-label" for="email">
{{ id4_label }}*:
{{ id4_label }}:<span class="pmf-required-asterisk"> *</span>
</label>
<div class="col-sm-9">
<input type="email" class="form-control" name="email" id="email" value="{{ defaultContentMail }}" required>
Expand All @@ -51,7 +51,7 @@
{% if id5_label is defined %}
<div class="row mb-2">
<label class="col-sm-3 col-form-label" for="category">
{{ id5_label }}{% if id5_required == 'required' %}*{% endif %}:
{{ id5_label }}{% if id5_required == 'required' %}{% endif %}:<span class="pmf-required-asterisk"> *</span>
</label>
<div class="col-sm-9">
<select name="category" class="form-select" id="category" {{ id5_required }}>
Expand All @@ -70,7 +70,7 @@

<div class="row mb-2">
<label class="col-sm-3 col-form-label" for="question">
{{ id6_label }}*:
{{ id6_label }}:<span class="pmf-required-asterisk"> *</span>
</label>
<div class="col-sm-9">
<textarea class="form-control" cols="45" rows="5" name="question" id="question" required></textarea>
Expand Down