diff --git a/applications/examples/models/menu.py b/applications/examples/models/menu.py index d81bfa36..3f331c44 100644 --- a/applications/examples/models/menu.py +++ b/applications/examples/models/menu.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- response.menu = [ - (T('Home'), False, URL('default', 'index')), - (T('About'), False, URL('default', 'what')), - (T('Download'), False, URL('default', 'download')), - (T('Docs & Resources'), False, URL('default', 'documentation')), - (T('Support'), False, URL('default', 'support')), - (T('Contributors'), False, URL('default', 'who'))] + (T('Home'), request.controller == 'default' and request.function == 'index', URL('default', 'index')), + (T('About'), request.controller == 'default' and request.function == 'what', URL('default', 'what')), + (T('Download'), request.controller == 'default' and request.function == 'download', URL('default', 'download')), + (T('Docs & Resources'), request.controller == 'default' and request.function == 'documentation', URL('default', 'documentation')), + (T('Support'), request.controller == 'default' and request.function == 'support', URL('default', 'support')), + (T('Contributors'), request.controller == 'default' and request.function == 'who', URL('default', 'who'))] ######################################################################### ## Changes the menu active item diff --git a/applications/examples/static/css/examples.css b/applications/examples/static/css/examples.css new file mode 100644 index 00000000..293b8b89 --- /dev/null +++ b/applications/examples/static/css/examples.css @@ -0,0 +1,28 @@ +h1,h2,h3,h4,h5,h6{color: #111; text-transform:none} + +th, td {color: black} +tbody tr:hover {background-color:transparent} +tbody tr {border-bottom: none} +p {text-align: left} +p, li { line-height: 1.6em} +pre {background-color: black!important;border-radius:5px; color:white; padding:10px} +a.btn.btn180 {padding:20px; font-size:1.2em; width:200px} + +.menu .web2py-menu-active a { + color: #26a69a; +} + +.spaced-vertical { + margin: 0 0.5em 0.5em 0; +} + +.btn:hover, +a.noeffect img:hover { + transition: scale .5s; + transform: scale(1.05); +} + +.btn, +a.noeffect img { + transition: all .2s ease-in-out; +} diff --git a/applications/examples/static/css/stupid.css b/applications/examples/static/css/stupid.css index edc087ce..261f8e57 100644 --- a/applications/examples/static/css/stupid.css +++ b/applications/examples/static/css/stupid.css @@ -6,7 +6,7 @@ /*** basic styles ***/ *, *:after, *:before {border:0; margin:0; padding:0; -webkit-box-sizing:border-box; -moz-box-sizing:border-box; box-sizing:border-box} -html, body {max-width: 100vw !important; overflow-x: hidden !important} +html, body {max-width: 100vw ; overflow-x: hidden} body {font-family:"HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif} p, li {margin-bottom:0.5em} p {text-align:justify} @@ -31,7 +31,7 @@ thead th {vertical-align:bottom} tbody th {vertical-align:top} header, footer {with:100%} -@media (max-width:599px) { +@media all and (max-width:599px) { h1{font-size:2em} h2{font-size:1.8em} h3{font-size:1.6em} @@ -41,20 +41,20 @@ header, footer {with:100%} } /*** buttons ***/ -.btn, button, [type=button], [type=submit] {padding:0.5em 1em !important; margin:0 0.5em 0.5em 0; display:inline-block; background-color:#26a69a; color:white} +.btn, button, [type=button], [type=submit] {padding:0.5em 1em; margin:0 0.5em 0.5em 0; display:inline-block; background-color:#26a69a; color:white} .btn:hover, button:hover, [type=button]:hover, [type=submit]:hover {box-shadow:0 0 10px #666; text-decoration:none; cursor:pointer} -.btn.small, table .btn {padding:0.25em 0.5em !important; font-size:0.8em} -.btn.large {padding:1em 2em !important; font-size:1.2em} +.btn.small, table .btn {padding:0.25em 0.5em; font-size:0.8em} +.btn.large {padding:1em 2em; font-size:1.2em} .btn.oval {border-radius:50%} /*** helpers ***/ .rounded {-moz-border-radius:5px; border-radius:5px} -.padded {padding:10px 20px !important} -.center {text-align:center !important; margin-left:auto; margin-right:auto} +.padded {padding:10px 20px} +.center {text-align:center; margin-left:auto; margin-right:auto} .center>div {text-align:left} .right {right:0; text-align:right} -.middle div {vertical-align:middle !important} -.bottom div {vertical-align:bottom !important} +.middle div {vertical-align:middle} +.bottom div {vertical-align:bottom} .xscroll {overflow-x:scroll} .yscroll {overflow-y:scroll} .nowrap {white-space:nowrap; overflow-x:hidden} @@ -71,14 +71,14 @@ textarea {width:100%; border:1px solid #ddd; padding:4px 8px; outline:none; outl select {-webkit-appearance:none; outline:none; padding:0.5em 1em; border-radius:0; margin:0.5px; border-bottom:1px solid #ddd; width:100%;background-color:transparent} input, textarea, select, button {font-size:12px} input:not([type]):hover, input:not([type=checkbox]):not([type=radio]):not([type=button]):not([type=submit]):hover, select:hover, textarea:hover {background-color:#fbf6d9; transition:background-color 1s ease} -input:invalid, input.error {background:#cc1f00!important;color:white} +input:invalid, input.error {background:#cc1f00;color:white} /*** grid ***/ .container {margin-right:-20px} .container>.quarter, .container>.half, .container>.third, .container>.twothirds, .container>.threequarters, .container>.fill{display:inline-block; padding: 0 20px 0 0; vertical-align:top} .container>.fill {width:100%; margin-right:-20px} .container img, .container video {max-width:100%} -@media (min-width:800px) { +@media all and (min-width:800px) { .max900 {max-width:900px; margin-left:auto; margin-right:auto} .quarter {width:25%; margin-right:-5px} .half {width:50%; margin-right:-10px} @@ -86,7 +86,7 @@ input:invalid, input.error {background:#cc1f00!important;color:white} .twothirds {width:66.66%; margin-right:-13.33px} .threequarters {width:75%; margin-right:-15px} } -@media (min-width:600px) and (max-width:799px) { +@media all and (min-width:600px) and (max-width:799px) { .quarter.compressible {width:25%; margin-right:-5px} .half.compressible {width:50%; margin-right:-10px} .threequarters.compressible {width:75%; margin-right:-15px} @@ -95,7 +95,7 @@ input:invalid, input.error {background:#cc1f00!important;color:white} .twothirds {width:66.66%; margin-right:-13.33px} label.quarter:not(.compressible).right, label.half:not(.compressible).right, label.threequarters:not(.compressible).right {float:left; text-align:left} } -@media (max-width:599px) { +@media all and (max-width:599px) { .quarter:not(.compressible), .half:not(.compressible), .third:not(.compressible), .twothirds:not(.compressible), .threequarters:not(.compressible) {width:100%;} label.quarter:not(.compressible).right, label.half:not(.compressible).right, label.threequarters:not(.compressible).right, label.third:not(.compressible).right, label.twothirds:not(.compressible).right {float:left; text-align:left} @@ -115,7 +115,7 @@ input:invalid, input.error {background:#cc1f00!important;color:white} display:block; width:120%; background-color:#acece6; - border-radius:0 !important; + border-radius:0; background-clip:padding-box; overflow:hidden; } @@ -197,14 +197,14 @@ input:invalid, input.error {background:#cc1f00!important;color:white} .menu.dark ul a {color:white} .menu.dark>li>ul>li:first-child:before{border-bottom-color:black} -@media (max-width:599px) { +@media all and (max-width:599px) { header .menu li, header .menu ul {width: 100%} header .menu.right {float:left; text-align:left} header .menu ul ul {top:2.5em; left:-1px} } -@media (min-width:600px) { - .ham {display:none!important} +@media all and (min-width:600px) { + .ham {display:none} .burger.accordion * {max-height:1000px; overflow:visible} } @@ -300,8 +300,8 @@ a:not(.btn):not(.noeffect):after { .accordion>input:checked ~ label:before {content:"▼ "; color:#ddd} .accordion>input {display:none} .accordion>input:checked ~ *:not(label) { - max-height: 1000px !important; - overflow:visible !important; + max-height: 1000px; + overflow:visible; -webkit-transition: max-height .3s ease-in; transition: max-height .3s ease-in; } @@ -340,7 +340,7 @@ a:not(.btn):not(.noeffect):after { } /*** colors from http://clrs.cc/ ***/ -.navy{background-color:#001f3f!important;color:white}.blue{background-color:#0074d9!important;color:white}.aqua{background-color:#7fdbff!important;color:black}.teal{background-color:#39cccc!important;color:white}.olive{background-color:#3d9970!important;color:white}.green{background-color:#2ecc40!important;color:white}.aquamarine{background-color:#26a69a!important;color:white}.lime{background-color:#01ff70!important;color:black}.yellow{background-color:#ffdc00!important;color:black}.orange{background-color:#ff851b!important;color:white}.red{background-color:#cc1f00!important;color:white}.fuchsia{background-color:#f012be!important;color:white}.pink{background-color:#ee6e73!important;color:white}.purple{background-color:#b10dc9!important;color:white}.maroon{background-color:#85144b!important;color:white}.white{background-color:#fff!important;color:black;-webkit-box-shadow:inset 0px 0px 0px 1px #ddd;-moz-box-shadow:inset 0px 0px 0px 1px #ddd;box-shadow:inset 0px 0px 0px 1px #ddd}.gray{background-color:#aaa!important;color:white}.silver{background-color:#f1f1f1!important;color:black}.black{background-color:#000!important;color:white}.glass{background:rgba(255,255,255,0.5)!important;color:black} +.navy{background-color:#001f3f;color:white}.blue{background-color:#0074d9;color:white}.aqua{background-color:#7fdbff;color:black}.teal{background-color:#39cccc;color:white}.olive{background-color:#3d9970;color:white}.green{background-color:#2ecc40;color:white}.aquamarine{background-color:#26a69a;color:white}.lime{background-color:#01ff70;color:black}.yellow{background-color:#ffdc00;color:black}.orange{background-color:#ff851b;color:white}.red{background-color:#cc1f00;color:white}.fuchsia{background-color:#f012be;color:white}.pink{background-color:#ee6e73;color:white}.purple{background-color:#b10dc9;color:white}.maroon{background-color:#85144b;color:white}.white{background-color:#fff;color:black;-webkit-box-shadow:inset 0px 0px 0px 1px #ddd;-moz-box-shadow:inset 0px 0px 0px 1px #ddd;box-shadow:inset 0px 0px 0px 1px #ddd}.gray{background-color:#aaa;color:white}.silver{background-color:#f1f1f1;color:black}.black{background-color:#000;color:white}.glass{background:rgba(255,255,255,0.5);color:black} /**** tags ****/ .tags > span { @@ -350,7 +350,7 @@ a:not(.btn):not(.noeffect):after { background-color: #26a69a; border-radius: 5px; font-size:12px; - margin: 5px 5px 5px 0 !important; + margin: 5px 5px 5px 0; line-height: 32px; } .tags.dismissible > span:hover {opacity: 0.5} diff --git a/applications/examples/views/default/download.html b/applications/examples/views/default/download.html index 6ac7b0c5..eaca3a8e 100644 --- a/applications/examples/views/default/download.html +++ b/applications/examples/views/default/download.html @@ -17,7 +17,7 @@ - For Windows + For Windows For Windows @@ -28,7 +28,7 @@ - For Mac + For Mac For Mac @@ -37,7 +37,7 @@ - Source Code + Source Code Source Code @@ -48,7 +48,7 @@ - Manual + Manual Change Log diff --git a/applications/examples/views/default/index.html b/applications/examples/views/default/index.html index 8cd013ca..19708c79 100644 --- a/applications/examples/views/default/index.html +++ b/applications/examples/views/default/index.html @@ -3,22 +3,22 @@
-

