diff --git a/VERSION b/VERSION index 4746e6fd..43bb2f25 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.00.0 (2012-05-27 17:38:47) dev +Version 2.00.0 (2012-05-27 17:51:38) dev diff --git a/applications/welcome/static/css/bootswatch.css b/applications/welcome/static/css/bootswatch.css index e72d2d06..d6ded53d 100644 --- a/applications/welcome/static/css/bootswatch.css +++ b/applications/welcome/static/css/bootswatch.css @@ -67,7 +67,17 @@ li {margin-bottom: 0;} /*bootswatch*/ } .icon-chevron-right { - margin-top:2px; + border-left: 4px solid #000; + border-right: 4px solid transparent; + border-bottom: 4px solid transparent; + border-top: 4px solid transparent; + content: ""; + display: inline-block; + height: 0; + opacity: 0.7; + vertical-align: top; + width: 0; + margin-right:-13px; + margin-top: 7px; float:right; - background-image: url("../images/glyphicons-halflings.png"); -} \ No newline at end of file +} diff --git a/applications/welcome/static/css/bootswatch_nojs.css b/applications/welcome/static/css/bootswatch_nojs.css new file mode 100644 index 00000000..2b75915e --- /dev/null +++ b/applications/welcome/static/css/bootswatch_nojs.css @@ -0,0 +1,38 @@ +.nav > li.dropdown > a:after { + border-left: 4px solid transparent; + border-right: 4px solid transparent; + border-top: 4px solid #000000; + content: ""; + display: inline-block; + height: 0; + opacity: 0.7; + vertical-align: top; + width: 0; + + margin-left: 2px; + margin-top: 8px; + + border-bottom-color: #FFFFFF; + border-top-color: #FFFFFF; +} + + +ul.dropdown-menu li.dropdown > a:after { + border-left: 4px solid #000; + border-right: 4px solid transparent; + border-bottom: 4px solid transparent; + border-top: 4px solid transparent; + content: ""; + display: inline-block; + height: 0; + opacity: 0.7; + vertical-align: top; + width: 0; + + margin-left: 8px; + margin-top: 6px; +} + +ul.nav li.dropdown:hover ul.dropdown-menu { + display: block; +} \ No newline at end of file diff --git a/applications/welcome/views/layout.html b/applications/welcome/views/layout.html index 40b94354..c6a3754c 100644 --- a/applications/welcome/views/layout.html +++ b/applications/welcome/views/layout.html @@ -72,6 +72,7 @@ }); }); + {{block head}}{{end}}