# HG changeset patch # User stetrabby # Date 1388317652 -3600 # Node ID 46c37d55294ec8c4ab91a738afdb8826a75f71bd # Parent 688080c02228a0c702527f9c2fe024dae91ddb42 defined only one css to reduce the request and implemented custom css via import diff -r 688080c02228 -r 46c37d55294e static/css/bootstrap.css --- a/static/css/bootstrap.css Sun Dec 29 12:45:45 2013 +0100 +++ b/static/css/bootstrap.css Sun Dec 29 12:47:32 2013 +0100 @@ -3899,8 +3899,8 @@ } } .navbar-default { - background-color: #f8f8f8; - border-color: #e7e7e7; + background-color: transparent; + border-color: transparent; } .navbar-default .navbar-brand { color: #777777; @@ -3925,7 +3925,7 @@ .navbar-default .navbar-nav > .active > a:hover, .navbar-default .navbar-nav > .active > a:focus { color: #555555; - background-color: #e7e7e7; + background-color: transparent; } .navbar-default .navbar-nav > .disabled > a, .navbar-default .navbar-nav > .disabled > a:hover, @@ -3945,12 +3945,12 @@ } .navbar-default .navbar-collapse, .navbar-default .navbar-form { - border-color: #e7e7e7; + border-color: transparent; } .navbar-default .navbar-nav > .open > a, .navbar-default .navbar-nav > .open > a:hover, .navbar-default .navbar-nav > .open > a:focus { - background-color: #e7e7e7; + background-color: transparent; color: #555555; } @media (max-width: 767px) { @@ -3966,7 +3966,7 @@ .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus { color: #555555; - background-color: #e7e7e7; + background-color: transparent; } .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a, .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:hover, @@ -5955,10 +5955,19 @@ display: none !important; } } +html, body { - border-top: 4px solid #125883; - padding-top: 20px; - padding-bottom: 20px; + height: 100%; +} +body { + padding-top: 8px; + border-top: 8px solid #125883; +} +#wrap { + min-height: 100%; + height: auto; + margin: 0 auto -60px; + padding: 0 0 60px; } /* Typo ------------------------------------ */ @@ -5978,68 +5987,47 @@ } /* 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 */ +#wrap > .container { + /*padding: 60px 15px 0;*/ - display: inline-block; - color: #dbe2e3; +} +img { + vertical-align: middle; + border: 0; + page-break-inside: avoid; + max-width: 100% !important; } /* Navigation ------------------------------------ */ +.navbar-nav > li > a { + font-size: 18px; +} .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; + margin-bottom: 0px; + border-bottom: 3px solid #f0f0f0; } /* 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; +.course { + background: #f8f8f8; + padding: 15px 0; +} +.course h1 { + color: #125883; +} +.course p { + color: #fdc91a; +} +.themen { + background: #999999; + padding: 15px 0; } /* Footer ------------------------------------ */#footer { - background: #e9e2d0; -} + height: 60px; + background-color: #f5f5f5; +} +#footer > .container { + padding-left: 15px; + padding-right: 15px; +} diff -r 688080c02228 -r 46c37d55294e static/less/pymove3d.less --- a/static/less/pymove3d.less Sun Dec 29 12:45:45 2013 +0100 +++ b/static/less/pymove3d.less Sun Dec 29 12:47:32 2013 +0100 @@ -1,10 +1,14 @@ - +html, body { - border-top:4px solid @blue; - padding-top: 20px; - padding-bottom: 20px; - } - + height: 100%; +} +body {padding-top:8px;border-top:8px solid @blue;} +#wrap { + min-height: 100%; + height: auto; + margin: 0 auto -60px; + padding: 0 0 60px; +} /* Typo ------------------------------------ */ @font-face { @@ -29,63 +33,51 @@ } /* Utilities ------------------------------------ */ -.separator { - width: 100%; - border-bottom: 1px solid #ff9a20; - text-align: center; - height: 22px; - margin-bottom: 15px; +#wrap > .container { + /*padding: 60px 15px 0;*/ } -.separator img { - line-height: 43px; - padding: 0 10px; - background: #e9e2d0; /* Farbe des Elements darunter */ - display: inline-block; - color: #dbe2e3; - } +img { + vertical-align: middle; + border: 0; + page-break-inside: avoid; + max-width: 100% !important; + } /* Navigation ------------------------------------ */ +.navbar-nav > li:hover { +//border-top:8px solid @yellow;position: relative;top: -17px; +} +.navbar-nav > li > a { + // margin-top: 48px; + font-size: 18px; +} +.nav > li > a:hover, +.nav > li > a:focus { +//margin-top: 54px; +} .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; - } +margin-bottom: 0px; +border-bottom:3px solid #f0f0f0; +} /* 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; - } +.course { + background:#f8f8f8; + padding:15px 0; +} +.course h1 {color:@blue;} +.course p {color:@yellow;} +.themen { + background:@gray-light; + padding:15px 0; +} /* Footer ------------------------------------ */ #footer { - background: #e9e2d0; - } \ No newline at end of file + height: 60px; + background-color: #f5f5f5; +} +#footer > .container { + padding-left: 15px; + padding-right: 15px; +} \ No newline at end of file diff -r 688080c02228 -r 46c37d55294e static/less/variables.less --- a/static/less/variables.less Sun Dec 29 12:45:45 2013 +0100 +++ b/static/less/variables.less Sun Dec 29 12:47:32 2013 +0100 @@ -9,7 +9,10 @@ // Pymove3d colors // ------------------------- @blue: #125883; +@blue-light: rgba(18,88,131,.6); +@blue-darker: #0E394F; @yellow: #FDC91A; +@yellow-light: rgba(253,201,26,.6); // Grays // ------------------------- @@ -272,15 +275,15 @@ @navbar-padding-vertical: ((@navbar-height - @line-height-computed) / 2); @navbar-default-color: #777; -@navbar-default-bg: #f8f8f8; -@navbar-default-border: darken(@navbar-default-bg, 6.5%); +@navbar-default-bg: transparent; +@navbar-default-border: transparent; // Navbar links @navbar-default-link-color: #777; @navbar-default-link-hover-color: #333; @navbar-default-link-hover-bg: transparent; @navbar-default-link-active-color: #555; -@navbar-default-link-active-bg: darken(@navbar-default-bg, 6.5%); +@navbar-default-link-active-bg: transparent; @navbar-default-link-disabled-color: #ccc; @navbar-default-link-disabled-bg: transparent;