Discource-C
/
discourse-data-explorer
mirror of https://github.com/discourse/discourse-data-explorer.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UX: Fix button alignment following core changes (#137)

This commit is contained in:
Penar Musaraj 2021-09-14 09:44:32 -04:00 committed by GitHub
parent 6ce092d969
commit 0c9005513a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assets/javascripts/discourse/templates/admin/plugins-explorer.hbs
View File

@ -114,7 +114,7 @@
<div class="clear"></div> <div class="clear"></div>
<div class="pull-left"> <div class="pull-left left-buttons">
{{#if everEditing}} {{#if everEditing}}
{{d-button action=(action "save") label="explorer.save" disabled=saveDisable}} {{d-button action=(action "save") label="explorer.save" disabled=saveDisable}}
{{else}} {{else}}
@ -128,7 +128,7 @@
{{/if}} {{/if}}
</div> </div>
<div class="pull-right"> <div class="pull-right right-buttons">
{{#if selectedItem.destroyed}} {{#if selectedItem.destroyed}}
{{d-button action=(action "recover") class="" icon="undo" label="explorer.recover"}} {{d-button action=(action "recover") class="" icon="undo" label="explorer.recover"}}
{{else}} {{else}}

2
assets/javascripts/discourse/templates/components/explorer-schema.hbs
View File

@ -1,6 +1,8 @@
<div class={{if hideSchema "hidden"}}> <div class={{if hideSchema "hidden"}}>
<div class="schema-search inline-form full-width">
{{text-field value=filter placeholderKey="explorer.schema.filter"}} {{text-field value=filter placeholderKey="explorer.schema.filter"}}
{{d-button action=(action "collapseSchema") icon="chevron-right" class="no-text"}} {{d-button action=(action "collapseSchema") icon="chevron-right" class="no-text"}}
</div>
{{conditional-loading-spinner condition=loading}} {{conditional-loading-spinner condition=loading}}
<div class="schema-container"> <div class="schema-container">
<ul> <ul>

26
assets/stylesheets/explorer.scss
View File

@ -77,13 +77,10 @@ table.group-reports {
overflow-y: scroll; overflow-y: scroll;
overflow-x: hidden; overflow-x: hidden;
color: var(--primary-high); color: var(--primary-high);
font-size: $font-down-2; font-size: var(--font-down-1);
input { .schema-search {
padding: 4px; margin: 0.5em;
margin: 3px;
// 100% - padding + margin * 2 - border - button - buttonborder
width: calc(100% - 14px - 1px - 40px - 2px);
} }
.schema-table-name { .schema-table-name {
font-weight: bold; font-weight: bold;
@ -205,7 +202,6 @@ table.group-reports {
.name input, .name input,
.desc textarea { .desc textarea {
width: 100%; width: 100%;
box-sizing: border-box;
margin: 0; margin: 0;
} }
&:not(.editing) .desc { &:not(.editing) .desc {
@ -304,7 +300,7 @@ table.group-reports {
.query-list { .query-list {
display: flex; display: flex;
max-height: 30px; align-items: flex-start;
.btn-left { .btn-left {
margin-right: 0.5em; margin-right: 0.5em;
} }
@ -424,3 +420,17 @@ table.group-reports {
z-index: 1; z-index: 1;
} }
} }
.left-buttons,
.right-buttons {
display: flex;
align-items: flex-start;
}
.left-buttons .btn {
margin-right: 0.5em;
}
.right-buttons .btn {
margin-left: 0.5em;
}