Skip to content

Commit

Permalink
Revert "Using percentage sizes for footer information with ellipses o…
Browse files Browse the repository at this point in the history
…verflow."

This reverts commit 224259b.
  • Loading branch information
mperham committed Nov 6, 2015
1 parent 4d0101d commit c5c74f4
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 25 deletions.
45 changes: 23 additions & 22 deletions web/assets/stylesheets/application.css
Expand Up @@ -713,37 +713,38 @@ div.interval-slider input {
position: relative;
top: auto;
}
}

.navbar-fixed-bottom .navbar-text {
max-width: 100%;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
line-height: normal;
}
.redis-url, .redis-namespace {
overflow: hidden;
white-space: nowrap;
}

@media (min-width: 768px) {
.navbar-fixed-bottom .navbar-text {
max-width: 22.5%;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
margin-left: 3%;
margin-right: 0;
.redis-url {
max-width: 200px;
}
.navbar-fixed-bottom li:first-child .navbar-text {
margin-left: 0;

.redis-namespace {
max-width: 150px;
}
}

.navbar-fixed-bottom .navbar-text.redis-url {
max-width: 27%;
@media (min-width: 992px) {
.redis-url {
max-width: 390px;
}

.navbar-fixed-bottom .navbar-text.redis-namespace {
max-width: 18%;
.redis-namespace {
max-width: 300px;
}
.navbar-fixed-bottom .navbar-text.product-version {
color: white;
}
@media (min-width: 1200px) {
.redis-url {
max-width: 480px;
}

.redis-namespace {
max-width: 350px;
}
}
6 changes: 3 additions & 3 deletions web/views/_footer.erb
Expand Up @@ -3,17 +3,17 @@
<div class="container text-center">
<ul class="nav">
<li>
<p class="navbar-text product-version" title="<%= h(product_version) %>"><%= product_version %></p>
<p class="navbar-text" style="color:white;"><%= product_version %></p>
</li>
<li>
<p class="navbar-text redis-url" title="<%= h(redis_connection)%>">Redis: <%= redis_connection %></p>
<p class="navbar-text redis-url">Redis: <%= redis_connection %></p>
</li>
<li>
<p class="navbar-text"><%= t('Time') %>: <%= Time.now.utc.strftime('%H:%M:%S UTC') %></p>
</li>
<% if namespace %>
<li>
<p class="navbar-text redis-namespace" title="<%= h(namespace)%>" ><%= t('Namespace') %>: <%= namespace %></p>
<p class="navbar-text redis-namespace"><%= t('Namespace') %>: <%= namespace %></p>
</li>
<% end %>
</ul>
Expand Down

0 comments on commit c5c74f4

Please sign in to comment.