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

DPG-2150 Core UI Module UI/UX issue fixes #133

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

DPG-2150 Core UI Module UI/UX issue fixes #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8a25e6a
made changes in change password
hridya-egov Jan 25, 2024
9ce6045
changes in input field on mobile view
hridya-egov Jan 29, 2024
ed287c5
Merge branch 'develop' into hridya-enhancements
hridya-egov Jan 29, 2024
196532a
changes in change password link and changes in user input field on mo…
hridya-egov Jan 29, 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
13 changes: 12 additions & 1 deletion micro-ui/web/micro-ui-internals/packages/css/src/components/card.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,7 @@
margin-right: unset;
}
}

}

.field-container {
Expand Down Expand Up @@ -332,6 +333,16 @@
.button-sub-text {
width: 240px;
}
}
@media only screen and (min-width: 320px) and (max-width: 767px) {
.label-field-pair
Copy link
Contributor

@nabeelmd-eGov nabeelmd-eGov Jan 29, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hridya-egov Adding styles directly to "label-field-pair" might break other screens and form composers.
Add parent classname also to add styles only for specific pages.

{
display:flex;
flex-direction :column;
}
}


.home-page-info-banner-wrap {
max-width: 45%;
min-width: 40%;
Expand All @@ -347,7 +358,7 @@
max-width: 100%;
padding: 0px 10px;
}
}


.card-label-error {
@apply block text-body-s text-error mb-md;
Expand Down
3 changes: 2 additions & 1 deletion micro-ui/web/micro-ui-internals/packages/css/src/components/languageSelector.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@
.language-selector div:not(:first-child) {
margin-left: 10px;
}

.bannerCard .language-button-container button {
width: 6.2rem;
width: 11.2rem;
height: 2.5rem;
}
.bannerCard .customBtn {
Expand Down
15 changes: 14 additions & 1 deletion micro-ui/web/micro-ui-internals/packages/css/src/pages/employee/EmployeeLogin.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,17 @@
img{
@apply h-4 object-contain;
}
}
}
/*.language-selector-style{
margin-bottom:24px;
display:inline-flex;
justify-content: space-between;
width :20px;
}
.floatleftstyle{
float:left;
}
.floatrightstyle
{
float:right;
}*/
4 changes: 2 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 @@ -582,9 +582,9 @@ const UserProfile = ({ stateCode, userType, cityDetails }) => {

<LabelFieldPair>
<div>
<a style={{ color: "orange", cursor: "default", marginBottom: "5", cursor: "pointer" }} onClick={TogleforPassword}>
{changepassword==false ? <a style={{ color: "orange", cursor: "default", marginBottom: "5", cursor: "pointer" }} onClick={TogleforPassword}>
{t("CORE_COMMON_CHANGE_PASSWORD")}
</a>
</a> : ""}
{changepassword ? (
<div style={{ marginTop: "10px" }}>
<LabelFieldPair style={{ display: "flex" }}>
Expand Down
2 changes: 1 addition & 1 deletion ...eb/micro-ui-internals/packages/modules/core/src/pages/employee/LanguageSelection/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const LanguageSelection = () => {

<p>{t(`TENANT_TENANTS_${stateInfo?.code.toUpperCase()}`)}</p>
</div>
<div className="language-selector" style={{ justifyContent: "space-around", marginBottom: "24px", padding: "0 5%" }}>
<div className="language-selector" style={{ justifyContent: "space-between", marginBottom: "24px", padding: "0 0" }}>
{languages.map((language, index) => (
<div className="language-button-container" key={index}>
<CustomButton
Expand Down