From ab985d90f77963c8478c266519f7d04218c60e90 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Thu, 13 Sep 2012 09:08:12 -0500 Subject: [PATCH] some more flash style changes --- VERSION | 2 +- applications/welcome/static/css/web2py.css | 16 ++++++++++------ .../welcome/static/css/web2py_bootstrap.css | 16 +++++++++------- applications/welcome/views/layout.html | 3 +-- 4 files changed, 21 insertions(+), 16 deletions(-) diff --git a/VERSION b/VERSION index 0afdb1b1..f8c18f07 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.0.8 (2012-09-13 08:35:42) stable +Version 2.0.8 (2012-09-13 09:08:09) stable diff --git a/applications/welcome/static/css/web2py.css b/applications/welcome/static/css/web2py.css index cc91b75c..8943432f 100644 --- a/applications/welcome/static/css/web2py.css +++ b/applications/welcome/static/css/web2py.css @@ -108,25 +108,29 @@ div.flash { -webkit-border-radius:8px; background-image: -webkit-linear-gradient(top,#222,#000); background-image: -o-linear-gradient(top,#222,#000); + background-image: -moz-linear-gradient(90deg, #222, #000); background-image: linear-gradient(top,#222,#000); background-repeat: repeat-x; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; -webkit-font-smoothing: antialiased; z-index:2000; } + div.flash:hover { opacity:0.25; } div.error_wrapper {display:block} div.error { - width: 300px; - background-color:red; + width: 298px; + background:red; + border: 2px solid #d00; color:white; padding:5px; display:inline-block; - background-image: -webkit-linear-gradient(top,#f00,#d00); - background-image: -o-linear-gradient(top,#f00,#d00); - background-image: linear-gradient(top,#f00,#d00); - background-repeat: repeat-x; + background-image: -webkit-linear-gradient(left,#f00,#fdd); + background-image: -o-linear-gradient(left,#f00,#fdd); + background-image: -moz-linear-gradient(0deg, #f00, #fdd); + background-image: linear-gradient(left,#f00,#fdd); + background-repeat: repeat-y; } .topbar { diff --git a/applications/welcome/static/css/web2py_bootstrap.css b/applications/welcome/static/css/web2py_bootstrap.css index a94bef16..801cf627 100644 --- a/applications/welcome/static/css/web2py_bootstrap.css +++ b/applications/welcome/static/css/web2py_bootstrap.css @@ -6,7 +6,8 @@ div.flash.flash-center { } div.flash.flash-top, div.flash.flash-top:hover { - position: absolute; + position: relative; + display: block; margin:0; padding:1em; top:0; @@ -121,17 +122,18 @@ li {margin-bottom: 0;} /*bootswatch*/ [class^="icon-"],[class*=" icon-"]{background-image:url("../images/glyphicons-halflings.png")} /* right folder for bootstrap black images/icons */ .icon-white{background-image:url("../images/glyphicons-halflings-white.png");} /* right folder for bootstrap white images/icons */ +.navbar-inner{ + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; + position:relative; +} + @media only screen and (max-width: 979px) { body { padding-top: 0px; } - .navbar-inner{ - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - position:relative; - } #navbar{bottom:-10px;left:4px;} div.flash { diff --git a/applications/welcome/views/layout.html b/applications/welcome/views/layout.html index 82af4196..721d9deb 100644 --- a/applications/welcome/views/layout.html +++ b/applications/welcome/views/layout.html @@ -65,10 +65,9 @@ -
{{=response.flash or ''}}
-
+
{{=response.flash or ''}}