Skip to content

Commit

Permalink
Merge pull request #41 from studio-arrenberg/public
Browse files Browse the repository at this point in the history
Public into main
  • Loading branch information
j0hannr committed Feb 22, 2021
2 parents ae6a3a0 + 63a9008 commit 7933999
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 12 deletions.
2 changes: 1 addition & 1 deletion components/wetter.php
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
?>

<div class="card landscape shadow bg_blue" data-content-piece="Arrenberg Wetter">
<a href="<?php echo get_site_url(); ?>/projekte/arrenberg-farm/">
<a class="card-link" href="<?php echo get_site_url(); ?>/projekte/arrenberg-farm/">
<div class="content white-text">
<div class="emojis-top"><?php echo preg_replace('/\./', ',',$json_decoded->data[0]->values->avg[0]); ?>°C</div>
<h3 class="card-title">
Expand Down
2 changes: 1 addition & 1 deletion elements/map-card.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<!-- http://maps.apple.com/?ll=51.2492462,7.1303931,Infinite+Loop,Cupertino,California -->
<!-- http://maps.apple.com/?saddr=San+Jose&daddr=San+Francisco&dirflg=r
http://maps.apple.com/?daddr=51.2492462,7.1303931&dirflg=r -->
<a class="button card-button" href="http://maps.apple.com/?ll=<?php echo $location['lat'].",".$location['lng']."&dirflg=r";?>" target="_blank">In Karten öffenen</a>
<a class="button card-button" href="http://maps.apple.com/?daddr=<?php echo $location['lat'].",".$location['lng'];?>" target="_blank">In Karten öffenen</a>
<a class="button card-button" target="_blank" onclick="return map_confirm()" href="https://www.google.com/maps/dir/?api=1&origin=&destination=<?php echo $location['lat'].",".$location['lng']; ?>&travelmode=walking&basemap=roadmap">In Maps öffnen</a>
</div>
</div>
Expand Down
9 changes: 9 additions & 0 deletions pages/single-projekte.php
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
if ( ( is_user_logged_in() && $current_user->ID == $post->post_author ) ) {
?>
<a class="button is-style-outline" href="<?php get_permalink(); ?>?action=edit">Projekt bearbeiten</a>
<a class="button is-style-outline button-red" onclick="return confirm('Dieses Projekt entgültig löschen?')" href="<?php get_permalink(); ?>?action=delete">Projekt löschen</a>
<?php
}
?>
Expand Down Expand Up @@ -321,6 +322,14 @@ function copy() {

<?php

}
else if (isset($_GET['action']) && $_GET['action'] == 'delete' && is_user_logged_in() && $current_user->ID == $post->post_author) {


wp_delete_post(get_the_ID());

wp_redirect( get_site_url() );

}
else {

Expand Down
26 changes: 16 additions & 10 deletions style.css
Original file line number Diff line number Diff line change
Expand Up @@ -744,8 +744,6 @@ input[type="button"],
input[type="reset"],
input[type="submit"],
input[type="submit" i],
/* input:matches([type="button"], [type="submit"], [type="reset"]), */
/* input:matches([type="button"], [type="submit"], [type="reset"]), input[type="file"]::-webkit-file-upload-button */
input[type="file"]::-webkit-file-upload-button {
-webkit-appearance: none;
-moz-appearance: none;
Expand Down Expand Up @@ -4781,6 +4779,11 @@ a.card-link{
}



.landscape .pre-title {
color: #fff
}

.marker-container{
position: absolute;
height: 100%;
Expand All @@ -4803,11 +4806,9 @@ a.card-link{
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.07), 0 2px 4px rgba(0, 0, 0, 0.07),
0 4px 8px rgba(0, 0, 0, 0.07), 0 8px 16px rgba(0, 0, 0, 0.07),
0 16px 32px rgba(0, 0, 0, 0.07), 0 32px 64px rgba(0, 0, 0, 0.07);



}


.card .marker::before{
content: '';
z-index: 1;
Expand All @@ -4831,8 +4832,6 @@ a.card-link{
0 16px 32px rgba(0, 0, 0, 0.07), 0 32px 64px rgba(0, 0, 0, 0.07)
}



.card .marker img{
width: 100%;
height: 100%;
Expand All @@ -4849,9 +4848,17 @@ a.card-link{
}

@media (max-width: 782px) {

.card .marker::before{
width: 50px;
height: 50px;
}

.card .marker{
width: 50px;
height: 50px;
font-size: 2.5rem;

}

.card .marker::after{
Expand Down Expand Up @@ -5037,8 +5044,10 @@ a.card-link{
}

.card-footer{
margin-top: 5px;
width: 100%;
display: flex;
z-index: 1;
}

.card .card-button{
Expand Down Expand Up @@ -5160,9 +5169,6 @@ a.card-link{
}


.landscape .pre-title {
color: #fff
}
.landscape .card-title {
font-size: 2.8rem;
line-height: 3rem;
Expand Down

0 comments on commit 7933999

Please sign in to comment.