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

Jump to bottom

SN 261 #1460

Merged
merged 9 commits into from
Oct 5, 2024
Merged

SN 261 #1460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f9626c8
pgr citizen issue fix
NabeelAyubee Oct 3, 2024
55f984f
dss package
NabeelAyubee Oct 3, 2024
3eb533d
Added new side bar cmponent
NabeelAyubee Oct 4, 2024
4a4b159
added
NabeelAyubee Oct 4, 2024
5904bd0
Merge branch 'develop' into SN-261
NabeelAyubee Oct 4, 2024
168be75
Merge branch 'develop' into SN-261
nabeelmd-eGov Oct 4, 2024
47dfa52
added css
NabeelAyubee Oct 4, 2024
d0dbf91
Merge branch 'SN-261' of github.com:egovernments/DIGIT-Frontend into …
NabeelAyubee Oct 4, 2024
f90e62b
added
NabeelAyubee Oct 4, 2024
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: 1 addition & 1 deletion micro-ui/web/micro-ui-internals/packages/css/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@egovernments/digit-ui-css",
"version": "1.8.2-beta.34",
"version": "1.8.2-beta.35",
"license": "MIT",
"main": "dist/index.css",
"author": "Jagankumar <[email protected]>",
Expand Down
8 changes: 4 additions & 4 deletions micro-ui/web/micro-ui-internals/packages/css/src/components/table.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

thead {
th {
background-color: #ffffff;
nabeelmd-eGov marked this conversation as resolved.
Show resolved Hide resolved
padding: 20px 18px;
@apply font-bold align-middle text-left;
&:first-child {
Expand All @@ -14,7 +15,6 @@
}
}


tbody {
border: none;
padding: 0;
Expand Down Expand Up @@ -102,7 +102,7 @@
position: sticky;
background: #fff;
right: 0;
left:0;
left: 0;
nabeelmd-eGov marked this conversation as resolved.
Show resolved Hide resolved
border-top-left-radius: 4px;
}
}
Expand All @@ -112,7 +112,7 @@
background: #fff;
color: theme(colors.primary.main);
left: 0;
right:0;
right: 0;
}
}
}
Expand Down Expand Up @@ -192,7 +192,7 @@
.reports-table {
margin-top: 2rem;
thead {
th {
th {
&:first-child {
min-width: unset;
}
Expand Down
43 changes: 35 additions & 8 deletions micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/sandbox.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
thead {
tr {
th {
background-color: #ffffff;
background-color: #ffffff !important;
nabeelmd-eGov marked this conversation as resolved.
Show resolved Hide resolved
}
}
}
Expand Down Expand Up @@ -114,21 +114,21 @@
}

.digit-card-component {
.bannerHeader p{
.bannerHeader p {
font-size: 2rem;
}
}

.digit-card-component{
.digit-card-component {
.bannerHeader {
margin-top: -1.5rem;
margin-bottom: -0.5rem !important;
.bannerLogo {
width: 10rem;
height: 2rem;
.bannerLogo {
width: 10rem;
height: 2rem;
}
}
}
}
.employeeCard {
height: 500px !important;
width: 408px !important;
Expand Down Expand Up @@ -255,7 +255,7 @@
.digit-card-component.signupCardClassName.sandbox-onboarding-wrapper {
.bannerHeader {
.bannerLogo {
margin-top:0.5rem;
margin-top: 0.5rem;
height: 2rem;
width: 10rem;
margin-bottom: -0.5rem;
Expand Down Expand Up @@ -619,3 +619,30 @@ digit-card-text.center {
text-decoration: none;
}
}
.profileDropdown {
input {
font-size: 1rem !important;
}
}
nabeelmd-eGov marked this conversation as resolved.
Show resolved Hide resolved

.digit-card-component {
&.sandbox-guide {
&::-webkit-scrollbar {
width: 0.3rem;
background-color: #fff;
}

&::-webkit-scrollbar-track {
background-color: #fff;
border-radius: 0.3rem;
}

&::-webkit-scrollbar-thumb {
background-color: #d6d5d4;
border-radius: 0.3rem;
}
}
}
.infotext {
width: 20rem !important;
}
nabeelmd-eGov marked this conversation as resolved.
Show resolved Hide resolved
4 changes: 2 additions & 2 deletions micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/FAQs/FaqComponent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ArrowForward } from "@egovernments/digit-ui-components";
import { ArrowForward } from "@egovernments/digit-ui-svg-components";
import React, { useState } from "react";
import { useTranslation } from "react-i18next";

Expand All @@ -12,7 +12,7 @@ const FaqComponent = (props) => {
<div className="faq-question" style={{ justifyContent: "space-between", display: "flex" }}>
<span>{t(question)}</span>
<span className={isOpen ? "faqicon rotate" : "faqicon"} style={{ float: "right" }}>
{isOpen ? <ArrowForward /> : <ArrowForward />}
<ArrowForward />
</span>
</div>

Expand Down
5 changes: 3 additions & 2 deletions micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/UserProfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,8 +580,8 @@ const UserProfile = ({ stateCode, userType, cityDetails }) => {
<LabelFieldPair>
<CardLabel className="user-profile" style={editScreen ? { color: "#B1B4B6" } : {}}>{`${t("CORE_COMMON_PROFILE_GENDER")}`}</CardLabel>
<Dropdown
style={{ width: "40rem" }}
className="form-field"
style={{ width: "40rem", fontSize: "1rem" }}
className="form-field profileDropdown"
selected={gender?.length === 1 ? gender[0] : gender}
disable={gender?.length === 1 || editScreen}
option={menu}
Expand Down Expand Up @@ -678,6 +678,7 @@ const UserProfile = ({ stateCode, userType, cityDetails }) => {
)}`}</CardLabel>
<div style={{ width: "100%" }}>
<Dropdown
className="profileDropdown"
selected={gender?.length === 1 ? gender[0] : gender}
disable={gender?.length === 1 || editScreen}
option={menu}
Expand Down
Loading