summaryrefslogtreecommitdiff
path: root/core/app/views
diff options
context:
space:
mode:
authorjessib <jessib@riseup.net>2013-11-18 09:57:02 -0800
committerjessib <jessib@riseup.net>2013-11-18 09:57:02 -0800
commitab2e014df85b7f931a717ed49d9b9678f6f1c5a0 (patch)
tree568a7e8cb47349431553ec5667dddcaaf57d206b /core/app/views
parent3104677b8d96cd4a118022267abc7bed818f8ddd (diff)
parent7a107e0d38271e7103d3494e06d52f3434022f22 (diff)
Merge branch 'develop' into feature/rename_ticket_title_to_subject
Diffstat (limited to 'core/app/views')
-rw-r--r--core/app/views/common/_download_for_os.html.haml4
-rw-r--r--core/app/views/common/_home_page_buttons.html.haml10
2 files changed, 9 insertions, 5 deletions
diff --git a/core/app/views/common/_download_for_os.html.haml b/core/app/views/common/_download_for_os.html.haml
index b7c88ba..4c096ce 100644
--- a/core/app/views/common/_download_for_os.html.haml
+++ b/core/app/views/common/_download_for_os.html.haml
@@ -8,8 +8,8 @@
%br/
%small= I18n.t("os.#{os}")
%span.info
- = t(:client_info, :provider => content_tag(:b,APP_CONFIG[:domain])).html_safe
- %br/
+ %div= t(:client_info, :provider => content_tag(:b,APP_CONFIG[:domain])).html_safe
+ %div
- if os == "other"
= t(:all_downloads_info, :clients => alternative_client_links(os).to_sentence).html_safe
- else
diff --git a/core/app/views/common/_home_page_buttons.html.haml b/core/app/views/common/_home_page_buttons.html.haml
index e10fd38..3be12e2 100644
--- a/core/app/views/common/_home_page_buttons.html.haml
+++ b/core/app/views/common/_home_page_buttons.html.haml
@@ -2,10 +2,14 @@
.home-buttons
.row-fluid.first
- .span3
- .download.span6
+ .span2
+ .download.span8
= render partial: 'common/download_for_os', collection: available_clients + ['other']
- .span3
+ .span2
+ - if local_assigns[:divider]
+ .row-fluid
+ .span12
+ = render local_assigns[:divider]
.row-fluid.second
.login.span4
%span.link= link_to(icon('ok-sign', icon_color) + t(:login), login_path, :class => 'btn')