From d97300c4ab902ce490c5f608e3f17d386ac8674a Mon Sep 17 00:00:00 2001 From: Ezekiel Templin Date: Wed, 20 Jun 2012 02:44:10 -0400 Subject: [PATCH] Cleanup navigation for smaller screens * Navbar becomes accordion when window width is <= 980px --- Changes.md | 3 ++- web/assets/stylesheets/application.css | 23 +----------------- web/assets/stylesheets/layout.css | 22 +++++++++++++++++ web/views/layout.slim | 33 +++++++++++++++----------- 4 files changed, 44 insertions(+), 37 deletions(-) create mode 100644 web/assets/stylesheets/layout.css diff --git a/Changes.md b/Changes.md index a7508097..1ca5a358 100644 --- a/Changes.md +++ b/Changes.md @@ -1,6 +1,7 @@ HEAD ----------- - +- Fix sidekiq-web's navbar on mobile devices and windows <= 980px (ezkl) +- Fix Capistrano task for first deploys [#259] - Worker subclasses now properly inherit sidekiq\_options set in their superclass [#221] - Add random jitter to scheduler to spread polls across POLL\_INTERVAL diff --git a/web/assets/stylesheets/application.css b/web/assets/stylesheets/application.css index 540d4e64..4d2b5519 100644 --- a/web/assets/stylesheets/application.css +++ b/web/assets/stylesheets/application.css @@ -1,27 +1,6 @@ /* *= require vendor/bootstrap +*= require layout *= require vendor/bootstrap-responsive *= require_self */ -body { - position: relative; - padding-top: 90px; -} - -td form { - margin: 0; -} - -td form .btn { - margin: 0; -} - -code { - padding: 0; - border: 0; - background-color: inherit; -} - -.hero-unit { - padding: 30px; -} diff --git a/web/assets/stylesheets/layout.css b/web/assets/stylesheets/layout.css new file mode 100644 index 00000000..c97bcdab --- /dev/null +++ b/web/assets/stylesheets/layout.css @@ -0,0 +1,22 @@ +body { + position: relative; + padding-top: 90px; +} + +td form { + margin: 0; +} + +td form .btn { + margin: 0; +} + +code { + padding: 0; + border: 0; + background-color: inherit; +} + +.hero-unit { + padding: 30px; +} diff --git a/web/views/layout.slim b/web/views/layout.slim index 17b32e1f..c54731d6 100644 --- a/web/views/layout.slim +++ b/web/views/layout.slim @@ -7,22 +7,27 @@ html .navbar.navbar-fixed-top .navbar-inner .container + a.btn.btn-navbar data-toggle="collapse" data-target=".nav-collapse" + span.icon-bar + span.icon-bar + span.icon-bar a.brand href='#{{root_path}}' | Sidekiq - ul.nav - li - a href='#{{root_path}}' Home - li - a href='#{{root_path}}queues' Queues - li - a href='#{{root_path}}retries' Retries - li - a href='#{{root_path}}scheduled' Scheduled - ul.nav.pull-right - li - a Redis: #{location} - li - a #{Time.now.utc} + div.nav-collapse + ul.nav + li + a href='#{{root_path}}' Home + li + a href='#{{root_path}}queues' Queues + li + a href='#{{root_path}}retries' Retries + li + a href='#{{root_path}}scheduled' Scheduled + ul.nav.pull-right + li + a Redis: #{location} + li + a #{Time.now.utc} .container == yield