From f9f29b6a773a7a294933d506c85e2d8aa8332027 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Thu, 1 Nov 2018 17:38:36 +0530 Subject: [PATCH] ICON changes in pd screen and login images Changes : ps --- .../list-pd/all-pd/all-pd.component.html | 8 ++- .../list-pd/all-pd/all-pd.component.scss | 42 +++++++++++--- .../completed-pd/completed-pd.component.html | 6 +- .../completed-pd/completed-pd.component.scss | 53 +++++++++++++++--- .../inprogress-pd.component.html | 6 +- .../inprogress-pd.component.scss | 41 +++++++++++--- .../qc-completed-pd.component.html | 6 +- .../qc-completed-pd.component.scss | 41 +++++++++++--- .../scheduled-pd/scheduled-pd.component.html | 6 +- .../scheduled-pd/scheduled-pd.component.scss | 32 ++++++++--- .../list-pd/view-pd/view-pd.component.html | 2 +- .../app/session/login/login-component.scss | 23 +++++++- ng6-seed/src/assets/images/bg.png | Bin 0 -> 1315 bytes .../assets/images/{login.jpg => login_n.jpg} | Bin 14 files changed, 208 insertions(+), 58 deletions(-) create mode 100644 ng6-seed/src/assets/images/bg.png rename ng6-seed/src/assets/images/{login.jpg => login_n.jpg} (100%) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html index 07380fb50..e02e7d359 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html @@ -2,15 +2,17 @@ - + - + +
{{(details.pd_type_name | slice:0:1)}}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.scss index eaa2718fe..41ca2a034 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.scss @@ -14,13 +14,39 @@ .fontsize{ font-size:14px; } -.pd_circle { - width: 50px !important; - height: 50px; - border-radius: 50%; - font-size: 18px; +// .pd_circle { +// border: 5px red !important; +// width: 50px; +// height: 50px; +// border-radius: 50px !important; +// // font-size: 18px; +// // color: red; +// // line-height: 50px; +// // text-align: center; +// background: #fff; +// } +.commonPDType{ + display:flex; + justify-content:flex-end; color: #ffffff; - line-height: 50px; + margin-top:4px; + margin-bottom:4px; + width: 60px; + height: 60px; + justify-content:center; text-align: center; - background: red - } \ No newline at end of file + border-radius: 50%; + line-height: 60px; +} +.fullPD{ + background:#009688; + border: 2px #009688; +} +.smartPD{ + background:#673ab7; + border: 2px #673ab7; +} +.telePD{ + background:#2196f3; + border: 2px #2196f3; +} \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html index be998a087..86e8b7e0e 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html @@ -2,11 +2,11 @@ - + - +
{{(details.pd_type_name | slice:0:1)}}
 diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.scss index eaa2718fe..f7963f6f7 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.scss @@ -14,13 +14,50 @@ .fontsize{ font-size:14px; } -.pd_circle { - width: 50px !important; - height: 50px; - border-radius: 50%; - font-size: 18px; +// .pd_circle { +// width: 60px !important; +// height: 60px; +// border-radius: 50%; +// font-size: 18px; +// color: #ffffff; +// text-align: center; +// background: red +// } +// .FullPD-Class{ +// background:lightcoral; +// border: 2px lightcoral; +// } +// .SmartPD-Class{ +// background:thistle; +// border: 2px thistle; +// } +// .TelePD-Class{ +// background:lawngreen; +// border: 2px lawngreen; +// } + +.commonPDType{ + display:flex; + justify-content:flex-end; color: #ffffff; - line-height: 50px; + margin-top:4px; + margin-bottom:4px; + width: 60px; + height: 60px; + justify-content:center; text-align: center; - background: red - } \ No newline at end of file + border-radius: 50%; + line-height: 60px; +} +.fullPD{ + background:#009688; + border: 2px #009688; +} +.smartPD{ + background:#673ab7; + border: 2px #673ab7; +} +.telePD{ + background:#2196f3; + border: 2px #2196f3; +} \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html index 81f2fa52b..ef0a6b08f 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html @@ -1,11 +1,11 @@ - + - +
{{(details.pd_type_name | slice:0:1)}}
 diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.scss index eaa2718fe..67347bd56 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.scss @@ -14,13 +14,38 @@ .fontsize{ font-size:14px; } -.pd_circle { - width: 50px !important; - height: 50px; - border-radius: 50%; - font-size: 18px; +// .pd_circle { +// width: 50px !important; +// height: 50px; +// border-radius: 50%; +// font-size: 18px; +// color: #ffffff; +// line-height: 50px; +// text-align: center; +// background: red +// } +.commonPDType{ + display:flex; + justify-content:flex-end; color: #ffffff; - line-height: 50px; + margin-top:4px; + margin-bottom:4px; + width: 60px; + height: 60px; + justify-content:center; text-align: center; - background: red - } \ No newline at end of file + border-radius: 50%; + line-height: 60px; +} +.fullPD{ + background:#009688; + border: 2px #009688; +} +.smartPD{ + background:#673ab7; + border: 2px #673ab7; +} +.telePD{ + background:#2196f3; + border: 2px #2196f3; +} \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html index 79ccd28ad..52a57a3ec 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html @@ -1,11 +1,11 @@ - + - +
{{(details.pd_type_name | slice:0:1)}}
 diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.scss index eaa2718fe..67347bd56 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.scss @@ -14,13 +14,38 @@ .fontsize{ font-size:14px; } -.pd_circle { - width: 50px !important; - height: 50px; - border-radius: 50%; - font-size: 18px; +// .pd_circle { +// width: 50px !important; +// height: 50px; +// border-radius: 50%; +// font-size: 18px; +// color: #ffffff; +// line-height: 50px; +// text-align: center; +// background: red +// } +.commonPDType{ + display:flex; + justify-content:flex-end; color: #ffffff; - line-height: 50px; + margin-top:4px; + margin-bottom:4px; + width: 60px; + height: 60px; + justify-content:center; text-align: center; - background: red - } \ No newline at end of file + border-radius: 50%; + line-height: 60px; +} +.fullPD{ + background:#009688; + border: 2px #009688; +} +.smartPD{ + background:#673ab7; + border: 2px #673ab7; +} +.telePD{ + background:#2196f3; + border: 2px #2196f3; +} \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html index c4aacb045..6f5fdaf0f 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html @@ -1,11 +1,11 @@ - + - +
{{(details.pd_type_name | slice:0:1)}}
 diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.scss index eaa2718fe..c7faca5e9 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.scss @@ -14,13 +14,29 @@ .fontsize{ font-size:14px; } -.pd_circle { - width: 50px !important; - height: 50px; - border-radius: 50%; - font-size: 18px; + +.commonPDType{ + display:flex; + justify-content:flex-end; color: #ffffff; - line-height: 50px; + margin-top:4px; + margin-bottom:4px; + width: 60px; + height: 60px; + justify-content:center; text-align: center; - background: red - } \ No newline at end of file + border-radius: 50%; + line-height: 60px; +} +.fullPD{ + background:#009688; + border: 2px #009688; +} +.smartPD{ + background:#673ab7; + border: 2px #673ab7; +} +.telePD{ + background:#2196f3; + border: 2px #2196f3; +} \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html index 5c135271d..7fbec37ae 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html @@ -19,7 +19,7 @@ person{{master.pd_allocated_to | titlecase}}    {{master.pd_status | titlecase}}  On {{master.scheduled_on}} - {{master.pd_status | titlecase}} + {{master.pd_status | titlecase}} diff --git a/ng6-seed/src/app/session/login/login-component.scss b/ng6-seed/src/app/session/login/login-component.scss index dd97db7a8..bbb8c363d 100644 --- a/ng6-seed/src/app/session/login/login-component.scss +++ b/ng6-seed/src/app/session/login/login-component.scss @@ -1,14 +1,33 @@ .form-bg { - background-image:url('http://www.ssa.sineedge.com/beta/assets/images/login.jpg') !important; +// background-image:url('http://www.ssa.sineedge.com/beta/assets/images/login.jpg') !important; +//background-image: url(../../../assets/images/login_o.jpg); + //background-color: #F44336; + background: url(../../../assets/images/bg.png) repeat-x 0 0 #E31F26; height: 100vh !important; background-position: center !important; min-height: calc(0vh + 0px) !important; } +.signin-page{ + float: left; + width: 100%; + + padding-bottom: 40px; +} +// .form-bg { +// float: left; +// width: 100%; +// background-color: repeat-x 0 0 #F44336; +// padding-bottom: 40px; +// } .form-bg::before { background-color: rgba(0, 0, 0, 0) !important; } +.form-bg::after{ + background-color: #E31F26; +} h3, .page-footer{ - color:red; + color:#E31F26; + background-color:#ffffff; font-weight: bold; } .bottom-sec,.mat-green{ diff --git a/ng6-seed/src/assets/images/bg.png b/ng6-seed/src/assets/images/bg.png new file mode 100644 index 0000000000000000000000000000000000000000..6c8827466ae6af2f8fab6c9991d4699b9136dcff GIT binary patch literal 1315 zcmai!TWAzl7{{k3RI$~H?Tf9E=>(s2XU@#toMXl%?(FJ9C&bM{@(`@EGiNu`-I+7a zoV_GekrpW$XdX%xF$CWPLEAt|p|J`=l+u>ISXv^jV6n9jV=vHBuRXKLt`@R%Ue1Nz z_y2C^n`8Zbd)BRebuGg%>oR-QEM1>tm{oVztfISub80=uWnmCWx zjI9?@7U|~b!7oq`!*txXazkWDdjlHS=JkN#>$Xd+8Kx&ucXgwL2%ASm%Tc&{vzIy6 zG8JwxssYVSq7iHFn1=?&`f|ot$&gJhv5W1gLn>e+qO*0o?D(**a1C8Z_rbNmu?>Wj z6mBV~A+4WHVh^!V9)t`K18hv>#c(7Zk8fusAOZnMf+&T=I1Eb=0CxG~s5j3nz^s~H z_C-$$H$sRD1))}}@wG6Iy`mt>vK(kgQiu{Ef7Bs*J>>Y^O$8PChG)6N!VViK>Umrt z3P&SdO2KwpvW~x8CR#9|uDgQBgCL~_Xc{fft$5{zbJGw|8QI7oK4rxgORJ=5Eqp~; z+iuZ5$)cyZtw{U1Q5OkWqjZ~c=g`>5PhQJP5_?#p{5x|JN4MbrWETI}Ut-|PvXc$If|3PWvO`Yif3!4Tk zV9(ZR^{wEo3a(RZc+)hPaeSgX2Fj=kM-$^M%Y?hrVOdNADH2J?L@^cJ5lyA!xD0xw zxRi{^Qqxw&MkVM$)7E@y8*XbGyyl=wP(_|qMP}N=Hrwa~wA#l4+UhOan(bo|+u8~= z7$JC@&%D*<6&-+J+nPLjXw5Ei=)ih(G6xcK!*r^zXVl(YeSRU=yRqZ-HSbQ%KS_M@ z(wRze_~?e2v-^7h+};`Mocn4E=Pi6cZCra?{NwPY3$t(i{p)uN@W##`9u~Z7GY{Tg zyuN9=YvN#MatJGCzKD=Dq#1SH>?Mc-Z&mkBKM7*TOf(@SvZ+dH>?)eD(aT z_rKjTi6-;qxvnq&{HJv2_e-mVgNrBrn!Z)Kv%Yft{`p$xp;L?dUVHI{%9$g#A53gc zIpWk^=H{o5;=i1n{BSC~tNL3}0gv3xv291=&x_=<(?5N1uX^sr1k=G(yFZ?P{PNG^ P!EY;*>QgW5KJd=J>h8PR literal 0 HcmV?d00001 diff --git a/ng6-seed/src/assets/images/login.jpg b/ng6-seed/src/assets/images/login_n.jpg similarity index 100% rename from ng6-seed/src/assets/images/login.jpg rename to ng6-seed/src/assets/images/login_n.jpg