diff --git a/src/_h5ai/client/css/inc/bottombar.less b/src/_h5ai/client/css/inc/bottombar.less deleted file mode 100644 index b7ae9551..00000000 --- a/src/_h5ai/client/css/inc/bottombar.less +++ /dev/null @@ -1,39 +0,0 @@ - -#bottombar { - overflow: hidden; - flex: 0 0 auto; - order: 99; - - padding: 6px; - background: @col-lightgray; - box-shadow: 0 0 8px 0 rgba(0,0,0,0.2); - z-index: 1; - - color: #999; - text-align: right; - line-height: 30px; - - a, a:active, a:visited { - margin: 0 8px; - color: @col-text-secondary-black; - text-decoration: none; - .transition(all 0.2s ease-in-out); - outline: 0; - - &:hover { - color: @col-hover; - } - } - - .noJsMsg, .noBrowserMsg { - margin: 0 8px; - color: @col-error; - a, a:active, a:visited { - color: @col-error; - text-decoration: underline; - &:hover { - color: @col-hover; - } - } - } -} diff --git a/src/_h5ai/client/css/inc/fallback.less b/src/_h5ai/client/css/inc/fallback.less index 381dbd2b..0f1c1a49 100644 --- a/src/_h5ai/client/css/inc/fallback.less +++ b/src/_h5ai/client/css/inc/fallback.less @@ -2,7 +2,7 @@ #fallback { display: none; max-width: 960px; - margin: 0 auto 48px; + margin: 16px auto; padding: 32px 16px; table { @@ -60,6 +60,44 @@ } +#fallback-bar { + display: none; + overflow: hidden; + + padding: 6px; + background: @col-lightgray; + box-shadow: 0 0 8px 0 rgba(0,0,0,0.2); + + color: #999; + text-align: right; + line-height: 36px; + + a, a:active, a:visited { + margin: 0 8px; + color: @col-text-secondary-black; + text-decoration: none; + .transition(all 0.2s ease-in-out); + outline: 0; + + &:hover { + color: @col-hover; + } + } + + .noJsMsg, .noBrowserMsg { + margin: 0 8px; + color: @col-error; + a, a:active, a:visited { + color: @col-error; + text-decoration: underline; + &:hover { + color: @col-hover; + } + } + } +} + + html.no-js, html.no-browser { body { @@ -67,16 +105,7 @@ html.no-js, html.no-browser { background: #fff; } - #fallback { + #fallback, #fallback-bar { display: block; } - - #bottombar { - display: block; - position: fixed; - z-index: 1; - left: 0; - right: 0; - bottom: 0; - } } diff --git a/src/_h5ai/client/css/inc/general.less b/src/_h5ai/client/css/inc/general.less index ab47b490..30255dfc 100644 --- a/src/_h5ai/client/css/inc/general.less +++ b/src/_h5ai/client/css/inc/general.less @@ -143,11 +143,6 @@ html { &.browser .noBrowserMsg { display: none; } - &.js.browser { - #bottombar { - display: none; - } - } } body { diff --git a/src/_h5ai/client/css/inc/h5ai-info.less b/src/_h5ai/client/css/inc/h5ai-info.less index 7a819ac7..274e06bd 100644 --- a/src/_h5ai/client/css/inc/h5ai-info.less +++ b/src/_h5ai/client/css/inc/h5ai-info.less @@ -6,7 +6,6 @@ body#h5ai-info { order: 50; color: @col-text-primary-black; text-align: center; - overflow-y: scroll; } code { diff --git a/src/_h5ai/client/css/styles.less b/src/_h5ai/client/css/styles.less index 148ad2da..6eef1098 100644 --- a/src/_h5ai/client/css/styles.less +++ b/src/_h5ai/client/css/styles.less @@ -4,7 +4,6 @@ @import "inc/general"; @import "inc/topbar"; -@import "inc/bottombar"; @import "inc/sidebar"; @import "inc/download"; @import "inc/filter"; diff --git a/src/_h5ai/index.html.jade b/src/_h5ai/index.html.jade index c8155801..d9a943e6 100644 --- a/src/_h5ai/index.html.jade +++ b/src/_h5ai/index.html.jade @@ -14,6 +14,16 @@ head body#h5ai-info + div#fallback-bar + span.noJsMsg + | JavaScript disabled! + span.noBrowserMsg + | Works best in + a( href="http://browsehappy.com" ) modern browsers + | ! + a( href="#{pkg.homepage}", title="#{pkg.name} #{pkg.version} · #{pkg.description}" ) + | powered by #{pkg.name} + div#content h1#header a( href="#{pkg.homepage}" ) #{pkg.name} @@ -26,14 +36,4 @@ body#h5ai-info input( type="hidden", name="hosted_button_id", value="8WSPKWT7YBTSQ" ) input( type="image", src="client/images/ui/paypal.svg", width="100px", border="0", name="submit", alt="PayPal - The safer, easier way to pay online!" ) - div#bottombar - span.noJsMsg - | JavaScript disabled! - span.noBrowserMsg - | Works best in - a( href="http://browsehappy.com" ) modern browsers - | ! - a( href="#{pkg.homepage}", title="#{pkg.name} #{pkg.version} · #{pkg.description}" ) - | powered by #{pkg.name} - diff --git a/src/_h5ai/server/php/inc/page.php.jade b/src/_h5ai/server/php/inc/page.php.jade index 7f6ae63d..955060f0 100644 --- a/src/_h5ai/server/php/inc/page.php.jade +++ b/src/_h5ai/server/php/inc/page.php.jade @@ -19,7 +19,7 @@ head body - div#bottombar + div#fallback-bar span.noJsMsg | JavaScript disabled! span.noBrowserMsg