kotovalexarian-likes-github/mperham--sidekiq
1
0
Fork 0
mirror of https://github.com/mperham/sidekiq.git synced 2022-11-09 13:52:34 -05:00
Code Releases Activity

Merge pull request #1879 from seuros/webui

Browse source 
[Webui] Fix style bug
This commit is contained in:
Mike Perham 2014-08-06 09:55:04 -07:00
commit dfb4ce66bb
3 changed files with 14 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
web/assets/stylesheets/application.css
View file

@ -102,7 +102,7 @@ header.row .pagination {
border-width: 0;
}
.poll-wrapper {
margin: 9px 0;
margin: 9px;
}
.nav #live-poll {
height: 25px;
@ -604,10 +604,6 @@ div.interval-slider input {
}
@media (max-width: 768px) {
.navbar .container {
text-align: center
}
.navbar .navbar-brand {
float: none;
display: block;
@ -629,11 +625,13 @@ div.interval-slider input {
}
.poll-wrapper {
margin: 0 9px 9px;
width: 100%;
text-align: center;
}
.poll-wrapper > div {
margin: 10px;
.poll-wrapper > a {
display: inline-block;
margin: 5px;
}
.navbar.navbar-fixed-bottom ul {

2
web/views/_footer.erb
View file

@ -1,6 +1,6 @@
<div class="navbar navbar-fixed-bottom navbar-inverse">
<div class="navbar-inner">
<div class="container">
<div class="container text-center">
<ul class="nav">
<li>
<p class="navbar-text" style="color:white;">Sidekiq v<%= Sidekiq::VERSION %></p>

22
web/views/_nav.erb
View file

@ -1,7 +1,6 @@
<div class="navbar navbar-default navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<div class="col-lg-8">
<div class="container-fluid text-center">
<a class="navbar-brand" href="<%= root_path %>">
<%= Sidekiq::NAME %>
<%= erb :_status %>
@ -24,19 +23,12 @@
</li>
<% end %>
</ul>
</div>
<div class="col-lg-4">
<div class="poll-wrapper text-center">
<div class="col-xs-12 col-lg-6">
<%= erb :_poll %>
</div>
<div class="col-xs-12 col-lg-4">
<%- if Sidekiq::Web.app_url -%>
<a class="btn btn-inverse" href="<%= Sidekiq::Web.app_url %>">Back to App</a>
<%- end -%>
</div>
</div>
</div>
</div>
<div class="poll-wrapper pull-right">
<%= erb :_poll %>
<%- if Sidekiq::Web.app_url -%>
<a class="btn btn-inverse" href="<%= Sidekiq::Web.app_url %>">Back to App</a>
<%- end -%>
</div>
</div>
</div>