diff --git a/composer.lock b/composer.lock index dc7791b..578b908 100755 --- a/composer.lock +++ b/composer.lock @@ -8,16 +8,16 @@ "packages": [ { "name": "astrotomic/laravel-translatable", - "version": "v11.8.0", + "version": "v11.8.1", "source": { "type": "git", "url": "https://github.com/Astrotomic/laravel-translatable.git", - "reference": "8bd84a30381dfd9e2e1f24252b54279899959a7b" + "reference": "2b7cfd6c48c5340b2d06d8edc8b6995580e64f65" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Astrotomic/laravel-translatable/zipball/8bd84a30381dfd9e2e1f24252b54279899959a7b", - "reference": "8bd84a30381dfd9e2e1f24252b54279899959a7b", + "url": "https://api.github.com/repos/Astrotomic/laravel-translatable/zipball/2b7cfd6c48c5340b2d06d8edc8b6995580e64f65", + "reference": "2b7cfd6c48c5340b2d06d8edc8b6995580e64f65", "shasum": "" }, "require": { @@ -69,7 +69,25 @@ "laravel", "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", @@ -3648,16 +3666,16 @@ }, { "name": "yajra/laravel-datatables-oracle", - "version": "v9.9.0", + "version": "v9.10.0", "source": { "type": "git", "url": "https://github.com/yajra/laravel-datatables.git", - "reference": "976e70a2f0b831725da335cd434a11ff73d3c854" + "reference": "b0b9e2c37b5a17ca35bb2c6d3927bf6176393229" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/yajra/laravel-datatables/zipball/976e70a2f0b831725da335cd434a11ff73d3c854", - "reference": "976e70a2f0b831725da335cd434a11ff73d3c854", + "url": "https://api.github.com/repos/yajra/laravel-datatables/zipball/b0b9e2c37b5a17ca35bb2c6d3927bf6176393229", + "reference": "b0b9e2c37b5a17ca35bb2c6d3927bf6176393229", "shasum": "" }, "require": { @@ -3715,7 +3733,7 @@ "jquery", "laravel" ], - "time": "2020-03-03T16:29:31+00:00" + "time": "2020-04-23T01:21:11+00:00" }, { "name": "zizaco/entrust", diff --git a/public/css/style.css b/public/css/style.css index b4d3226..5ac3b4e 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -274,6 +274,19 @@ section.normal { color: #222; 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 { background-color: #fff; border-bottom: 1px solid #dcdcdc; @@ -325,7 +338,7 @@ section.normal { display: block; float: left; text-align: center; - margin: 0; + margin: 0; } .navigation.transparent ul li a { @@ -339,7 +352,8 @@ section.normal { background:#3ad29f; /* green */ color: white; /* font-size: 1.7rem; */ - text-decoration: none; + text-decoration: none; + /* padding:0 1em; */ /* border-right: 1px solid #28b183; */ } @@ -824,7 +838,10 @@ there. display: block; text-align: left; } - + .header .logo { + display: inline; + position: unset; + } .navigation a.menu-icon { display: inline; } diff --git a/public/images/gba_logo.png b/public/images/gba_logo.png new file mode 100644 index 0000000..45b1299 Binary files /dev/null and b/public/images/gba_logo.png differ diff --git a/resources/views/frontend/home/contact.blade.php b/resources/views/frontend/home/contact.blade.php index f79bf32..44bf200 100644 --- a/resources/views/frontend/home/contact.blade.php +++ b/resources/views/frontend/home/contact.blade.php @@ -76,9 +76,12 @@

Our Location

+ Geologische Bundesanstalt
Neulinggasse 38
1030 Wien
- +43-1-7125674
+ +43-1-7125674
+ + repository[et]geologie.ac.at
@@ -160,7 +160,7 @@
-
+

Über Tethys RDR

Tethys RDR ist ein Datenverlag der Geologischen Bundesanstalt (GBA), @@ -233,12 +233,15 @@

-
+

Our Location

+ Geologische Bundesanstalt
Neulinggasse 38
1030 Wien
- +43-1-7125674
+ +43-1-7125674
+ + repository[et]geologie.ac.at