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.

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

Tailwind migration #416

Draft
wants to merge 5 commits into
base: develop
Choose a base branch
from
Draft

Tailwind migration #416

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
a807db3
WIP : using tailwind migrator
pkrawat1 Nov 22, 2023
8340b00
remove custom theme
pkrawat1 Nov 24, 2023
d3962af
remove unused bootstrap code
pkrawat1 Nov 24, 2023
31881b2
remove warnings and scss for tailwind usage
pkrawat1 Nov 25, 2023
2c3ddcf
wip : header
pkrawat1 Nov 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
11 changes: 7 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,27 +48,27 @@
"@ngrx/effects": "^10.0.1",
"@ngrx/entity": "^10.0.1",
"@ngrx/store": "^10.0.1",
"@ngu/carousel": "^3.0.1",
"@nguniversal/builders": "^14.0.3",
"@nguniversal/common": "^14.0.3",
"@nguniversal/express-engine": "^14.0.3",
"@ngx-lite/input-star-rating": "^0.3.7",
"@ngx-lite/json-ld": "^0.6.4",
"ngx-progressbar": "^6.0.3",
"@ngu/carousel": "^3.0.1",
"@types/crypto-js": "^3.1.40",
"@types/express": "^4.17.9",
"angular-svg-round-progressbar": "^5.0.2",
"bootstrap": "4.1.3",
"crypto-js": "^3.1.9-1",
"jsonapi-deserializer": "^0.1.1",
"express": "^4.17.1",
"fibers": "^4.0.2",
"font-awesome": "^4.7.0",
"hammerjs": "^2.0.8",
"immutable": "^4.0.0-rc.12",
"jsonapi-deserializer": "^0.1.1",
"ng-lazyload-image": "^7.0.1",
"ng2-ui-auth": "^9.2.0",
"ngx-bootstrap": "^6.2.0",
"ngx-progressbar": "^6.0.3",
"ngx-toastr": "^16.0.2",
"picturefill": "^3.0.3",
"reselect": "^4.0.0",
Expand All @@ -94,6 +94,7 @@
"@types/morris.js": "~0.5.7",
"@types/node": "^12.11.7",
"@types/scriptjs": "^0.0.2",
"autoprefixer": "^10.4.16",
"codelyzer": "^6.0.0",
"jasmine-core": "~3.6.0",
"jasmine-spec-reporter": "~5.0.0",
Expand All @@ -104,9 +105,11 @@
"karma-jasmine": "~4.0.0",
"karma-jasmine-html-reporter": "^1.5.0",
"nswag": "^11.20.1",
"postcss": "^8.4.31",
"protractor": "~7.0.0",
"source-map-explorer": "^1.6.0",
"sw-precache": "^5.2.1",
"tailwindcss": "^3.3.5",
"ts-node": "~7.0.1",
"tslint": "~6.1.0",
"typescript": "4.9.5",
Expand All @@ -116,4 +119,4 @@
"main": "index.js",
"repository": "[email protected]:aviabird/angularspree.git",
"author": "Pankaj Rawat <[email protected]>"
}
}
165 changes: 0 additions & 165 deletions src/app/app.component.scss
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/app/app.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import { AuthActions } from './auth/actions/auth.actions';
@Component({
selector: 'app-root',
templateUrl: './app.component.html',
styleUrls: ['./app.component.scss']

})
export class AppComponent implements OnInit, OnDestroy {
currentUrl: string;
Expand Down
22 changes: 11 additions & 11 deletions src/app/auth/components/forget-password/forget-password.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<div class="container">
<div class="col-12 col-md-7 col-sm-7 col-lg-5 loginwindow">
<div class="row">
<div class="col-12 col-md-12 col-sm-12 col-lg-12">
<div class="row login-container" data-hook="">
<div id="content" class="col-sm-12" data-hook="">
<div class="col-md-12 col-12 col-centered">
<div class="container mx-auto sm:px-4">
<div class="w-full md:w-3/5 pr-4 pl-4 sm:w-3/5 pr-4 pl-4 lg:w-2/5 pr-4 pl-4 loginwindow">
<div class="flex flex-wrap ">
<div class="w-full md:w-full pr-4 pl-4 sm:w-full pr-4 pl-4 lg:w-full pr-4 pl-4">
<div class="flex flex-wrap login-container" data-hook="">
<div id="content" class="sm:w-full pr-4 pl-4" data-hook="">
<div class="md:w-full pr-4 pl-4 w-full col-centered">
<div class="panel panel-default" *ngIf="emailSent == false">
<div class="panel-heading">
<h3 class="panel-title">Forget Password?</h3>
Expand Down Expand Up @@ -36,8 +36,8 @@ <h3 class="panel-title">Forget Password?</h3>
forgetPasswordForm.get('email').touched
"
>
<span class="login-error-icon text-danger">!</span>
<p class="login-error-message text-danger">
<span class="login-error-icon text-red-600">!</span>
<p class="login-error-message text-red-600">
{{
forgetPasswordForm.get('email').errors.msg ||
'Please enter a valid email id'
Expand All @@ -49,7 +49,7 @@ <h3 class="panel-title">Forget Password?</h3>
<fieldset class="login-login-button-container">
<button
type="submit"
class="btn btn-danger login-login-button"
class="inline-block align-middle text-center select-none border font-normal whitespace-no-wrap rounded py-1 px-3 leading-normal no-underline bg-red-600 text-white hover:bg-red-700 login-login-button"
>
Reset Password
</button>
Expand All @@ -61,7 +61,7 @@ <h3 class="panel-title">Forget Password?</h3>
<div class="panel-heading">
<img
src="../../../../assets/custom/rocket.png"
class="img-fluid my-4 h-50"
class="max-w-full h-auto my-4 h-50"
/>
<h3 class="panel-title">Email Sent!</h3>
<p>
Expand Down
Loading