csmith1865/obscreen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 16 Wiki Activity

minor css

Browse Source
This commit is contained in:
jr-k 2024-07-11 01:20:28 +02:00
parent 1ff23b8bab
commit 5245010167
6 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/www/css/compiled/main.css
View File

File diff suppressed because one or more lines are too long

7
data/www/js/slideshow/contents.js
View File

@ -18,8 +18,11 @@ jQuery(document).ready(function ($) {
} }
}); });
$('.object-label-add').html($selectedOption.get(0).attributes['data-object-label'].value); const optionAttributes = $selectedOption.get(0).attributes;
$('.object-icon-add').attr('class', 'object-icon-add fa ' + $selectedOption.get(0).attributes['data-icon'].value) const color = optionAttributes['data-color'].value;
$('.object-label-add').html(optionAttributes['data-object-label'].value);
$('.object-icon-add').attr('class', 'object-icon-add fa ' + optionAttributes['data-icon'].value);
$('.tab-select .widget').attr('class', 'widget ' + ('border-' + color) + ' ' + color);
}; };
const initExplr = function () { const initExplr = function () {

5
data/www/scss/forms/_forms.scss
View File

@ -117,8 +117,8 @@ form {
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
background: rgba($seaBlue, .05);
border-bottom: 2px solid $seaBlue; border-bottom: 2px solid $seaBlue;
color: $seaBlue;
select { select {
border: none; border: none;
@ -126,11 +126,11 @@ form {
box-shadow: none; box-shadow: none;
padding: 10px 35px 10px 10px; padding: 10px 35px 10px 10px;
margin: 0; margin: 0;
color: inherit;
appearance: none; appearance: none;
-moz-appearance: none; -moz-appearance: none;
-webkit-appearance: none; -webkit-appearance: none;
text-align: left; text-align: left;
color: $seaBlue;
font-weight: bold; font-weight: bold;
cursor: pointer; cursor: pointer;
border-top-left-radius: 4px; border-top-left-radius: 4px;
@ -147,7 +147,6 @@ form {
i { i {
margin-left: 10px; margin-left: 10px;
margin-right: 0; margin-right: 0;
color: $seaBlue;
&.triangle { &.triangle {
margin-top: -4px; margin-top: -4px;

3
data/www/scss/pages/_content.scss
View File

@ -2,6 +2,9 @@
.view-content-list main .main-container { .view-content-list main .main-container {
.content-add-object-input {
margin-bottom: 6px;
}
} }
.view-content-edit main .main-container { .view-content-edit main .main-container {

6
data/www/scss/utils/_mixins.scss
View File

@ -33,13 +33,13 @@
@mixin generate-color-classes($color-map) { @mixin generate-color-classes($color-map) {
@each $name, $color in $color-map { @each $name, $color in $color-map {
.#{"#{$name}"} { .#{"#{$name}"} {
color: $color; color: $color !important;
} }
.bg-#{"#{$name}"} { .bg-#{"#{$name}"} {
background-color: $color; background-color: $color !important;;
} }
.border-#{"#{$name}"} { .border-#{"#{$name}"} {
border-color: $color; border-color: $color !important;;
} }
} }
} }

4
views/slideshow/contents/modal/add.jinja.html
View File

@ -18,7 +18,7 @@
<select name="type" id="content-add-type"> <select name="type" id="content-add-type">
{% for type in enum_content_type %} {% for type in enum_content_type %}
{% set input_type = enum_content_type.get_input(type) %} {% set input_type = enum_content_type.get_input(type) %}
<option value="{{ type.value }}" data-input="{{ input_type.value }}" data-object-label="{{ t('enum_content_type_'~type.value~'_object_label') }}" data-icon="{{ enum_content_type.get_fa_icon(type) }}"> <option value="{{ type.value }}" data-input="{{ input_type.value }}" data-object-label="{{ t('enum_content_type_'~type.value~'_object_label') }}" data-icon="{{ enum_content_type.get_fa_icon(type) }}" data-color="{{ enum_content_type.get_color_icon(type) }}">
{{ t(type) }} {{ t(type) }}
</option> </option>
{% endfor %} {% endfor %}
@ -30,7 +30,7 @@
<div class="form-group object-input"> <div class="form-group object-input">
<label for="" class="object-label-add">{{ l.slideshow_content_form_label_object }}</label> <label for="" class="object-label-add">{{ l.slideshow_content_form_label_object }}</label>
<div class="widget"> <div class="widget">
<input type="text" name="object" id="content-add-object-input-text" class="content-add-object-input"/> <input type="text" name="object" id="content-add-object-input-text" class="content-add-object-input" />
<label for="content-add-object-input-upload" class="btn-upload hidden"> <label for="content-add-object-input-upload" class="btn-upload hidden">
<input type="file" name="object" id="content-add-object-input-upload" class="content-add-object-input" disabled="disabled"/> <input type="file" name="object" id="content-add-object-input-upload" class="content-add-object-input" disabled="disabled"/>