web2pyTM Web Framework

+

Web Framework

Free open source full-stack framework for rapid development of fast, scalable, secure and portable database-driven web-based applications. Written and programmable in Python.

@@ -29,8 +29,8 @@
- - + + Download Now diff --git a/applications/examples/views/default/who.html b/applications/examples/views/default/who.html index 14f76d69..0b939b62 100644 --- a/applications/examples/views/default/who.html +++ b/applications/examples/views/default/who.html @@ -82,6 +82,7 @@
  • Keith Yang (openid)
  • Kenji Hosoda (plugins)
  • Kyle Smith (javascript) +
  • Leonel Câmara
  • Limodou (winservice)
  • Lucas D'Ávila
  • Marc Abramowitz (tests and travis continuous integration) diff --git a/applications/examples/views/layout.html b/applications/examples/views/layout.html index 6026ddea..b6dbcb4c 100644 --- a/applications/examples/views/layout.html +++ b/applications/examples/views/layout.html @@ -4,19 +4,13 @@ - + + - + + {{ left_sidebar_enabled = globals().get('left_sidebar_enabled', False) right_sidebar_enabled = globals().get('right_sidebar_enabled', False) @@ -29,7 +23,7 @@
    - +
    {{=MENU(response.menu,_class='menu')}}
    • - + - + - +