Merge pull request #3472 from HDinger/fix/21413-icons-in-toolbar-misaligned-IE-11

[21413] Icons in toolbar misaligned in IE 11
pull/3474/head
Oliver Günther 9 years ago
commit 68eace8f90
  1. 2
      app/assets/stylesheets/layout/_toolbar.lsg
  2. 16
      app/assets/stylesheets/layout/_toolbar.sass
  3. 4
      app/assets/stylesheets/scm.css.sass
  4. 3
      app/views/repositories/_repository_header.html.erb
  5. 1
      app/views/repositories/show.html.erb

@ -61,7 +61,7 @@ A toolbar that can and should be used for actions on the current view. Initially
<option value="oob">Boo</option> <option value="oob">Boo</option>
</select> </select>
</li> </li>
<li class="toolbar-item"> <li class="toolbar-item -icon-only">
<a href="#" class="button -highlight"> <a href="#" class="button -highlight">
<i class="button--icon icon-add"></i> <i class="button--icon icon-add"></i>
</a> </a>

@ -96,13 +96,19 @@
a.last, .last a.last, .last
margin-right: 0 margin-right: 0
.toolbar-item #repository-checkout-url
min-width: 350px
&.-icon-only .button--icon
.toolbar-item
&.-icon-only
.button
text-align: center
.button--icon
font-size: 1.1rem font-size: 1.1rem
position: relative position: relative
left: 1px left: 0
right: 1px
vertical-align: text-top
.title-container .title-container
h2 h2

@ -77,10 +77,6 @@ li.change
.repository--revision-toolbar .repository--revision-toolbar
margin-top: 3rem margin-top: 3rem
.toolbar-items
#repository-checkout-url
min-width: 350px
.repository--checkout-instructions--url .repository--checkout-instructions--url
margin-top: 1rem margin-top: 1rem

@ -54,7 +54,6 @@ See doc/COPYRIGHT.rdoc for more details.
<a id="repository--checkout-instructions-toggle" class="button -pressed" href="javascript:" <a id="repository--checkout-instructions-toggle" class="button -pressed" href="javascript:"
title="<%= l('repositories.checkout.show_instructions') %>"> title="<%= l('repositories.checkout.show_instructions') %>">
<i class="button--icon icon-info"></i> <i class="button--icon icon-info"></i>
<span class="button--text"></span>
</a> </a>
</li> </li>
<% end %> <% end %>
@ -63,7 +62,6 @@ See doc/COPYRIGHT.rdoc for more details.
<%= link_to stats_project_repository_path(@project), <%= link_to stats_project_repository_path(@project),
class: 'button', title: l(:label_statistics) do %> class: 'button', title: l(:label_statistics) do %>
<i class="button--icon icon-stats1"></i> <i class="button--icon icon-stats1"></i>
<span class="button--text"></span>
<% end %> <% end %>
</li> </li>
<% end %> <% end %>
@ -74,7 +72,6 @@ See doc/COPYRIGHT.rdoc for more details.
<%= link_to settings_project_path(@project, tab: 'repository'), <%= link_to settings_project_path(@project, tab: 'repository'),
class: 'button', title: l(:label_settings) do %> class: 'button', title: l(:label_settings) do %>
<i class="button--icon icon-settings"></i> <i class="button--icon icon-settings"></i>
<span class="button--text"></span>
<% end %> <% end %>
</li> </li>
<% end %> <% end %>

@ -85,7 +85,6 @@ See doc/COPYRIGHT.rdoc for more details.
key: User.current.rss_key } }, key: User.current.rss_key } },
{ class: 'button', title: l('repositories.atom_revision_feed') }) do %> { class: 'button', title: l('repositories.atom_revision_feed') }) do %>
<i class="button--icon icon-page-atom"></i> <i class="button--icon icon-page-atom"></i>
<span class="button--text"></span>
<% end %> <% end %>
</li> </li>
<% end %> <% end %>

Loading…
Cancel
Save