luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

ui: Alter position of dashboard button in the service instance header (#11988)

This commit is contained in:
John Cowen 2022-01-12 09:31:54 +00:00 committed by GitHub
parent fe105d1ba7
commit 754afd356a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ui/packages/consul-ui/app/components/app-view/layout.scss
View File

@ -21,9 +21,6 @@
%app-view-actions { %app-view-actions {
margin-top: 9px; margin-top: 9px;
} }
%app-view-actions > *:not(:last-child) {
margin-right: 12px;
}
/* content */ /* content */
/* TODO: Think about an %app-form or similar */ /* TODO: Think about an %app-form or similar */

8
ui/packages/consul-ui/app/styles/routes/dc/services/index.scss
View File

@ -1,3 +1,11 @@
/* drop the external dashboard button down if it exists */
/* so it doesn't sit next to the Intentions create button */
/* awkwardly */
html[data-route^='dc.services.show'] .app-view .actions .external-dashboard {
position: absolute;
top: 50px;
right: 0;
}
/* instance detail dl text*/ /* instance detail dl text*/
html[data-route^='dc.services.instance'] .app-view > header dl { html[data-route^='dc.services.instance'] .app-view > header dl {
float: left; float: left;

10
ui/packages/consul-ui/app/templates/dc/services/show.hbs
View File

@ -186,8 +186,8 @@ as |items item dc|}}
}} }}
as |config|> as |config|>
{{#if config.data.dashboard_url_templates.service}} {{#if config.data.dashboard_url_templates.service}}
<a <Action
href={{render-template config.data.dashboard_url_templates.service @href={{render-template config.data.dashboard_url_templates.service
(hash (hash
Datacenter=dc.Name Datacenter=dc.Name
Service=(hash Service=(hash
@ -197,12 +197,12 @@ as |items item dc|}}
) )
) )
}} }}
target="_blank" @external={{true}}
rel="noopener noreferrer" class="external-dashboard"
data-test-dashboard-anchor data-test-dashboard-anchor
> >
Open dashboard Open dashboard
</a> </Action>
{{/if}} {{/if}}
</DataSource> </DataSource>
</BlockSlot> </BlockSlot>