Commit f4b88f2d authored by Jan-Philipp Stauffert's avatar Jan-Philipp Stauffert
Browse files

Fix image locations

parent 480e513a
{
"beautify.ignore": ["assets/css/*.scss"]
"beautify.ignore": ["assets/css/*.scss", "_layouts/*"]
}
\ No newline at end of file
......@@ -10,9 +10,9 @@
align-items: center;
justify-content: space-between;
">
<a href="https://www.youtube.com/user/hciwuerzburg"><img src = "{{ site.baseurl }}/youtube.svg" style="max-width: 61px; margin: 7px 7px 0 1px; opacity: 0.8;"/></a>
<a href="https://www.facebook.com/hciwuerzburg">{% include image src="general/facebook.png" sizes="(min-width: 1180px) 100px, (min-width: 980px) 100px, (min-width: 740px) 100px, 100px" style="max-width:97px; margin: 7px 7px 0 1px; opacity: 0.8;" %}</a>
<a href="https://twitter.com/hci_wurzburg">{% include image src="general/twitter.png" sizes="(min-width: 1180px) 100px, (min-width: 980px) 100px, (min-width: 740px) 100px, 100px" style="max-width: 54px; margin: 7px 60px 0 -8px; opacity: 0.8;" %}</a>
<a href="https://www.youtube.com/user/hciwuerzburg"><img src="{{ site.baseurl }}/assets/images/youtube.svg" style="max-width: 61px; margin: 7px 7px 0 1px; opacity: 0.8;"/></a>
<a href="https://www.facebook.com/hciwuerzburg"><img src="{{ site.baseurl }}/assets/images/facebook.png" style="max-width:97px; margin: 7px 7px 0 1px; opacity: 0.8;" /></a>
<a href="https://twitter.com/hci_wurzburg"><img src="{{ site.baseurl }}/assets/images/twitter.png" style="max-width: 54px; margin: 7px 60px 0 -8px; opacity: 0.8;" /></a>
</div>
</div>
<div>
......@@ -33,7 +33,7 @@
How to Find Us
</div>
<a href="https://wueaddress.uni-wuerzburg.de/search/map/3511">
{% include image src="general/map.jpg" dimension="wide" %}
{% imgsrcset src="general/map.jpg" dimension="wide" %}
</a>
</div>
</div>
......
......@@ -33,7 +33,7 @@
<meta property="og:title" content="{{ page.title | replace: '"', "'" }}">
{% endif %}
{% if page.image %}
<meta property="og:image" content="{{ site.url }}/bundled/images/{{ site.widths | first }}/{{ page.image }}">
<meta property="og:image" content="{{ site.url }}/assets/images/{{ site.widths | first }}/{{ page.image }}">
{% endif %}
{% if page.teaser %}
<meta property="og:description" content="{{ page.teaser | replace: '"', "'" }}">
......@@ -45,13 +45,43 @@
<header role="banner" class="page-header">
<div class="page-header__logo">
<a class="page-header__logo-link" title="Zur Startseite" href="http://www.uni-wuerzburg.de/startseite/">
{% include image src="general/uni-wuerzburg-logo.svg" class="page-header__logo-full" sizes="170px" %}
<img src="{{ site.baseurl }}/assets/images/uni-wuerzburg-logo.svg" class="page-header__logo-full">
</a>
{% include image src="general/uni-wuerzburg-header-background.png" class="page-header__logo-background" sizes="442px" %}
<img src="{{ site.baseurl }}/assets/images/uni-wuerzburg-header-background.png" class="page-header__logo-background">
</div>
</header>
<div class="page-hero">
<script type="text/javascript">
window.menu = [
{% for m in site.menu %}
{
title: "{{ m.title }}",
href: "{{ m.href }}",
{% if m.items %}
items: [
{% for sub_m in m.items %}
{
title: "{{ sub_m.title }}",
href: "{{ sub_m.href }}",
{% if sub_m.items %}
items: [
{% for sub_sub_m in sub_m.items %}
{
title: "{{ sub_sub_m.title }}",
href: "{{ sub_sub_m.href }}"
},
{% endfor %}
]
{% endif %}
},
{% endfor %}
]
{% endif %}
},
{% endfor %}
];
</script>
<div id="react-placeholder-navigation"></div>
{% if page.slides %}
......@@ -64,15 +94,16 @@
{% for slide in slides %}
{% if forloop.index == 1 %}
{% assign class = "" %}
{% imgsrcset src="slide" sizes="(min-width: 1180px) 1200, (min-width: 980px) 1020px, (min-width: 740px) 720px, 100vw" %}
{% else %}
{% assign class = "hide" %}
{% imgsrcset src="slide" class="hide" sizes="(min-width: 1180px) 1200, (min-width: 980px) 1020px, (min-width: 740px) 720px, 100vw" %}
{% endif %}
{% include image src=slide dimension="panorama" class=class sizes="(min-width: 1180px) 1200, (min-width: 980px) 1020px, (min-width: 740px) 720px, 100vw" %}
{% endfor %}
</div>
{% elsif slides.size == 1 %}
<div class="single-slide">
{% include image src=slides.first dimension="panorama" %}
{% imgsrcset src="slides.first" dimension="panorama"%}
</div>
{% endif %}
</div>
......
@font-face {
font-family: 'fontello';
src: url('../fonts/fontello.eot?91433183');
src: url('../fonts/fontello.eot?91433183#iefix') format('embedded-opentype'),
url('../fonts/fontello.woff2?91433183') format('woff2'),
url('../fonts/fontello.woff?91433183') format('woff'),
url('../fonts/fontello.ttf?91433183') format('truetype'),
url('../fonts/fontello.svg?91433183#fontello') format('svg');
font-weight: normal;
font-style: normal;
font-family: 'fontello';
src: url('fonts/fontello.eot?91433183');
src: url('fonts/fontello.eot?91433183#iefix') format('embedded-opentype'),
url('fonts/fontello.woff2?91433183') format('woff2'),
url('fonts/fontello.woff?91433183') format('woff'),
url('fonts/fontello.ttf?91433183') format('truetype'),
url('fonts/fontello.svg?91433183#fontello') format('svg');
font-weight: normal;
font-style: normal;
}
/* Chrome hack: SVG is rendered more smooth in Windozze. 100% magic, uncomment if you need it. */
/* Note, that will break hinting! In other OS-es font will be not as sharp as it could be */
/*
@media screen and (-webkit-min-device-pixel-ratio:0) {
@font-face {
font-family: 'fontello';
src: url('../fonts/fontello.svg?91433183#fontello') format('svg');
src: url('fonts/fontello.svg?91433183#fontello') format('svg');
}
}
*/
[class^="icon-"]:before, [class*=" icon-"]:before {
font-family: "fontello";
font-style: normal;
font-weight: normal;
speak: none;
[class^="icon-"]:before,
[class*=" icon-"]:before {
font-family: "fontello";
font-style: normal;
font-weight: normal;
speak: none;
display: inline-block;
text-decoration: inherit;
width: 1em;
margin-right: .2em;
text-align: center;
/* opacity: .8; */
/* For safety - reset parent styles, that can break glyph codes*/
font-variant: normal;
text-transform: none;
/* fix buttons height, for twitter bootstrap */
line-height: 1em;
/* Animation center compensation - margins should be symmetric */
/* remove if not needed */
margin-left: .2em;
/* you can be more comfortable with increased icons size */
/* font-size: 120%; */
display: inline-block;
text-decoration: inherit;
width: 1em;
margin-right: .2em;
text-align: center;
/* opacity: .8; */
/* Font smoothing. That was taken from TWBS */
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
/* For safety - reset parent styles, that can break glyph codes*/
font-variant: normal;
text-transform: none;
/* Uncomment for 3D effect */
/* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */
}
/* fix buttons height, for twitter bootstrap */
line-height: 1em;
.icon-right-open-top-item:before {
color: #004a8f;
content: '\e800';
}
/* Animation center compensation - margins should be symmetric */
/* remove if not needed */
margin-left: .2em;
/* '' */
.icon-right-open:before {
content: '\e800';
}
/* you can be more comfortable with increased icons size */
/* font-size: 120%; */
/* '' */
.icon-search:before {
content: '\e801';
}
/* Font smoothing. That was taken from TWBS */
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
/* '' */
.icon-minus-circled:before {
content: '\e802';
}
/* '' */
.icon-plus-circled:before {
content: '\e803';
}
/* Uncomment for 3D effect */
/* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */
/* '' */
.icon-menu:before {
content: '\f0c9';
}
.icon-right-open-top-item:before { color: #004a8f; content: '\e800'; } /* '' */
.icon-right-open:before { content: '\e800'; } /* '' */
.icon-search:before { content: '\e801'; } /* '' */
.icon-minus-circled:before { content: '\e802'; } /* '' */
.icon-plus-circled:before { content: '\e803'; } /* '' */
.icon-menu:before { content: '\f0c9'; } /* '' */
\ No newline at end of file
/* '' */
\ No newline at end of file
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg xmlns="http://www.w3.org/2000/svg">
<metadata>Copyright (C) 2017 by original authors @ fontello.com</metadata>
<defs>
<font id="fontello" horiz-adv-x="1000" >
<font-face font-family="fontello" font-weight="400" font-stretch="normal" units-per-em="1000" ascent="850" descent="-150" />
<missing-glyph horiz-adv-x="1000" />
<glyph glyph-name="right-open" unicode="&#xe800;" d="M618 361l-414-415q-11-10-25-10t-25 10l-93 93q-11 11-11 25t11 25l296 297-296 296q-11 11-11 25t11 25l93 93q10 11 25 11t25-11l414-414q10-11 10-25t-10-25z" horiz-adv-x="714.3" />
<glyph glyph-name="search" unicode="&#xe801;" d="M746 209l254-255-105-105-254 254q-106-72-232-72-169 0-289 120t-120 289 120 289 289 120 289-120 120-289q0-127-72-231z m-65 231q0 113-79 193t-193 80-193-80-80-193 80-192 193-80 193 80 79 192z" horiz-adv-x="1000" />
<glyph glyph-name="minus-circled" unicode="&#xe802;" d="M0 350q0 207 147 354t353 146 354-146 146-354-146-354-354-146-353 146-147 354z m213-82l574 0 0 164-574 0 0-164z" horiz-adv-x="1000" />
<glyph glyph-name="plus-circled" unicode="&#xe803;" d="M0 350q0 207 147 354t353 146 354-146 146-354-146-354-354-146-353 146-147 354z m219-80l201 0 0-201 160 0 0 201 201 0 0 160-201 0 0 201-160 0 0-201-201 0 0-160z" horiz-adv-x="1000" />
<glyph glyph-name="menu" unicode="&#xf0c9;" d="M857 100v-71q0-15-10-25t-26-11h-785q-15 0-25 11t-11 25v71q0 15 11 25t25 11h785q15 0 26-11t10-25z m0 286v-72q0-14-10-25t-26-10h-785q-15 0-25 10t-11 25v72q0 14 11 25t25 10h785q15 0 26-10t10-25z m0 285v-71q0-14-10-25t-26-11h-785q-15 0-25 11t-11 25v71q0 15 11 26t25 10h785q15 0 26-10t10-26z" horiz-adv-x="857.1" />
</font>
</defs>
</svg>
\ No newline at end of file
......@@ -3,7 +3,6 @@ import "slick-carousel";
import ReactDOM from "react-dom";
import React from "react";
// const path = require("path");
// const YAML = require('yamljs');
// const widths = YAML.load(path.join(__dirname, "../menu.yml")).widths;
......@@ -20,7 +19,6 @@ import React from "react";
// Render responsive menu
// ////////////////////////////////////////////////////////////////////////////
// import menu from "../menu.js";
menu = [] // TODO needs to get fixed again
const Nav = class extends React.Component {
constructor(props) {
......@@ -50,7 +48,7 @@ const Nav = class extends React.Component {
(!mobileMenu || (mobileMenu && this.state.mobileMenuActive)) ? (
<div className="navigation-header">
{
menu.map((item, index) => (
window.menu.map((item, index) => (
<div
onMouseEnter={!mobileMenu ? () => this.setState({ activeIndex: index }) : undefined}
onMouseLeave={!mobileMenu ? () => this.setState({ activeIndex: undefined }) : undefined}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment