Merge "Prepare for rule (only) editing"

This commit is contained in:
Becky Siegel
2017-12-12 18:53:53 +00:00
committed by Gerrit Code Review
3 changed files with 17 additions and 11 deletions

View File

@@ -61,12 +61,13 @@ limitations under the License.
.editContainer { .editContainer {
display: none; display: none;
} }
.deleted #deletedContainer, /* TODO @beckysiegel add back when editing allowed */
/* .deleted #deletedContainer,
#mainContainer, #mainContainer,
.editing #addPermission, .editing #addPermission,
.editing #updateBtns { .editing #updateBtns {
display: block; display: block;
} } */
.editingRef .editContainer { .editingRef .editContainer {
display: flex; display: flex;
} }
@@ -115,7 +116,7 @@ limitations under the License.
</template> </template>
<div id="addPermission"> <div id="addPermission">
Add permission: Add permission:
<select id="permissionSelect"> <select id="permissionSelect"> -->
<!-- called with a third parameter so that permissions update <!-- called with a third parameter so that permissions update
after a new section is added. --> after a new section is added. -->
<template <template
@@ -125,7 +126,8 @@ limitations under the License.
</template> </template>
</select> </select>
<gr-button id="addBtn" on-tap="_handleAddPermission">Add</gr-button> <gr-button id="addBtn" on-tap="_handleAddPermission">Add</gr-button>
</div><!-- end addPermission --> </div>
<!-- end addPermission -->
</div><!-- end sectionContent --> </div><!-- end sectionContent -->
</div><!-- end mainContainer --> </div><!-- end mainContainer -->
<div id="deletedContainer"> <div id="deletedContainer">

View File

@@ -46,9 +46,10 @@ limitations under the License.
border: 1px solid #d1d2d3; border: 1px solid #d1d2d3;
border-bottom: 0; border-bottom: 0;
} }
.editing .rules { /* TODO @beckysiegel add back */
/* .editing .rules {
border-bottom: 1px solid #d1d2d3; border-bottom: 1px solid #d1d2d3;
} } */
.title { .title {
margin-bottom: .3em; margin-bottom: .3em;
} }
@@ -56,13 +57,14 @@ limitations under the License.
#removeBtn { #removeBtn {
display: none; display: none;
} }
.editing #removeBtn { /* TODO @beckysiegel add back */
/* .editing #removeBtn {
display: block; display: block;
} }
.editing #addRule { .editing #addRule {
display: block; display: block;
padding: .7em; padding: .7em;
} } */
#deletedContainer, #deletedContainer,
.deleted #mainContainer { .deleted #mainContainer {
display: none; display: none;
@@ -105,7 +107,8 @@ limitations under the License.
placeholder="Add group" placeholder="Add group"
on-commit="_handleAddRuleItem"> on-commit="_handleAddRuleItem">
</gr-autocomplete> </gr-autocomplete>
</div> <!-- end addRule --> </div>
<!-- end addRule -->
</div> <!-- end rules --> </div> <!-- end rules -->
</div><!-- end mainContainer --> </div><!-- end mainContainer -->
<div id="deletedContainer"> <div id="deletedContainer">

View File

@@ -35,9 +35,10 @@ limitations under the License.
.buttons { .buttons {
display: none; display: none;
} }
.editing .buttons { /* TODO @beckysiegel add back */
/* .editing .buttons {
display: flex; display: flex;
} } */
#options { #options {
align-items: baseline; align-items: baseline;
display: flex; display: flex;