diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-07-15 13:21:07 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-07-15 13:21:07 +0200 |
| commit | 34a16e0ab9d26097a8b62ddb3e75dc9a74c64b55 (patch) | |
| tree | e64d9ef8e360dd6e302a681e0d89eb548e450d1e /view | |
| parent | c2779b6f33c1e23071a0f44d3953b1868dfe6a7b (diff) | |
| parent | da5ec98f98dd8cef034d568bf0f67231e8517bd4 (diff) | |
| download | volse-hubzilla-34a16e0ab9d26097a8b62ddb3e75dc9a74c64b55.tar.gz volse-hubzilla-34a16e0ab9d26097a8b62ddb3e75dc9a74c64b55.tar.bz2 volse-hubzilla-34a16e0ab9d26097a8b62ddb3e75dc9a74c64b55.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
Diffstat (limited to 'view')
| -rw-r--r-- | view/theme/redbasic/css/style.css | 11 | ||||
| -rw-r--r-- | view/tpl/settings_tokens.tpl | 5 |
2 files changed, 14 insertions, 2 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index b558e7206..06d72588b 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2036,3 +2036,14 @@ dl.bb-dl > dd > li { border-style: solid; border-width: 5px; } + +.atoken-list { + margin-right: 5px; + list-style-type: none; +} +.atoken-list li { + margin-bottom: 10px; +} +.atoken-text { + margin: 5px 10px 5px 10px; +}
\ No newline at end of file diff --git a/view/tpl/settings_tokens.tpl b/view/tpl/settings_tokens.tpl index 8763a681c..a81d65dfc 100644 --- a/view/tpl/settings_tokens.tpl +++ b/view/tpl/settings_tokens.tpl @@ -3,6 +3,7 @@ <h2>{{$title}}</h2> <div class="clear"></div> </div> + <div class="atoken-text descriptive-text">{{$desc}}</div> <form action="settings/tokens" id="settings-account-form" method="post" autocomplete="off" > <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> {{if $atoken}}<input type="hidden" name="atoken_id" value="{{$atoken.atoken_id}}" />{{/if}} @@ -17,9 +18,9 @@ </form> {{if $tokens}} <div> - <ul> + <ul class="atoken-list"> {{foreach $tokens as $t}} - <li><a href="settings/tokens/{{$t.atoken_id}}">{{$t.atoken_name}}</a> <a href="settings/tokens/{{$t.atoken_id}}/drop"><i class="fa fa-remove btn btn-xs btn-default pull-right"></i></a></li> + <li><span class="pull-right atoken-drop"><a href="settings/tokens/{{$t.atoken_id}}/drop"><i class="fa fa-trash btn btn-xs btn-default"></i></a></span><a href="settings/tokens/{{$t.atoken_id}}">{{$t.atoken_name}}</a></li> {{/foreach}} </ul> </div> |