iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Styling optimizations (esp. alerts) and other fixes

This commit is contained in:
Igor Scheller 2021-08-09 23:32:24 +02:00
parent 2098946a6f
commit 231f481537
9 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
includes/sys_template.php
View File

@ -393,7 +393,7 @@ function render_table($columns, $rows, $data = true)
*/
function button($href, $label, $class = '')
{
if (!Str::contains(Str::remove(['btn-sm', 'btn-xl'], $class), 'btn-')) {
if (!Str::contains(str_replace(['btn-sm', 'btn-xl'], '', $class), 'btn-')) {
$class = 'btn-secondary' . ($class ? ' ' . $class : '');
}

3
resources/assets/themes/dark.scss
View File

@ -1,3 +1,6 @@
// All dark themes
$input-group-addon-color: #222;
$input-disabled-bg: #111;
$nav-tabs-link-active-color: #ADAFAE;
$alert-bg-scale: 70%;

4
resources/assets/themes/theme10.scss
View File

@ -27,7 +27,7 @@ $text-muted: $primary;
}
strong {
font-weight: lighter;
font-weight: normal;
color: $brand-primary;
text-shadow:
0 0 10px $brand-primary,
@ -40,7 +40,7 @@ $text-muted: $primary;
}
h1 {
font-weight: lighter;
font-weight: normal;
color: $brand-primary;
text-shadow: 0 0 10px $brand-primary;

2
resources/assets/themes/theme4.scss
View File

@ -12,6 +12,7 @@ $gray-lighter: #ADAFAE;
$brand-primary: rgb(0, 156, 139);
$primary: rgb(0, 156, 139);
$secondary: #424242;
$brand-success: rgb(141, 193, 35);
$success: rgb(141, 193, 35);
$brand-info: rgb(70, 71, 73);
@ -26,6 +27,7 @@ $text-muted: lighten($gray-light, 25%);
//== changed Scaffolding
$body-bg: #1d1d1b;
$alert-bg-scale: 0%;
//== changed Buttons

2
resources/assets/themes/theme6.scss
View File

@ -23,6 +23,8 @@ $danger: rgb(255, 102, 0);
$secondary: #424242;
$alert-bg-scale: 0%;
.badge.bg-warning, .progress-bar.progress-bar-warning {
color: #000;
}

2
resources/assets/themes/theme7.scss
View File

@ -147,7 +147,7 @@ $label-link-hover-color: $brand-primary;
$headings-small-color: $gray-light;
$alert-bg-scale: 0;
$alert-bg-scale: 0%;
$alert-border-scale: 0;
$alert-color-scale: 0;

4
resources/assets/themes/theme8.scss
View File

@ -26,7 +26,7 @@ $text-muted: $primary;
}
strong {
font-weight: lighter;
font-weight: normal;
color: $brand-primary;
text-shadow:
0 0 10px $brand-primary,
@ -39,7 +39,7 @@ $text-muted: $primary;
}
h1 {
font-weight: lighter;
font-weight: normal;
color: $brand-primary;
text-shadow: 0 0 10px $brand-primary;

4
resources/assets/themes/theme9.scss
View File

@ -27,7 +27,7 @@ $text-muted: $primary;
}
strong {
font-weight: lighter;
font-weight: normal;
color: $brand-primary;
text-shadow:
0 0 10px $brand-primary,
@ -40,7 +40,7 @@ $text-muted: $primary;
}
h1 {
font-weight: lighter;
font-weight: normal;
color: $brand-primary;
text-shadow: 0 0 10px $brand-primary;

3
resources/views/pages/design.twig
View File

@ -69,7 +69,8 @@
<ul>
{% for id,theme in themes %}
<li>
<a href="{{ url('design', {'theme': id}) }}">
<a href="{{ url('design', {'theme': id}) }}"
{%- if id == themeId %} class="text-info"{% endif %}>
{{ theme['name'] }}
</a>
</li>