Skip to content
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.

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

ui: fix for starting view buttons #54

Merged
merged 2 commits into from
Feb 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions Foodie/ClientApp/.gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# See http://help.github.com/ignore-files/ for more about ignoring files.

.angular/

# compiled output
/dist
/dist-server
Expand Down
8 changes: 4 additions & 4 deletions Foodie/ClientApp/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Foodie/ClientApp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"@angular/platform-browser": "17.1.1",
"@angular/platform-browser-dynamic": "17.1.1",
"@angular/platform-server": "17.1.1",
"@angular/pwa": "^17.1.1",
"@angular/pwa": "17.1.1",
"@angular/router": "17.1.1",
"@angular/service-worker": "17.1.1",
"angular2-counto": "^1.2.5",
Expand All @@ -43,9 +43,9 @@
"zone.js": "~0.14.0"
},
"devDependencies": {
"@angular-devkit/build-angular": "^17.1.1",
"@angular/cli": "^17.1.1",
"@angular/compiler-cli": "^17.1.1",
"@angular-devkit/build-angular": "17.1.1",
"@angular/cli": "17.1.1",
"@angular/compiler-cli": "17.1.1",
"@angular/language-service": "8.0.0",
"@types/jasmine": "~3.3.9",
"@types/jasminewd2": "~2.0.6",
Expand Down
9 changes: 3 additions & 6 deletions Foodie/ClientApp/src/app/starting/starting.component.css
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
.container {
display: flex;
flex-direction: column;
justify-content: center;
text-align: center;
align-items: center;
width: 90%;
}

Expand All @@ -11,10 +10,8 @@ h1 {
font-size: 27px;
}

button {
background: -webkit-linear-gradient(#0cebeb, #20e3b2, #29ffc6);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
a {
width: fit-content;
font-size: 27px;
}

Expand Down
9 changes: 3 additions & 6 deletions Foodie/ClientApp/src/app/starting/starting.component.html
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
<div class="container">
<h1 class="text-center header mt-5"><b>Welcome!</b></h1>
<h1 class="text-justify mt-4">This app will help you control your weight by managing your meals and tracking calorie intake. Add favorite products, create meals, supervise nutrition. </h1>
<a class="mt-4" [routerLink]='["/authentication/register"]' [state]='{ local: true }' title="Register"><button
mat-button>Sign up now!
</button></a>
<a class="mt-4" [routerLink]='["/authentication/login"]' [state]='{ local: true }' title="Login"><button mat-button >Sign in
</button></a>
</div>
<a mat-button class="mt-4 transparent-button" [routerLink]='["/authentication/register"]' [state]='{ local: true }' title="Register">Sign up now!</a>
<a mat-button class="mt-4 transparent-button" [routerLink]='["/authentication/login"]' [state]='{ local: true }' title="Login">Sign in</a>
</div>
12 changes: 6 additions & 6 deletions Foodie/ClientApp/src/styles.scss
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
/* You can add global styles to this file, and also import other style files */


/* Provide sufficient contrast against white background */

a {
color: #0366d6;
@import 'styles/material-override';

a:hover {
text-decoration: none;
}

code {
Expand All @@ -31,7 +32,7 @@ body {
button:focus,
button:active:focus,
button.active:focus {
outline: none !important;
outline: none !important;
outline-style: none !important;
}

Expand All @@ -40,7 +41,6 @@ outline: none !important;
stroke: #20e3b2 !important;
}


/* FLOATING BUTTONS */

.floating-buttons {
Expand Down Expand Up @@ -83,4 +83,4 @@ outline: none !important;
opacity: 1;
transform: scale(1);
}
}
}
11 changes: 11 additions & 0 deletions Foodie/ClientApp/src/styles/_material-override.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
.transparent-button {
--mat-mdc-focus-indicator-border-color: none;
--mat-focus-indicator-border-color: none;
}

.transparent-button .mdc-button__label {
background: -webkit-linear-gradient(#0cebeb, #20e3b2, #29ffc6);
-webkit-background-clip: text;
background-clip: text;
-webkit-text-fill-color: transparent;
}
Loading