Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies #506

Merged
merged 9 commits into from
Sep 25, 2021
Merged
Show file tree
Hide file tree
Changes from all 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
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ MAILER_DSN=smtp://localhost
# For a PostgreSQL database, use: "postgresql://db_user:[email protected]:5432/db_name?serverVersion=11&charset=utf8"
# IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml
# If you get "The metadata storage is not up to date, please run the sync-metadata-storage command to fix this issue.", append "&serverVersion=mariadb-10.5.8" to revert to provided driver
DATABASE_URL=mysql://localhost:4486/baupen_web?charset=UTF-8&user=symfony&password=password&serverVersion=mariadb-10.5.8
DATABASE_URL=mysql://localhost:4486/baupen_web?charset=UTF-8&user=symfony&password=password&serverVersion=mariadb-10.5.8&charset=utf8mb4
###< doctrine/doctrine-bundle ###

###> nelmio/cors-bundle ###
Expand Down
2 changes: 1 addition & 1 deletion .env.travis
Original file line number Diff line number Diff line change
@@ -1 +1 @@
DATABASE_URL=mysql://[email protected]:3306/baupen_web?charset=UTF-8&user=travis
DATABASE_URL=mysql://[email protected]:3306/baupen_web?charset=UTF-8&user=travis&charset=utf8mb4
4 changes: 2 additions & 2 deletions agnes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ data:
required: true
- path: assets/report/logo.png
required: true
# - path: var/transient/authorization/whitelists/developers.txt
# required: false
- path: var/transient/authorization/whitelists/developers.txt
required: false

scripts:
build:
Expand Down
20 changes: 11 additions & 9 deletions assets/css/popover.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use 'sass:math';

.popover-filter-sm .popover-body {
max-height: 22em;
min-width: 14em;
Expand Down Expand Up @@ -26,13 +28,13 @@

&::before {
border-top-color: $popover-arrow-outer-color;
border-width: $popover-arrow-height ($popover-arrow-width / 2) 0;
border-width: $popover-arrow-height math.div($popover-arrow-width, 2) 0;
bottom: 0;
}

&::after {
border-top-color: $popover-arrow-color;
border-width: $popover-arrow-height ($popover-arrow-width / 2) 0;
border-width: $popover-arrow-height math.div($popover-arrow-width, 2) 0;
bottom: $popover-border-width;
}
}
Expand All @@ -49,13 +51,13 @@

&::before {
border-right-color: $popover-arrow-outer-color;
border-width: ($popover-arrow-width / 2) $popover-arrow-height ($popover-arrow-width / 2) 0;
border-width: math.div($popover-arrow-width, 2) $popover-arrow-height math.div($popover-arrow-width, 2) 0;
left: 0;
}

&::after {
border-right-color: $popover-arrow-color;
border-width: ($popover-arrow-width / 2) $popover-arrow-height ($popover-arrow-width / 2) 0;
border-width: math.div($popover-arrow-width, 2) $popover-arrow-height math.div($popover-arrow-width, 2) 0;
left: $popover-border-width;
}
}
Expand All @@ -69,13 +71,13 @@

&::before {
border-bottom-color: $popover-arrow-outer-color;
border-width: 0 ($popover-arrow-width / 2) $popover-arrow-height ($popover-arrow-width / 2);
border-width: math.div($popover-arrow-width, 2) $popover-arrow-height math.div($popover-arrow-width, 2) 0;
top: 0;
}

&::after {
border-bottom-color: $popover-arrow-color;
border-width: 0 ($popover-arrow-width / 2) $popover-arrow-height ($popover-arrow-width / 2);
border-width: math.div($popover-arrow-width, 2) $popover-arrow-height math.div($popover-arrow-width, 2) 0;
top: $popover-border-width;
}
}
Expand All @@ -86,7 +88,7 @@
content: '';
display: block;
left: 50%;
margin-left: -$popover-arrow-width / 2;
margin-left: - math.div($popover-arrow-width, 2);
position: absolute;
top: 0;
width: $popover-arrow-width;
Expand All @@ -104,13 +106,13 @@

&::before {
border-left-color: $popover-arrow-outer-color;
border-width: ($popover-arrow-width / 2) 0 ($popover-arrow-width / 2) $popover-arrow-height;
border-width: math.div($popover-arrow-width, 2) 0 math.div($popover-arrow-width, 2) $popover-arrow-height;
right: 0;
}

&::after {
border-left-color: $popover-arrow-color;
border-width: ($popover-arrow-width / 2) 0 ($popover-arrow-width / 2) $popover-arrow-height;
border-width: math.div($popover-arrow-width, 2) 0 math.div($popover-arrow-width, 2) $popover-arrow-height;
right: $popover-border-width;
}
}
Expand Down
8 changes: 5 additions & 3 deletions assets/css/toggle.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use 'sass:math';

// Colors
$brand-primary: $primary;
$gray: $gray-800;
Expand Down Expand Up @@ -41,9 +43,9 @@ $toggle-default-size: 1.5rem;
background: #fff;
border-radius: $size * 0.75;
height: $size * 0.75;
left: ($size * 0.25) / 2;
left: math.div($size * 0.25, 2);
position: absolute;
top: ($size * 0.25) / 2;
top: math.div($size * 0.25, 2);
transition: left 0.25s;
width: $size * 0.75;
}
Expand All @@ -52,7 +54,7 @@ $toggle-default-size: 1.5rem;
transition: background-color 0.25s;

> .handle {
left: $size + (($size * 0.25) / 2);
left: $size + (math.div($size * 0.25, 2));
transition: left 0.25s;
}

Expand Down
2 changes: 1 addition & 1 deletion assets/js/vue/components/Form/MapForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<option :value="null">{{ $t('map.parent_not_set_name') }}</option>
<option disabled></option>
<option v-for="mapContainer in mapContainers" :value="mapContainer.entity['@id']"
:key="mapContainer.entity['@id']">
:key="mapContainer.entity['@id']" :disabled="mapContainer.entity === template">
{{ '&nbsp;'.repeat(mapContainer.level) }} {{ mapContainer.entity.name }}
</option>
</select>
Expand Down
2 changes: 2 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,13 @@
"symfony/flex": "^1.3.1",
"symfony/form": "^5.1",
"symfony/framework-bundle": "^5.1",
"symfony/intl": "^5.1",
"symfony/mailer": "^5.1",
"symfony/monolog-bundle": "^3.5",
"symfony/property-access": "^5.1",
"symfony/property-info": "^5.1",
"symfony/requirements-checker": "^1.1",
"symfony/security-core": "5.2.*",
"symfony/security-bundle": "^5.1",
"symfony/serializer": "^5.1",
"symfony/translation": "^5.1",
Expand Down
Loading