diff --git a/app/assets/javascripts/app/views/twitter/account_edit.jst.eco b/app/assets/javascripts/app/views/twitter/account_edit.jst.eco index fb3c63b1b..21cdd0ac9 100644 --- a/app/assets/javascripts/app/views/twitter/account_edit.jst.eco +++ b/app/assets/javascripts/app/views/twitter/account_edit.jst.eco @@ -1,7 +1,8 @@
- <%- @T('Search Terms') %> +

<%- @T('Search Terms') %>

+

<%- @T('Tweets containing search terms are automatically turned into tickets.') %>

-
-
- <%- @T('Mentions') %> ->
+

<%- @T('Mentions Group') %>

+

<%- @T('Choose which group %s will get added to.', 'mentions') %>

+
-
-
- <%- @T('Direct Messages') %> ->
+

<%- @T('Direct Messages Group') %>

+

<%- @T('Choose which group %s will get added to.', 'direct messages') %>

+
\ No newline at end of file diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss index b7c53cb41..589f5b7c2 100644 --- a/app/assets/stylesheets/zammad.scss +++ b/app/assets/stylesheets/zammad.scss @@ -45,6 +45,14 @@ p { &.subtle { color: hsl(60,1%,74%); } + + &.description { + color: hsl(190,2%,74%); + } +} + +h3 + .description { + margin-top: 0; } strong { @@ -5418,6 +5426,11 @@ footer { h2:first-child { margin-top: 0; } + + p:first-child, + .alert.hidden:first-child + p { + margin-top: 0; + } .table > thead > tr > th { background: hsl(197,20%,93%);