eSales Media Git repositories
Browse code

Merge remote-tracking branch 'origin/master'

# Conflicts:
# files/themes/aldegott_2022/assets/css/inc/common.scss
# files/themes/aldegott_2022/assets/css/theme.scss

Benjamin Roth authored on21/02/2023 19:57:14
Showing9 changed files
History View file @5d26bca
1 1 
Binary files "a/files/pub/Bilder/Slider/Weinerlebnisse/Veranstaltungen/alde_gott_winzergenossenshaft_sasbachwalden_schwarzwald_kaese_wein_weitblick_\302\251peterbender.jpg" and "b/files/pub/Bilder/Slider/Weinerlebnisse/Veranstaltungen/alde_gott_winzergenossenshaft_sasbachwalden_schwarzwald_kaese_wein_weitblick_\302\251peterbender.jpg" differ
History View file @5d26bca
2 2 
Binary files "a/files/pub/Bilder/Wein & Sekt/Ausblick/alde_gott_winzergenossenshaft_sasbachwalden_schwarzwald_vinothek_ausblick_rotwein_\302\251peterbender.jpg" and "b/files/pub/Bilder/Wein & Sekt/Ausblick/alde_gott_winzergenossenshaft_sasbachwalden_schwarzwald_vinothek_ausblick_rotwein_\302\251peterbender.jpg" differ
History View file @5d26bca
3 3 
Binary files "a/files/pub/Bilder/Wein & Sekt/Einblick/alde_gott_winzergenossenshaft_sasbachwalden_schwarzwald_einblick_grauburgunder_kochen_wagners_\302\251peterbender.jpg" and "b/files/pub/Bilder/Wein & Sekt/Einblick/alde_gott_winzergenossenshaft_sasbachwalden_schwarzwald_einblick_grauburgunder_kochen_wagners_\302\251peterbender.jpg" differ
History View file @5d26bca
4 4 
Binary files "a/files/pub/Bilder/Weinerlebnisse/Weinproben/alde_gott_winzergenossenshaft_sasbachwalden_schwarzwald_vinothek_weitblick_rotwein_\302\251peterbender.jpg" and "b/files/pub/Bilder/Weinerlebnisse/Weinproben/alde_gott_winzergenossenshaft_sasbachwalden_schwarzwald_vinothek_weitblick_rotwein_\302\251peterbender.jpg" differ
files/pub/Videos/Start/Master_AldeGott_Imagefilm_2022_1080P.mp4
History View file @5d26bca
5 5 
new file mode 100644
6 6 
Binary files /dev/null and b/files/pub/Videos/Start/Master_AldeGott_Imagefilm_2022_1080P.mp4 differ
files/themes/aldegott_2022/assets/css/theme.scss
History View file @5d26bca
... ... 
@@ -1335,14 +1335,14 @@ html {
1335 1335 
   &.-text-pos-center-bottom {
1336 1336 
     .hero-content,
1337 1337 
     .slide-content {
1338 
-      @include text-position-wrapper(center,topbottom);
1338 
+      @include text-position-wrapper(center,bottom);
1339 1339 
     }
1340 1340 
   }
1341 1341
1342 1342 
   &.-text-pos-right-top {
1343 1343 
     .hero-content,
1344 1344 
     .slide-content {
1345 
-      @include text-position-wrapper(right,bottomtop);
1345 
+      @include text-position-wrapper(right,top);
1346 1346 
     }
1347 1347 
   }
1348 1348 
   &.-text-pos-right-bottomtop {
... ... 
@@ -1378,7 +1378,7 @@ html {
1378 1378 
   &.-text-pos-right-bottom {
1379 1379 
     .hero-content,
1380 1380 
     .slide-content {
1381 
-      @include text-position-wrapper(right,topbottom);
1381 
+      @include text-position-wrapper(right,bottom);
1382 1382 
     }
1383 1383 
   }
1384 1384 
 }
var/backups/backup__20221216092532.sql.gz
History View file @5d26bca
1385 1385 
deleted file mode 100644
1386 1386 
Binary files a/var/backups/backup__20221216092532.sql.gz and /dev/null differ
var/backups/backup__20221216185236.sql.gz
History View file @5d26bca
1387 1387 
deleted file mode 100644
1388 1388 
Binary files a/var/backups/backup__20221216185236.sql.gz and /dev/null differ
var/backups/backup__20221219141627.sql.gz
History View file @5d26bca
1389 1389 
new file mode 100644
1390 1390 
Binary files /dev/null and b/var/backups/backup__20221219141627.sql.gz differ