Skip to content

#68 update activity #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 13, 2020
Merged

#68 update activity #102

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e68d6e7
#68 update activity
macrisguncay Apr 7, 2020
a8c9c60
Merge branch 'master' into 68-update-activities
enriquezrene Apr 13, 2020
1ae4bde
#68 using default bootstrap styles
enriquezrene Apr 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
#68 using default bootstrap styles
  • Loading branch information
@enriquezrene
enriquezrene committed Apr 13, 2020
commit 1ae4bde61eb7f6d4d3fc260b7bc8b2ea69deab58
4 changes: 2 additions & 2 deletions ...p/modules/activities-management/components/create-activity/create-activity.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ <h1 class="card-title">Activity</h1>

<div class="btn-toolbar" role="toolbar">
<div class="btn-group mr-2" role="group">
<button class="btn save-button-style mb-2" type="submit" [disabled]="!activityForm.valid">Save</button>
<button class="btn btn-primary mb-2" type="submit" [disabled]="!activityForm.valid">Save</button>
</div>
<div class="btn-group mr-2" role="group">
<button class="btn cancel-button-style mb-2" type="reset" [hidden]="!activityToEdit" (click)="cancelButton()">
<button class="btn btn-secondary mb-2" type="reset" [hidden]="!activityToEdit" (click)="cancelButton()">
Cancel
</button>
</div>
Expand Down
11 changes: 0 additions & 11 deletions ...p/modules/activities-management/components/create-activity/create-activity.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +0,0 @@
@import '../../../../../styles/colors.scss';

.save-button-style {
background-image: $button-primary-color;
color: white;
}

.cancel-button-style {
background-color: $modal-button-secondary;
color: white;
}