1.1 --- a/static/css/bootstrap.css Mon May 05 11:30:43 2014 +0200
1.2 +++ b/static/css/bootstrap.css Mon May 05 13:45:06 2014 +0200
1.3 @@ -6033,13 +6033,10 @@
1.4 /* Module
1.5 ------------------------------------ */
1.6 .module-gallery {
1.7 - background: url('../images/python_blender.jpg') no-repeat 0px -200px;
1.8 - background-size: 2000px 884px;
1.9 -}
1.10 -.module-prizes {
1.11 - background: url('../images/berlin.jpg') no-repeat 0px -200px;
1.12 - background-size: 1920px 981px;
1.13 -}
1.14 + background: url('../images/institut.jpg') no-repeat 0px -400px;
1.15 + background-size: 4407px 2136px;
1.16 +}
1.17 +
1.18 .module-gallery .module-content {
1.19 height: 300px;
1.20 position: relative;
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2.2 +++ b/static/css/eskp.css Mon May 05 13:45:06 2014 +0200
2.3 @@ -0,0 +1,87 @@
2.4 +body {
2.5 + padding-top: 20px;
2.6 + padding-bottom: 20px;
2.7 +}
2.8 +/* Typo
2.9 +------------------------------------ */
2.10 +@font-face {
2.11 + font-family: 'gandhi_serifbold';
2.12 + src: url('../fonts/gandhiserif-bold-webfont.eot');
2.13 + src: url('../fonts/gandhiserif-bold-webfont.eot?#iefix') format('embedded-opentype'), url('../fonts/gandhiserif-bold-webfont.woff') format('woff'), url('../fonts/gandhiserif-bold-webfont.ttf') format('truetype'), url('../fonts/gandhiserif-bold-webfont.svg#gandhi_serifbold') format('svg');
2.14 + font-weight: normal;
2.15 + font-style: normal;
2.16 +}
2.17 +@font-face {
2.18 + font-family: 'gandhi_serifregular';
2.19 + src: url('../fonts/gandhiserif-regular-webfont.eot');
2.20 + src: url('../fonts/gandhiserif-regular-webfont.eot?#iefix') format('embedded-opentype'), url('../fonts/gandhiserif-regular-webfont.woff') format('woff'), url('../fonts/gandhiserif-regular-webfont.ttf') format('truetype'), url('../fonts/gandhiserif-regular-webfont.svg#gandhi_serifregular') format('svg');
2.21 + font-weight: normal;
2.22 + font-style: normal;
2.23 +}
2.24 +/* Utilities
2.25 +------------------------------------ */
2.26 +.separator {
2.27 + width: 100%;
2.28 + border-bottom: 1px solid #ff9a20;
2.29 + text-align: center;
2.30 + height: 22px;
2.31 + margin-bottom: 15px;
2.32 +}
2.33 +.separator img {
2.34 + line-height: 43px;
2.35 + padding: 0 10px;
2.36 + background: #e9e2d0;
2.37 + /* Farbe des Elements darunter */
2.38 +
2.39 + display: inline-block;
2.40 + color: #dbe2e3;
2.41 +}
2.42 +/* Navigation
2.43 +------------------------------------ */
2.44 +.navbar {
2.45 + margin-bottom: 20px;
2.46 +}
2.47 +.navbar-brand {
2.48 + font-weight: 600;
2.49 + font-size: 24px;
2.50 + font-family: 'gandhi_serifbold';
2.51 + background-color: #e9e2d0;
2.52 + border-bottom: 1px solid transparent;
2.53 +}
2.54 +.dropdown-menue {
2.55 + background-color: #9f9a8b;
2.56 +}
2.57 +.navbar {
2.58 + background-color: #e9e2d0;
2.59 + border: 1px solid transparent;
2.60 +}
2.61 +.navbar-default .navbar-nav > .active > a,
2.62 +.navbar-default .navbar-nav > .active > a:hover,
2.63 +.navbar-default .navbar-nav > .active > a:focus {
2.64 + background-color: transparent;
2.65 + border-bottom: 1px solid #bf1339;
2.66 +}
2.67 +/* Content
2.68 +------------------------------------ */
2.69 +.jumbotron img {
2.70 + float: left;
2.71 + border-right: 10px solid transparent;
2.72 + border-bottom: 10px solid transparent;
2.73 + display: block;
2.74 + height: auto;
2.75 +}
2.76 +.jumbotron h1 {
2.77 + text-align: center;
2.78 + font-size: 40px;
2.79 +}
2.80 +.jumbotron {
2.81 + background-color: #e5edf1;
2.82 +}
2.83 +.flags {
2.84 + padding: 5px 0 0 5px;
2.85 + float: right;
2.86 +}
2.87 +/* Footer
2.88 +------------------------------------ */#footer {
2.89 + background: #e9e2d0;
2.90 +}
3.1 --- a/static/css/pymove3d.css Mon May 05 11:30:43 2014 +0200
3.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
3.3 @@ -1,87 +0,0 @@
3.4 -body {
3.5 - padding-top: 20px;
3.6 - padding-bottom: 20px;
3.7 -}
3.8 -/* Typo
3.9 ------------------------------------- */
3.10 -@font-face {
3.11 - font-family: 'gandhi_serifbold';
3.12 - src: url('../fonts/gandhiserif-bold-webfont.eot');
3.13 - src: url('../fonts/gandhiserif-bold-webfont.eot?#iefix') format('embedded-opentype'), url('../fonts/gandhiserif-bold-webfont.woff') format('woff'), url('../fonts/gandhiserif-bold-webfont.ttf') format('truetype'), url('../fonts/gandhiserif-bold-webfont.svg#gandhi_serifbold') format('svg');
3.14 - font-weight: normal;
3.15 - font-style: normal;
3.16 -}
3.17 -@font-face {
3.18 - font-family: 'gandhi_serifregular';
3.19 - src: url('../fonts/gandhiserif-regular-webfont.eot');
3.20 - src: url('../fonts/gandhiserif-regular-webfont.eot?#iefix') format('embedded-opentype'), url('../fonts/gandhiserif-regular-webfont.woff') format('woff'), url('../fonts/gandhiserif-regular-webfont.ttf') format('truetype'), url('../fonts/gandhiserif-regular-webfont.svg#gandhi_serifregular') format('svg');
3.21 - font-weight: normal;
3.22 - font-style: normal;
3.23 -}
3.24 -/* Utilities
3.25 ------------------------------------- */
3.26 -.separator {
3.27 - width: 100%;
3.28 - border-bottom: 1px solid #ff9a20;
3.29 - text-align: center;
3.30 - height: 22px;
3.31 - margin-bottom: 15px;
3.32 -}
3.33 -.separator img {
3.34 - line-height: 43px;
3.35 - padding: 0 10px;
3.36 - background: #e9e2d0;
3.37 - /* Farbe des Elements darunter */
3.38 -
3.39 - display: inline-block;
3.40 - color: #dbe2e3;
3.41 -}
3.42 -/* Navigation
3.43 ------------------------------------- */
3.44 -.navbar {
3.45 - margin-bottom: 20px;
3.46 -}
3.47 -.navbar-brand {
3.48 - font-weight: 600;
3.49 - font-size: 24px;
3.50 - font-family: 'gandhi_serifbold';
3.51 - background-color: #e9e2d0;
3.52 - border-bottom: 1px solid transparent;
3.53 -}
3.54 -.dropdown-menue {
3.55 - background-color: #9f9a8b;
3.56 -}
3.57 -.navbar {
3.58 - background-color: #e9e2d0;
3.59 - border: 1px solid transparent;
3.60 -}
3.61 -.navbar-default .navbar-nav > .active > a,
3.62 -.navbar-default .navbar-nav > .active > a:hover,
3.63 -.navbar-default .navbar-nav > .active > a:focus {
3.64 - background-color: transparent;
3.65 - border-bottom: 1px solid #bf1339;
3.66 -}
3.67 -/* Content
3.68 ------------------------------------- */
3.69 -.jumbotron img {
3.70 - float: left;
3.71 - border-right: 10px solid transparent;
3.72 - border-bottom: 10px solid transparent;
3.73 - display: block;
3.74 - height: auto;
3.75 -}
3.76 -.jumbotron h1 {
3.77 - text-align: center;
3.78 - font-size: 40px;
3.79 -}
3.80 -.jumbotron {
3.81 - background-color: #e5edf1;
3.82 -}
3.83 -.flags {
3.84 - padding: 5px 0 0 5px;
3.85 - float: right;
3.86 -}
3.87 -/* Footer
3.88 ------------------------------------- */#footer {
3.89 - background: #e9e2d0;
3.90 -}
4.1 --- a/templates/footer.html Mon May 05 11:30:43 2014 +0200
4.2 +++ b/templates/footer.html Mon May 05 13:45:06 2014 +0200
4.3 @@ -2,90 +2,7 @@
4.4 <div class="container module-footer">
4.5 <div class="headline text-center">
4.6 <a href="http://python.org/"
4.7 - title="Python Programming Language"><img src="/static/images/python-logo.png" alt="python-logo" /></a>
4.8 - <h3>Sponsors</h3>
4.9 - </div>
4.10 - <div class="container">
4.11 - <div class="col-md-12">
4.12 - <div id="myCarousel" class="carousel slide">
4.13 -
4.14 - <!-- Carousel items -->
4.15 - <div class="carousel-inner col-md-8 col-md-offset-2">
4.16 - <div class="item active">
4.17 - <div class="row">
4.18 - <div class="col-sm-3"><a href="http://www.blender.org/">
4.19 - <img src="/static/images/sponsors/blender.png"
4.20 - alt="Image" class="img-responsive sponsor"></a>
4.21 - </div>
4.22 - <div class="col-sm-3"><a href="http://python-verband.org/">
4.23 - <img src="/static/images/sponsors/pysv.png"
4.24 - alt="Image" class="img-responsive sponsor"></a>
4.25 - </div>
4.26 - <div class="col-sm-3">
4.27 - <a href="http://sudile.de/"><img src="/static/images/sponsors/sudile.jpg"
4.28 - alt="Image" class="img-responsive sponsor"></a>
4.29 - </div>
4.30 - </div>
4.31 - <!--/row-->
4.32 - </div>
4.33 - <!--/item-->
4.34 - <div class="item">
4.35 - <div class="row">
4.36 -
4.37 - <div class="col-sm-3">
4.38 - <a href="http://www.python-academy.de/"><img src="/static/images/sponsors/sponsor-python-academy.png"
4.39 - alt="Image" class="img-responsive sponsor"></a>
4.40 - </div>
4.41 - <div class="col-sm-3">
4.42 - <a href="http://trabucchi.de/"><img src="/static/images/sponsors/trabucchi.png"
4.43 - alt="Image" class="img-responsive sponsor"></a>
4.44 - </div>
4.45 - <div class="col-sm-3">
4.46 - <a href="http://www.evenios.com/"><img src="/static/images/sponsors/evenios.png"
4.47 - alt="Image" class="img-responsive sponsor"></a>
4.48 - </div>
4.49 - </div>
4.50 - <!--/row-->
4.51 - </div>
4.52 -
4.53 - <!--/item-->
4.54 - <div class="item">
4.55 - <div class="row">
4.56 - <div class="col-sm-3">
4.57 - <a href="http://www.medialinx-gruppe.de/"><img src="/static/images/sponsors/sponsor-medialinx_ag.png"
4.58 - alt="Image" class="img-responsive sponsor"></a>
4.59 - </div>
4.60 - <div class="col-sm-3">
4.61 - <a href="http://www.galileo-press.de/"><img src="/static/images/sponsors/sponsor-galileo_press-anim.gif"
4.62 - alt="Image" class="img-responsive sponsor"></a>
4.63 - </div>
4.64 - <div class="col-sm-3">
4.65 - <a href="http://www.linux-systemhaus.de/"><img src="/static/images/sponsors/linux_systemhaus_schulz.png"
4.66 - alt="" title="" class="img-responsive sponsor" /></a>
4.67 - </div>
4.68 - </div>
4.69 - <!--/row-->
4.70 - </div>
4.71 -
4.72 - <!--/item-->
4.73 - <div class="item">
4.74 - <div class="row">
4.75 -
4.76 - <div class="col-sm-3">
4.77 - <a href="http://www.oreilly.de/"><img src="/static/images/sponsors/sponsor-oreilly.png"
4.78 - alt="Image" class="img-responsive sponsor"></a>
4.79 - </div>
4.80 - </div>
4.81 - <!--/row-->
4.82 - </div>
4.83 - </div>
4.84 - <!--/carousel-inner-->
4.85 - <a class="left carousel-control hidden-sm" href="#myCarousel" data-slide="prev">‹</a>
4.86 - <a class="right carousel-control hidden-sm" href="#myCarousel" data-slide="next">›</a>
4.87 - </div>
4.88 - <!--/myCarousel-->
4.89 - </div>
4.90 - </div>
4.91 + title="Die ESKP Info Seite des Forschungszentrum Jülich GmbH">
4.92 <div class="text-center module-imprint">
4.93 <ul class="list-inline">
4.94 <li><a href="/privacy">Datenschutzerklärung</a></li>
5.1 --- a/templates/index.html Mon May 05 11:30:43 2014 +0200
5.2 +++ b/templates/index.html Mon May 05 13:45:06 2014 +0200
5.3 @@ -1,7 +1,7 @@
5.4 {% extends "theme.html" %}
5.5 {% block body %}
5.6 <div class="module module-gallery">
5.7 - <!--img src="static/images/python_blender.jpg" /-->
5.8 + <!--img src="static/images/institut.jpg" /-->
5.9 <div class="container">
5.10 <div class="col-md-6 col-yellow">
5.11 <div class="module-content">