Skip to content

274 dashboard cta #296

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
khoadnguyen merged 5 commits into from
Mar 7, 2019
Merged

274 dashboard cta #296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e7acbd7
Changed card buttons/links
bdarey Feb 26, 2019
e9dc044
Assigned new class to buttons and icons giving
bdarey Feb 28, 2019
57b7397
links on bottom adjusted. Might need a little more styling (font, col…
bdarey Feb 28, 2019
ad1075e
fixed spacing issue
bdarey Mar 5, 2019
9b831f6
Merge branch 'dev' into 274-dashboard-cta
khoadnguyen Mar 7, 2019
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
1 change: 1 addition & 0 deletions src/pages/assessment/assessment.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ beforeEach(() => {
* test suite
*
*/

describe("Dates", () => {

/**
Expand Down
46 changes: 34 additions & 12 deletions src/pages/dashboard/dashboard.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,16 @@ <h2 class="action-item-title">Current Action Item:</h2>
</ion-col>
</ion-row>

<a (click)="toTimeline()" class="dashboardLinks" id="separationLink">See what's next
<ion-icon class="linkIcons" name="arrow-round-forward"></ion-icon>
</a>
<ion-item>
<button class="cardLinks" item-end clear no-margin (click)="toTimeline()">
<span>See what's next</span>
<ion-icon class="linkIcons" name="arrow-round-forward"></ion-icon>
</button>
</ion-item>

<!-- class="linkIcons" -->
<!-- class="dashboardLinks" -->

</ion-card-content>
</ion-card>
</ion-col>
Expand All @@ -85,10 +92,14 @@ <h2 class="action-item-title">Current Action Item:</h2>
</ion-card-header>
<ion-card-content id="separationContent">
<news-widget></news-widget>
<a id="separationLink" class="dashboardLinks" (click)="toNews()">More news
<ion-item>
<button class="cardLinks" item-end clear no-margin (click)="toNews()">
<span>More news</span>
<ion-icon class="linkIcons" name="arrow-round-forward"></ion-icon>
</button>
</ion-item>


<ion-icon class="linkIcons" name="arrow-round-forward"></ion-icon>
</a>
</ion-card-content>
</ion-card>

Expand All @@ -105,9 +116,13 @@ <h2 class="action-item-title">Current Action Item:</h2>

<h4 class="actionItemText">Please complete a Self Assessment</h4>

<a (click)="toSelfAssessment()" id="separationLink">Complete an assessment
<ion-icon class="linkIcons" name="arrow-round-forward"></ion-icon>
</a>
<ion-item>
<button class="cardLinks" item-end no-margin (click)="toSelfAssessment()">
<span>Complete an assessment</span>
<ion-icon class="linkIcons" name="arrow-round-forward"></ion-icon>
</button>
</ion-item>

</ion-card-content>
<ion-card-content *ngIf="prevAssess">
<chart></chart>
Expand Down Expand Up @@ -138,9 +153,16 @@ <h4 class="actionItemText">Please complete a Self Assessment</h4>
a 2.</p>

<br>
<a class="dashboardLinks" id="networkingLink">Learn More
<ion-icon class="linkIcons" name="arrow-round-forward"></ion-icon>
</a>

<ion-item>
<button class="cardLinks" item-end no-margin>
<span>Learn more</span>
<ion-icon class="linkIcons" name="arrow-round-forward"></ion-icon>
</button>
</ion-item>



</ion-card-content>
</ion-card>
</ion-col>
Expand Down
64 changes: 44 additions & 20 deletions src/pages/dashboard/dashboard.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,11 @@ page-dashboard {
#separationLink {
float: right;
float: end;
padding-bottom: 8px;
padding-bottom: 10px;
// padding-right: 20px;
font-size: 20px;
cursor: pointer;
background-color: transparent;
}
#newsLink {
float: right;
Expand All @@ -71,24 +74,31 @@ page-dashboard {
font-size: 16px;
}

.linkIcons {
font-weight: bold;
font-size: 40px;
position: relative;
top: 10px;
padding-left: 5px
}

.row2 {
min-height: 40vh;
}
// row2 causes card height issues
// .row2 {
// min-height: 40vh;
// }

.dashboardLinks {
position:absolute;
// position:absolute;
bottom:0;
right: 1vw;
}

.cardLinks {
display: flex;
flex-flow: row-nowrap;
justify-content: center;
align-items: center;
}

.linkIcons {
font-size: 40px;
margin: 10px;

}

#networkingContent {
padding: 0px 16px;
display: flex;
Expand Down Expand Up @@ -118,10 +128,10 @@ page-dashboard {
}

#networkingLink {
padding-top: 0px;
position: relative;
top: -7px;
font-size: 20px;
// padding-top: 0px;
// position: relative;
// top: -7px;
// font-size: 20px;
}

.image {
Expand All @@ -136,13 +146,27 @@ page-dashboard {
color: #2a3d4fb3;
}

.input-wrapper {
background-color: transparent;
}

button {
background-color: transparent;
color: #488aff;
}

button:hover {
color: #8eafe8;
}


.card-content ion-item.item-block {
min-height: 2rem;
}

.currentActionItemBody {
font-size: 20px;
}


}

// .toaster{
// text-align: center;
// }
3 changes: 3 additions & 0 deletions src/theme/variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ $range-ios-slider-height: 100px;

@import "ionic.globals";

.card-content .item {
background-color: transparent;
}

// Shared Variables
// --------------------------------------------------
Expand Down