Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

channel twitter: add description text, style description

Browse source
This commit is contained in:
Felix Niklas 2016-01-19 09:58:37 +01:00
parent 3c4241b05f
commit 7b8fef1991
2 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/assets/javascripts/app/views/twitter/account_edit.jst.eco
View file

@ -1,7 +1,8 @@
<div class="alert alert--danger hidden" role="alert"></div> <div class="alert alert--danger hidden" role="alert"></div>
<fieldset> <fieldset>
<%- @T('Search Terms') %> <h3><%- @T('Search Terms') %></h3>
<p class="description"><%- @T('Tweets containing search terms are automatically turned into tickets.') %></p>
<div class="js-searchTerm"> <div class="js-searchTerm">
<div class="js-searchTermItem js-searchTermPlaceholder hidden"> <div class="js-searchTermItem js-searchTermPlaceholder hidden">
<input name="" value=""> -> <div class="js-groups"></div> <input name="" value=""> -> <div class="js-groups"></div>
@ -16,16 +17,16 @@
</div> </div>
</div> </div>
<hr>
<div class="js-mention"> <div class="js-mention">
<%- @T('Mentions') %> -> <div class="js-groups"></div> <h3><%- @T('Mentions Group') %></h3>
<p class="description"><%- @T('Choose which group %s will get added to.', 'mentions') %></p>
<div class="js-groups"></div>
</div> </div>
<hr>
<div class="js-directMessage"> <div class="js-directMessage">
<%- @T('Direct Messages') %> -> <div class="js-groups"></div> <h3><%- @T('Direct Messages Group') %></h3>
<p class="description"><%- @T('Choose which group %s will get added to.', 'direct messages') %></p>
<div class="js-groups"></div>
</div> </div>
</fieldset> </fieldset>

13
app/assets/stylesheets/zammad.scss
View file

@ -45,6 +45,14 @@ p {
&.subtle { &.subtle {
color: hsl(60,1%,74%); color: hsl(60,1%,74%);
} }
&.description {
color: hsl(190,2%,74%);
}
}
h3 + .description {
margin-top: 0;
} }
strong { strong {
@ -5418,6 +5426,11 @@ footer {
h2:first-child { h2:first-child {
margin-top: 0; margin-top: 0;
} }
p:first-child,
.alert.hidden:first-child + p {
margin-top: 0;
}
.table > thead > tr > th { .table > thead > tr > th {
background: hsl(197,20%,93%); background: hsl(197,20%,93%);