diff --git a/app/assets/stylesheets/settings/addons.scss b/app/assets/stylesheets/settings/addons.scss index c9260ae32..b494c3fd0 100644 --- a/app/assets/stylesheets/settings/addons.scss +++ b/app/assets/stylesheets/settings/addons.scss @@ -9,9 +9,14 @@ .addons-title { border-bottom: $border-tertiary; + margin-bottom: 0; padding-bottom: 15px; } + .addons-subtitle { + margin-top: 2em; + } + .printers-container { .printer { border: $border-default; diff --git a/app/assets/stylesheets/settings/webhooks.scss b/app/assets/stylesheets/settings/webhooks.scss index a2a7b2d49..d22aa8284 100644 --- a/app/assets/stylesheets/settings/webhooks.scss +++ b/app/assets/stylesheets/settings/webhooks.scss @@ -67,6 +67,7 @@ .webhooks-list { list-style: none; + padding-top: .5em; } .webhook-form { @@ -91,6 +92,9 @@ } .webhook { + border-top: $border-tertiary; + padding: .5em 0; + .view-mode { align-items: center; display: flex; @@ -128,6 +132,22 @@ .fas { margin-right: .25em; } + + .divider-label { + @include font-small; + color: $color-silver-chalice; + padding-left: 1em; + } + + a { + border-radius: unset; + cursor: pointer; + padding: .5em 1em; + + &:hover { + background: $color-concrete; + } + } } } diff --git a/app/assets/stylesheets/shared/content_pane.scss b/app/assets/stylesheets/shared/content_pane.scss index 44781ee25..c5f7fd81d 100644 --- a/app/assets/stylesheets/shared/content_pane.scss +++ b/app/assets/stylesheets/shared/content_pane.scss @@ -115,7 +115,7 @@ .dropdown-menu { @include font-button; - min-width: 150px; + min-width: 200px; padding: .5em 0; a { @@ -136,6 +136,10 @@ right: 1em; } } + + .fa-stack { + width: 2em; + } } } } diff --git a/app/views/label_printers/index.html.erb b/app/views/label_printers/index.html.erb index 4dcc0565e..dcb1a988b 100644 --- a/app/views/label_printers/index.html.erb +++ b/app/views/label_printers/index.html.erb @@ -30,7 +30,7 @@ <%= t("users.settings.account.label_printer.fluics_instruction.p1") %>
  • - <%= t("users.settings.account.label_printer.fluics_instruction.p2") %> + <%= t("users.settings.account.label_printer.fluics_instruction.p2_html", link: Constants::SCINOTE_FLUICS_URL) %>
  • <%= t("users.settings.account.label_printer.fluics_instruction.p3") %> diff --git a/app/views/repositories/_print_label_modal.html.erb b/app/views/repositories/_print_label_modal.html.erb index ac4228559..e9d6a5a65 100644 --- a/app/views/repositories/_print_label_modal.html.erb +++ b/app/views/repositories/_print_label_modal.html.erb @@ -44,7 +44,7 @@

    <% end %> diff --git a/app/views/users/settings/account/addons/index.html.erb b/app/views/users/settings/account/addons/index.html.erb index dda6df42e..fee31ea9b 100644 --- a/app/views/users/settings/account/addons/index.html.erb +++ b/app/views/users/settings/account/addons/index.html.erb @@ -6,8 +6,10 @@
    +

    <%= t('users.settings.account.addons.title') %>

    +
    -

    <%= t('users.settings.account.addons.title') %>

    +

    <%= t('users.settings.account.addons.scinote_addons') %>

    <%= t('users.settings.account.addons.no_addons') %> @@ -17,7 +19,7 @@
    -

    <%= t('users.settings.account.addons.label_printers') %>

    +

    <%= t('users.settings.account.addons.label_printers') %>

    diff --git a/app/views/users/settings/webhooks/index.html.erb b/app/views/users/settings/webhooks/index.html.erb index 435e2e810..e43d35a2e 100644 --- a/app/views/users/settings/webhooks/index.html.erb +++ b/app/views/users/settings/webhooks/index.html.erb @@ -62,7 +62,7 @@ <% filter.webhooks.order(created_at: :desc).each do |webhook| %>
  • - + <%= t('webhooks.index.webhook_text_html', method: webhook.http_method.upcase, url: webhook.url) %> <% if webhook.active? %> @@ -81,6 +81,7 @@