diff --git a/.gitignore b/.gitignore index 4b68470..f0da397 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,6 @@ fonts/*.css fonts/*.map style.css +*.swp +/.bundle +/vendor/bundle diff --git a/DAGA2017.png b/DAGA2017.png new file mode 100644 index 0000000..ee65181 Binary files /dev/null and b/DAGA2017.png differ diff --git a/brushed-metal.new.svg b/brushed-metal.new.svg index ac05b78..f073265 100644 --- a/brushed-metal.new.svg +++ b/brushed-metal.new.svg @@ -97,7 +97,7 @@ id="layer1" transform="translate(0,3160.6299)"> 9.-11. September 2016 + %img#tagungs-logo(src="DAGA2017.png") + Christian-Albrechts-Universität zu Kiel 6.-9. März 2017 %h1 Was macht Musik - hart? - Heavy Metal & Co. aus psychoakustischer Perspektive + hart? + Klangliche Merkmale zur genreübergreifenden Identifikation musikalischer Härte %p#authors(style="margin-top:0.1em")<> %span.author(data-mark="1")<> Isabella Czedik-Eysenberg %span.author(data-mark="2")<> Denis Knauf diff --git a/style.scss b/style.scss index ffc162d..a8b5561 100644 --- a/style.scss +++ b/style.scss @@ -4,6 +4,13 @@ } } +#uni-logo { + zoom: 0.9; +} +#tagungs-logo { + float: left +} + #nurtext { &, * { background: inherit !important; @@ -41,7 +48,7 @@ header { bottom: 0.5rem; }; padding: 0; - font-size: 3rem; + font-size: 2.4rem; text-align: center; } @@ -98,7 +105,7 @@ section { &:before { z-index: -1; - background: linear-gradient(rgba(139, 141, 196, 0.8) 2.2rem, rgba(256, 256, 256, 0.8) 2.2rem); + background: linear-gradient(rgba(67, 148, 160, 0.8) 2.2rem, rgba(256, 256, 256, 0.8) 2.2rem); content: ""; border-radius: 0.5rem 2rem 0.5rem 0.5rem; position: absolute; @@ -178,12 +185,12 @@ quellen { } .logos { - width: 20em; + width: 19em; float: right; img { height: 4em; - margin: 0.3em; + //margin: 0.3em; } }