Skip to content

Commit

Permalink
💄 Manages the overlay and edition buttons state
Browse files Browse the repository at this point in the history
  • Loading branch information
Ocunidee committed Mar 6, 2020
1 parent f7e53bf commit 37a5468
Show file tree
Hide file tree
Showing 9 changed files with 61 additions and 30 deletions.
14 changes: 7 additions & 7 deletions src/app/components/configuration/configuration.component.css
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ h2 {
flex-direction: row;
justify-content: flex-start;
align-items: stretch;
padding: 10px 0px 40px;
padding: 10px 0 40px;
}

.form-section-title {
Expand All @@ -25,7 +25,7 @@ h2 {
}

.form-section {
padding: 0px 20px 20px 10px;
padding: 0 20px 20px 10px;
background: #eee;
margin: 5px 0 5px 20px;
border-radius: 5px;
Expand All @@ -40,7 +40,7 @@ h2 {
}

.centered-form-section {
padding: 0px 20px 20px 10px;
padding: 0 20px 20px 10px;
background: #eee;
margin: 5px 0 5px 20px;
border-radius: 5px;
Expand Down Expand Up @@ -97,7 +97,7 @@ h2 {
.center-self {
display: flex;
align-items: center;
margin: 30px 0px 10px;
margin: 30px 0 10px;
justify-content: flex-start;
}

Expand All @@ -118,8 +118,8 @@ h2 {
color: #369;
text-align: center;
border-radius: 50%;
margin: 0px 20px 0px 5px;
box-shadow: 2px 2px 4px 0px #ccc;
margin: 0 20px 0 5px;
box-shadow: 2px 2px 4px 0 #ccc;
}

.number-circle + div {
Expand Down Expand Up @@ -211,7 +211,7 @@ h2 {

/* overrding button margins */
button {
margin: 0px 20px 10px 20px;
margin: 0 20px 10px 20px;
}

form p {
Expand Down
6 changes: 3 additions & 3 deletions src/app/components/configuration/configuration.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<h1>Configuration</h1>
<h2>Let's configure which Jira tickets to print and the space they'll take on a post-it.</h2>
</div>
<button (click)="onSkip()" [disabled]="!preExistingData">Skip</button>
<button (click)="onSkip()" [disabled]="!preExistingData" class="regular-button">Skip</button>
</div>
<div>
<div>
Expand Down Expand Up @@ -34,7 +34,7 @@ <h2>Let's configure which Jira tickets to print and the space they'll take on a
<span class="bar"></span>
<label>Project key</label>
</div>
<button [disabled]="!projectKey" (click)="getIssueTypes()" id="fetch">{{ submittedProjectKey ? "Synchronize with Jira" : "Fetch" }}</button>
<button [disabled]="!projectKey" (click)="getIssueTypes()" id="fetch" class="regular-button">{{ submittedProjectKey ? "Synchronize with Jira" : "Fetch" }}</button>
</div>
</div>
<div *ngIf="submittedProjectKey" class= "form-section size-limited scrollbar">
Expand Down Expand Up @@ -104,7 +104,7 @@ <h2>Let's configure which Jira tickets to print and the space they'll take on a
</div>
</div>
<div *ngIf="submittedProjectKey" class="centered">
<button [disabled]='!submittedProjectKey || form.invalid ' (click)="onSubmit()">Save</button>
<button [disabled]='!submittedProjectKey || form.invalid' (click)="onSubmit()" class="regular-button">Save</button>
</div>
</form>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -341,8 +341,7 @@ p {
}

.full-ticket:hover .overlay div {
opacity: 0.35;

animation: 0.3s fadein both
}

.full-ticket:hover .overlay img {
Expand All @@ -366,13 +365,13 @@ p {
/*==================================================
* Edition styling
* ===============================================*/
.btn {
.card-round-button {
display: inline-block;
position: absolute;
text-decoration: none;
bottom: -20px;
right: 60px;
background: #ff8181;
right: 80px;
background: #336699;
color: #FFF;
width: 40px;
height: 40px;
Expand All @@ -383,17 +382,20 @@ p {
vertical-align: middle;
overflow: hidden;
box-shadow: 0 2px 2px rgba(0, 0, 0, 0.29);
border-bottom: solid 3px #bd6565;
border-width: 0;
border-bottom: solid 3px #193d61;
transition: .4s;
margin: 0;
padding: 0;
}

.btn2 {
right:100px;
.card-cancel-button {
right:130px;
background: #888888;
border-bottom: solid 3px #333333;
}

.btn:active {
.card-round-button:active {
top: none;
position: absolute;
-ms-transform: translateY(2px);
Expand All @@ -402,4 +404,17 @@ p {
box-shadow: 0 0 1px rgba(0, 0, 0, 0.15);
border-bottom: none;
}

.card-round-button:hover {
box-shadow: inset 10px 10px 40px 5px rgba(0,0,0,0.2);
}

@keyframes fadein {
from { opacity: 0; }
to { opacity: 0.35; }
}

.permanent-opacity {
animation: 0.3s fadein both;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
</div>
<h1>{{sprintName}}</h1>
<div class="flexcontainer">
<div class="full-ticket" *ngFor="let issue of fullPostitIssues">
<div class="full-ticket" *ngFor="let issue of fullPostitIssues; index as i">
<div>
<div class="story-header">
<p class="tickeykey">{{issue.key | ticketkey}}</p>
Expand Down Expand Up @@ -32,13 +32,16 @@ <h1>{{sprintName}}</h1>
<img src="../../assets/end.svg" alt="end date">
</div>
</div>
<div class="overlay">
<div *ngIf="!fullTicketInEdition && fullTicketInEdition !== 0" class="overlay" (click)="enterFullTicketEditionMode(i)">
<div class="overlay-background"></div>
<img src="../../assets/pencil-black.svg">
</div>
<div *ngIf="fullTicketInEdition !== null && fullTicketInEdition !== i" class="overlay">
<div class="overlay-background permanent-opacity"></div>
</div>
</div>
<button class="btn">.</button>
<button class="btn btn2">.</button>
<button *ngIf="fullTicketInEdition === i" class="card-round-button">&#10003;</button>
<button *ngIf="fullTicketInEdition === i" (click)="exitFullTicketEditionMode()" class="card-round-button card-cancel-button">&#10008;</button>
</div>
<ng-container *ngFor="let issues of smallPostitIssues">
<div class="divided-ticket" *ngFor="let chunk of issues | chunks: 3; let i = index; let last = last">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ export class FormattedTicketsComponent implements OnInit, OnDestroy {
isTimeTracked = false
isComponentGrouped = false
step = Step.PRINTING
fullTicketInEdition: number | null = null
private unsubscribe = new Subject<void>()

constructor(
Expand Down Expand Up @@ -117,6 +118,15 @@ export class FormattedTicketsComponent implements OnInit, OnDestroy {
})
}

//Edition mode
enterFullTicketEditionMode(index: number) {
this.fullTicketInEdition = index
}

exitFullTicketEditionMode() {
this.fullTicketInEdition = null
}

ngOnDestroy(): void {
this.unsubscribe.next()
this.unsubscribe.complete()
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/get-started/get-started.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ <h2>Sign in</h2>
alt="where to find the board id in the url"
/>
<div *ngIf="!authenticated()" class="centered-container">
<button routerLink="/login">Sign in</button>
<button routerLink="/login" class="regular-button">Sign in</button>
</div>
</div>
<h2>Printing configuration</h2>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ <h2>{{boardName}}</h2>
</div>
</div>
<p *ngIf="form.errors?.noIssue && form.dirty">{{form.errors?.noIssue.message}}</p>
<button type="submit" [disabled]="form.invalid">Format tickets</button>
<button type="submit" [disabled]="form.invalid" class="regular-button">Format tickets</button>
</form>
2 changes: 1 addition & 1 deletion src/app/components/login/login.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ <h1>Let's retrieve your Jira board</h1>
</div>
</div>
<div class="centered">
<button>SIGN IN</button>
<button class="regular-button">SIGN IN</button>
</div>
</form>
</div>
Expand Down
11 changes: 7 additions & 4 deletions src/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,13 @@ body, input[text], button {
/* BUTTONS ============================== */
button:focus {
outline: none !important;
}

.regular-button:focus {
border: 0;
}

button {
.regular-button {
margin: 30px 65px;
background-color:#369;
border-radius: 24px;
Expand All @@ -53,16 +56,16 @@ button {
text-decoration:none;
}

button:hover {
.regular-button:hover {
background-color:#476e9e;
}

button:enabled:active {
.regular-button:enabled:active {
position:relative;
top:1px;
}

button:disabled {
.regular-button:disabled {
background-color: #555;
}

Expand Down

0 comments on commit 37a5468

Please sign in to comment.