Skip to content

[stable15] Fix layout of "i" in admin settings of federated sharing #12829

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rullzer merged 1 commit into from
Dec 4, 2018
Merged

[stable15] Fix layout of "i" in admin settings of federated sharing #12829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Fix layout of "i" in admin settings of federated sharing 
Signed-off-by: Morris Jobke <[email protected]>
  • Loading branch information
@MorrisJobke
MorrisJobke authored and Backportbot committed Dec 4, 2018
commit 81fd9ca16a6fab157ea9259b913db6a3d7df91cb
3 changes: 3 additions & 0 deletions apps/federatedfilesharing/css/settings-admin.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#fileSharingSettings h2 {
display: inline-block;
}
7 changes: 4 additions & 3 deletions apps/federatedfilesharing/templates/settings-admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,18 @@
/** @var \OCP\IL10N $l */
/** @var array $_ */
script('federatedfilesharing', 'settings-admin');
style('federatedfilesharing', 'settings-admin');
?>

<?php if($_['internalOnly'] === false): ?>

<div id="fileSharingSettings" class="section">
<h2>
<?php p($l->t('Federated Cloud Sharing'));?>
<a target="_blank" rel="noreferrer noopener" class="icon-info svg"
title="<?php p($l->t('Open documentation'));?>"
href="<?php p(link_to_docs('admin-sharing-federated')); ?>"></a>
</h2>
<a target="_blank" rel="noreferrer noopener" class="icon-info svg"
title="<?php p($l->t('Open documentation'));?>"
href="<?php p(link_to_docs('admin-sharing-federated')); ?>"></a>

<p class="settings-hint"><?php p($l->t('Adjust how people can share between servers.')); ?></p>

Expand Down
2 changes: 1 addition & 1 deletion settings/css/settings.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1238,7 +1238,7 @@ table.grid td.date {

.icon-info {
padding: 11px 20px;
vertical-align: text-bottom;
vertical-align: super;
}

#shareAPI h2, #encryptionAPI h2, #mail_general_settings h2 {
Expand Down