diff --git a/app/views/orgs/admin_edit.html.erb b/app/views/orgs/admin_edit.html.erb index 05fdce0..afdfb7d 100644 --- a/app/views/orgs/admin_edit.html.erb +++ b/app/views/orgs/admin_edit.html.erb @@ -26,26 +26,25 @@ <% if @org.logo.present? %>
<%= f.label :logo, 'Organization Logo', class: "control-label" %> - <%= image_tag @org.logo.url, alt: "#{@org.name} #{_('logo')}" %> -
- <%= f.label _('Remove logo') % {application_name: Rails.configuration.branding[:application][:name]}, for: :remove_logo, class: "control-label" %> -
- <%= f.check_box :remove_logo, title: _("This will remove your organisation's logo") %> -
-
-
- - <%= _('or') %> - -
-
- <%= f.file_field :logo %> -
+
+
+ <%= image_tag @org.logo.url, alt: "#{@org.name} #{_('logo')}" %> +
+
+ <%= f.check_box :remove_logo, title: _("This will remove your organisation's logo") %> + <%= f.label _('Remove logo') % {application_name: Rails.configuration.branding[:application][:name]}, for: :remove_logo, class: "control-label" %> +
+
+ - <%= _('or') %> - +
+
+ <%= f.file_field :logo %>
<% else %>
<%= f.label :logo, 'Organization Logo', class: "control-label" %> <%= f.file_field :logo %> -
- + <% end %>
diff --git a/lib/assets/stylesheets/overrides.scss b/lib/assets/stylesheets/overrides.scss index 897e3b4..4773088 100644 --- a/lib/assets/stylesheets/overrides.scss +++ b/lib/assets/stylesheets/overrides.scss @@ -201,8 +201,7 @@ padding-right:15px; } .org-logo { - height: 100px; - padding-right:15px; + padding: 15px 10px; } /* FOOTER STYLING */