# HG changeset patch # User Reimar Bauer # Date 1399290306 -7200 # Node ID c6b169e9fca071adb8e3730dcd8ba46d4d0142ed # Parent c97120328e9cc5fe281b92d2f3e79cfff6a84680 css changed diff -r c97120328e9c -r c6b169e9fca0 static/css/bootstrap.css --- a/static/css/bootstrap.css Mon May 05 11:30:43 2014 +0200 +++ b/static/css/bootstrap.css Mon May 05 13:45:06 2014 +0200 @@ -6033,13 +6033,10 @@ /* Module ------------------------------------ */ .module-gallery { - background: url('../images/python_blender.jpg') no-repeat 0px -200px; - background-size: 2000px 884px; -} -.module-prizes { - background: url('../images/berlin.jpg') no-repeat 0px -200px; - background-size: 1920px 981px; -} + background: url('../images/institut.jpg') no-repeat 0px -400px; + background-size: 4407px 2136px; +} + .module-gallery .module-content { height: 300px; position: relative; diff -r c97120328e9c -r c6b169e9fca0 static/css/eskp.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/static/css/eskp.css Mon May 05 13:45:06 2014 +0200 @@ -0,0 +1,87 @@ +body { + padding-top: 20px; + padding-bottom: 20px; +} +/* Typo +------------------------------------ */ +@font-face { + font-family: 'gandhi_serifbold'; + src: url('../fonts/gandhiserif-bold-webfont.eot'); + 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'); + font-weight: normal; + font-style: normal; +} +@font-face { + font-family: 'gandhi_serifregular'; + src: url('../fonts/gandhiserif-regular-webfont.eot'); + 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'); + font-weight: normal; + font-style: normal; +} +/* Utilities +------------------------------------ */ +.separator { + width: 100%; + border-bottom: 1px solid #ff9a20; + text-align: center; + height: 22px; + margin-bottom: 15px; +} +.separator img { + line-height: 43px; + padding: 0 10px; + background: #e9e2d0; + /* Farbe des Elements darunter */ + + display: inline-block; + color: #dbe2e3; +} +/* Navigation +------------------------------------ */ +.navbar { + margin-bottom: 20px; +} +.navbar-brand { + font-weight: 600; + font-size: 24px; + font-family: 'gandhi_serifbold'; + background-color: #e9e2d0; + border-bottom: 1px solid transparent; +} +.dropdown-menue { + background-color: #9f9a8b; +} +.navbar { + background-color: #e9e2d0; + border: 1px solid transparent; +} +.navbar-default .navbar-nav > .active > a, +.navbar-default .navbar-nav > .active > a:hover, +.navbar-default .navbar-nav > .active > a:focus { + background-color: transparent; + border-bottom: 1px solid #bf1339; +} +/* Content +------------------------------------ */ +.jumbotron img { + float: left; + border-right: 10px solid transparent; + border-bottom: 10px solid transparent; + display: block; + height: auto; +} +.jumbotron h1 { + text-align: center; + font-size: 40px; +} +.jumbotron { + background-color: #e5edf1; +} +.flags { + padding: 5px 0 0 5px; + float: right; +} +/* Footer +------------------------------------ */#footer { + background: #e9e2d0; +} diff -r c97120328e9c -r c6b169e9fca0 static/css/pymove3d.css --- a/static/css/pymove3d.css Mon May 05 11:30:43 2014 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,87 +0,0 @@ -body { - padding-top: 20px; - padding-bottom: 20px; -} -/* Typo ------------------------------------- */ -@font-face { - font-family: 'gandhi_serifbold'; - src: url('../fonts/gandhiserif-bold-webfont.eot'); - 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'); - font-weight: normal; - font-style: normal; -} -@font-face { - font-family: 'gandhi_serifregular'; - src: url('../fonts/gandhiserif-regular-webfont.eot'); - 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'); - font-weight: normal; - font-style: normal; -} -/* Utilities ------------------------------------- */ -.separator { - width: 100%; - border-bottom: 1px solid #ff9a20; - text-align: center; - height: 22px; - margin-bottom: 15px; -} -.separator img { - line-height: 43px; - padding: 0 10px; - background: #e9e2d0; - /* Farbe des Elements darunter */ - - display: inline-block; - color: #dbe2e3; -} -/* Navigation ------------------------------------- */ -.navbar { - margin-bottom: 20px; -} -.navbar-brand { - font-weight: 600; - font-size: 24px; - font-family: 'gandhi_serifbold'; - background-color: #e9e2d0; - border-bottom: 1px solid transparent; -} -.dropdown-menue { - background-color: #9f9a8b; -} -.navbar { - background-color: #e9e2d0; - border: 1px solid transparent; -} -.navbar-default .navbar-nav > .active > a, -.navbar-default .navbar-nav > .active > a:hover, -.navbar-default .navbar-nav > .active > a:focus { - background-color: transparent; - border-bottom: 1px solid #bf1339; -} -/* Content ------------------------------------- */ -.jumbotron img { - float: left; - border-right: 10px solid transparent; - border-bottom: 10px solid transparent; - display: block; - height: auto; -} -.jumbotron h1 { - text-align: center; - font-size: 40px; -} -.jumbotron { - background-color: #e5edf1; -} -.flags { - padding: 5px 0 0 5px; - float: right; -} -/* Footer ------------------------------------- */#footer { - background: #e9e2d0; -} diff -r c97120328e9c -r c6b169e9fca0 templates/footer.html --- a/templates/footer.html Mon May 05 11:30:43 2014 +0200 +++ b/templates/footer.html Mon May 05 13:45:06 2014 +0200 @@ -2,90 +2,7 @@