Merge "Update buttons on overlays"

This commit is contained in:
Becky Siegel
2017-10-02 12:49:48 +00:00
committed by Gerrit Code Review
3 changed files with 48 additions and 34 deletions

View File

@@ -56,6 +56,13 @@ limitations under the License.
padding: .5em .75em;
width: 100%;
}
.actions {
display: flex;
justify-content: space-between;
}
.actions gr-button {
margin-left: 1em;
}
.peopleContainer,
.labelsContainer {
flex-shrink: 0;
@@ -135,9 +142,6 @@ limitations under the License.
#savingLabel.saving {
display: inline;
}
#cancelButton {
float: right;
}
@media screen and (max-width: 50em) {
:host {
max-height: none;
@@ -259,33 +263,40 @@ limitations under the License.
Saving comments...
</span>
</section>
<section>
<gr-button
primary
disabled="[[_computeSendButtonDisabled(knownLatestState, _sendButtonLabel, diffDrafts, draft, _reviewersMutated, _labelsChanged, _includeComments)]]"
class="action send"
on-tap="_sendTapHandler">[[_sendButtonLabel]]</gr-button>
<template is="dom-if" if="[[canBeStarted]]">
<section class="actions">
<div class="left">
<span
id="checkingStatusLabel"
hidden$="[[!_isState(knownLatestState, 'checking')]]">
Checking whether patch [[patchNum]] is latest...
</span>
<span
id="notLatestLabel"
hidden$="[[!_isState(knownLatestState, 'not-latest')]]">
Patch [[patchNum]] is not latest.
<gr-button link on-tap="_reload">Reload</gr-button>
</span>
</div>
<div class="right">
<gr-button
disabled="[[_isState(knownLatestState, 'not-latest')]]"
class="action save"
on-tap="_saveTapHandler">Save</gr-button>
</template>
<span
id="checkingStatusLabel"
hidden$="[[!_isState(knownLatestState, 'checking')]]">
Checking whether patch [[patchNum]] is latest...
</span>
<span
id="notLatestLabel"
hidden$="[[!_isState(knownLatestState, 'not-latest')]]">
Patch [[patchNum]] is not latest.
<gr-button link on-tap="_reload">Reload</gr-button>
</span>
<gr-button
id="cancelButton"
class="action cancel"
on-tap="_cancelTapHandler">Cancel</gr-button>
link
id="cancelButton"
class="action cancel"
on-tap="_cancelTapHandler">Cancel</gr-button>
<gr-button
link
primary
disabled="[[_computeSendButtonDisabled(knownLatestState, _sendButtonLabel, diffDrafts, draft, _reviewersMutated, _labelsChanged, _includeComments)]]"
class="action send"
on-tap="_sendTapHandler">[[_sendButtonLabel]]</gr-button>
<template is="dom-if" if="[[canBeStarted]]">
<gr-button
link
disabled="[[_isState(knownLatestState, 'not-latest')]]"
class="action save"
on-tap="_saveTapHandler">Save</gr-button>
</template>
</div>
</section>
</div>
<gr-js-api-interface id="jsAPI"></gr-js-api-interface>

View File

@@ -45,20 +45,23 @@ limitations under the License.
footer {
padding: .5em .65em;
}
gr-button {
margin-left: 1em;
}
footer {
display: flex;
flex-shrink: 0;
justify-content: space-between;
justify-content: flex-end;
}
</style>
<div class="container">
<header><content select=".header"></content></header>
<main><content select=".main"></content></main>
<footer>
<gr-button primary on-tap="_handleConfirmTap" disabled="[[disabled]]">
<gr-button link on-tap="_handleCancelTap">Cancel</gr-button>
<gr-button link primary on-tap="_handleConfirmTap" disabled="[[disabled]]">
[[confirmLabel]]
</gr-button>
<gr-button on-tap="_handleCancelTap">Cancel</gr-button>
</footer>
</div>
</template>

View File

@@ -92,8 +92,8 @@ limitations under the License.
label="[[labelText]]"
value="{{_inputText}}"></paper-input>
<div class="buttons">
<gr-button id="cancelBtn" on-tap="_cancel">cancel</gr-button>
<gr-button id="saveBtn" on-tap="_save">save</gr-button>
<gr-button link id="cancelBtn" on-tap="_cancel">cancel</gr-button>
<gr-button link id="saveBtn" on-tap="_save">save</gr-button>
</div>
</div>
</div>