+ composer updates

+ responsive logo in navigation
+ contact email in contact.blade.php
This commit is contained in:
Arno Kaimbacher 2020-04-23 15:16:21 +02:00
parent 5e63dc41f6
commit 85773609d7
6 changed files with 63 additions and 19 deletions

38
composer.lock generated
View File

@ -8,16 +8,16 @@
"packages": [ "packages": [
{ {
"name": "astrotomic/laravel-translatable", "name": "astrotomic/laravel-translatable",
"version": "v11.8.0", "version": "v11.8.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/Astrotomic/laravel-translatable.git", "url": "https://github.com/Astrotomic/laravel-translatable.git",
"reference": "8bd84a30381dfd9e2e1f24252b54279899959a7b" "reference": "2b7cfd6c48c5340b2d06d8edc8b6995580e64f65"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/Astrotomic/laravel-translatable/zipball/8bd84a30381dfd9e2e1f24252b54279899959a7b", "url": "https://api.github.com/repos/Astrotomic/laravel-translatable/zipball/2b7cfd6c48c5340b2d06d8edc8b6995580e64f65",
"reference": "8bd84a30381dfd9e2e1f24252b54279899959a7b", "reference": "2b7cfd6c48c5340b2d06d8edc8b6995580e64f65",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -69,7 +69,25 @@
"laravel", "laravel",
"translation" "translation"
], ],
"time": "2020-03-03T10:43:26+00:00" "funding": [
{
"url": "https://plant.treeware.earth/Astrotomic/laravel-translatable",
"type": "custom"
},
{
"url": "https://github.com/Gummibeer",
"type": "github"
},
{
"url": "https://issuehunt.io/r/astrotomic",
"type": "issuehunt"
},
{
"url": "https://opencollective.com/astrotomic",
"type": "open_collective"
}
],
"time": "2020-04-23T08:57:35+00:00"
}, },
{ {
"name": "davejamesmiller/laravel-breadcrumbs", "name": "davejamesmiller/laravel-breadcrumbs",
@ -3648,16 +3666,16 @@
}, },
{ {
"name": "yajra/laravel-datatables-oracle", "name": "yajra/laravel-datatables-oracle",
"version": "v9.9.0", "version": "v9.10.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/yajra/laravel-datatables.git", "url": "https://github.com/yajra/laravel-datatables.git",
"reference": "976e70a2f0b831725da335cd434a11ff73d3c854" "reference": "b0b9e2c37b5a17ca35bb2c6d3927bf6176393229"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/yajra/laravel-datatables/zipball/976e70a2f0b831725da335cd434a11ff73d3c854", "url": "https://api.github.com/repos/yajra/laravel-datatables/zipball/b0b9e2c37b5a17ca35bb2c6d3927bf6176393229",
"reference": "976e70a2f0b831725da335cd434a11ff73d3c854", "reference": "b0b9e2c37b5a17ca35bb2c6d3927bf6176393229",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -3715,7 +3733,7 @@
"jquery", "jquery",
"laravel" "laravel"
], ],
"time": "2020-03-03T16:29:31+00:00" "time": "2020-04-23T01:21:11+00:00"
}, },
{ {
"name": "zizaco/entrust", "name": "zizaco/entrust",

19
public/css/style.css vendored
View File

@ -274,6 +274,19 @@ section.normal {
color: #222; color: #222;
background-color: transparent; background-color: transparent;
} }
.header .logo {
line-height: 1em;
position: absolute;
padding: 15px;
-webkit-transition: all .15s ease-in-out;
-moz-transition: all .15s ease-in-out;
-ms-transition: all .15s ease-in-out;
-o-transition: all .15s ease-in-out;
transition: all .15s ease-in-out;
user-select: none;
}
.navigation.transparent { .navigation.transparent {
background-color: #fff; background-color: #fff;
border-bottom: 1px solid #dcdcdc; border-bottom: 1px solid #dcdcdc;
@ -340,6 +353,7 @@ section.normal {
color: white; color: white;
/* font-size: 1.7rem; */ /* font-size: 1.7rem; */
text-decoration: none; text-decoration: none;
/* padding:0 1em; */
/* border-right: 1px solid #28b183; */ /* border-right: 1px solid #28b183; */
} }
@ -824,7 +838,10 @@ there.
display: block; display: block;
text-align: left; text-align: left;
} }
.header .logo {
display: inline;
position: unset;
}
.navigation a.menu-icon { .navigation a.menu-icon {
display: inline; display: inline;
} }

BIN
public/images/gba_logo.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

View File

@ -76,9 +76,12 @@
<div class="twelve columns contact-us-details"> <div class="twelve columns contact-us-details">
<h3>Our Location</h3> <h3>Our Location</h3>
<h5> <h5>
Geologische Bundesanstalt <br />
Neulinggasse 38 <br /> Neulinggasse 38 <br />
1030 Wien <br /> 1030 Wien <br />
+43-1-7125674 <br /> <i class="fas fa-mobile-alt"></i> +43-1-7125674 <br />
<i class="fas fa-envelope-open-text"></i>
<a href="mailto:repository@geologie.ac.at"> repository[et]geologie.ac.at</a><br />
</h5> </h5>
<ul class="social-links"> <ul class="social-links">
<li> <li>

View File

@ -233,12 +233,15 @@
<!-- Contact Us --> <!-- Contact Us -->
<section data-sr class="container contact-us u-full-width u-max-full-width"> <section data-sr class="container contact-us u-full-width u-max-full-width">
<div class="row"> <div class="row">
<div class="four columns contact-us-details"> <div class="six columns contact-us-details">
<h3>Our Location</h3> <h3>Our Location</h3>
<h5> <h5>
Geologische Bundesanstalt <br />
Neulinggasse 38 <br /> Neulinggasse 38 <br />
1030 Wien <br /> 1030 Wien <br />
+43-1-7125674 <br /> <i class="fas fa-mobile-alt"></i> +43-1-7125674 <br />
<i class="fas fa-envelope-open-text"></i>
<a href="mailto:repository@geologie.ac.at"> repository[et]geologie.ac.at</a><br />
</h5> </h5>
<ul class="social-links"> <ul class="social-links">
<li> <li>

View File

@ -61,6 +61,9 @@
<a href="#" class="menu-icon {{ Route::currentRouteName() != 'frontend.home.index' ? 'active' : '' }}""> <a href="#" class="menu-icon {{ Route::currentRouteName() != 'frontend.home.index' ? 'active' : '' }}"">
<i class=" fa fa-bars"></i> <i class=" fa fa-bars"></i>
</a> </a>
<a href="https://www.geologie.ac.at/" target="_blank" class="logo">
<img src="/images/gba_logo.png" alt="Logo white" width="60" height="30">
</a>
<div class="container"> <div class="container">
<ul class="menu"> <ul class="menu">
<!-- <li><a href="#hero">Home</a></li> --> <!-- <li><a href="#hero">Home</a></li> -->