merged main
authorPeter Koppatz <peter@koppatz.com>
Sat, 18 Jan 2014 11:44:25 +0100
changeset 1102cd162f906cc
parent 109 bd4b675d9214
child 111 aa9ebbf842d2
merged main
static/css/bootstrap.css
static/images/python_blender.jpg
static/less/pymove3d.less
templates/de/index.html
templates/theme.html
     1.1 --- a/static/css/bootstrap.css	Sat Jan 18 11:36:43 2014 +0100
     1.2 +++ b/static/css/bootstrap.css	Sat Jan 18 11:44:25 2014 +0100
     1.3 @@ -6006,19 +6006,31 @@
     1.4    margin-bottom: 0px;
     1.5    border-bottom: 3px solid #f0f0f0;
     1.6  }
     1.7 +a.link-yellow {
     1.8 +  color: #fdc91a !important;
     1.9 +  text-decoration: underline;
    1.10 +}
    1.11 +a.link-yellow:hover {
    1.12 +  color: #333333 !important;
    1.13 +  text-decoration: none;
    1.14 +}
    1.15  /* Module
    1.16  ------------------------------------ */
    1.17  .module-gallery {
    1.18    background: url('../images/python_blender.jpg') no-repeat 0px -200px;
    1.19    background-size: 2000px 884px;
    1.20 +  max-width: 100% !important;
    1.21  }
    1.22  .module-gallery .module-content {
    1.23 -  height: 440px;
    1.24 +  height: 300px;
    1.25    position: relative;
    1.26  }
    1.27  .col-yellow {
    1.28    background: rgba(253, 201, 26, 0.6);
    1.29  }
    1.30 +li.module-language a:first-child {
    1.31 +  border-right: 1px solid #125883;
    1.32 +}
    1.33  .module-course {
    1.34    background-color: #f5f5f5;
    1.35  }
     2.1 Binary file static/images/python_blender.jpg has changed
     3.1 --- a/static/less/pymove3d.less	Sat Jan 18 11:36:43 2014 +0100
     3.2 +++ b/static/less/pymove3d.less	Sat Jan 18 11:44:25 2014 +0100
     3.3 @@ -59,17 +59,21 @@
     3.4  margin-bottom: 0px;
     3.5  border-bottom:3px solid #f0f0f0;
     3.6  }
     3.7 +a.link-yellow {color:@yellow !important;text-decoration:underline;}
     3.8 +a.link-yellow:hover {color:@gray-dark !important;text-decoration:none;}
     3.9  /* Module
    3.10  ------------------------------------ */
    3.11  .module-gallery {
    3.12      background: url('../images/python_blender.jpg') no-repeat 0px -200px;
    3.13      background-size: 2000px 884px;
    3.14 +    max-width: 100% !important;
    3.15  }
    3.16  .module-gallery .module-content {
    3.17 -    height: 440px;
    3.18 +    height: 300px;
    3.19      position: relative;
    3.20  }
    3.21  .col-yellow {background:@yellow-light;}
    3.22 +li.module-language a:first-child {border-right:1px solid @blue;}
    3.23  .module-course {background-color: #f5f5f5;}
    3.24  /* Footer
    3.25  ------------------------------------ */ 
     4.1 --- a/templates/de/index.html	Sat Jan 18 11:36:43 2014 +0100
     4.2 +++ b/templates/de/index.html	Sat Jan 18 11:44:25 2014 +0100
     4.3 @@ -10,7 +10,7 @@
     4.4  		<div class="col-md-6 col-yellow">
     4.5  			<div class="module-content">
     4.6  						<h1 class="header" style="color:white;padding-top: 45px;margin-bottom:30px;">Der Python Wettbewerb für Mädchen & Jungen ab 13 Jahren</h1>
     4.7 -			<h4 class="" style="color:white;">3D Objekte mit Python steuern 6 bewegen</h4>
     4.8 +			<h4 class="" style="color:white;">3D Objekte mit Python steuern & bewegen</h4>
     4.9  				<button type="button" class="btn btn-default">Wettbewerbinformationen</button>
    4.10  			</div>
    4.11  		</div>
    4.12 @@ -22,7 +22,7 @@
    4.13  	<div class="container">
    4.14  		<div class="col-md-8 col-md-offset-2">
    4.15  			<div class="module-cite text-center">
    4.16 -			<h1>Blender und Python sind einfach genial, endlich fun, funf, fun beim programmieren</h1>
    4.17 +			<h1>Blender und Python sind einfach genial, endlich fun, fun, fun beim programmieren</h1>
    4.18  			<p class="pull-right">__Florian, Berlin</p>
    4.19  			</div>
    4.20  		</div>
    4.21 @@ -34,7 +34,6 @@
    4.22  				<div class="module-body">
    4.23  					<ul>
    4.24  						<li>1. Mai 2014</li>
    4.25 -							<li>Anmelden</li>
    4.26  					</ul>
    4.27  				</div>
    4.28  			</div>
     5.1 --- a/templates/theme.html	Sat Jan 18 11:36:43 2014 +0100
     5.2 +++ b/templates/theme.html	Sat Jan 18 11:44:25 2014 +0100
     5.3 @@ -39,7 +39,7 @@
     5.4                <a class="navbar-brand" href="/"><img class="logo" src="/static/images/PyMove3D.png" title="PyMove3D" alt="logo pymove3d" /></a>
     5.5              </div>
     5.6              <div class="collapse navbar-collapse">
     5.7 -              <ul class="nav navbar-nav">
     5.8 +              <ul class="nav navbar-nav navbar-right">
     5.9                 {% for href, caption in [('/competition', 'Competition'),
    5.10                 ('/task', 'Task'),
    5.11                 ('/submission', 'Submission'),
    5.12 @@ -49,15 +49,9 @@
    5.13                 {%- if href[1:] == act -%} 
    5.14                 <li class="active">{% else %} <li>{% endif %}<a href="{{ href }}" >{{ caption }}</a></li>
    5.15                 {% endfor %}
    5.16 +               <li class="module-language"><a class="link-yellow" href="./de">DE</a></li>
    5.17 +              <li><a class="link-yellow" href="./en">EN</a></li>
    5.18               </ul>
    5.19 -             <ul class="nav navbar-nav navbar-right">
    5.20 -              <li class="active"><a href="./"> <img class="flags" src="/static/images/flags/de.png" alt="deutsch" />
    5.21 -              </a></li>
    5.22 -              <li><a href="../navbar-static-top/"><img class ="flags" src="/static/images/flags/gb.png" alt="english" />
    5.23 -              </a></li>
    5.24 -              <li><a href="../navbar-fixed-top/"><img class="flags" src="/static/images/flags/it.png" alt="italiano" />
    5.25 -              </a></li>
    5.26 -            </ul>
    5.27            </div><!--/.nav-collapse -->
    5.28          </div>
    5.29        </div>
Impressum Datenschutzerklärung