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

Jds 2.0 gopi #142

Open
wants to merge 2 commits into
base: jds-2.0
Choose a base branch
from
Open

Jds 2.0 gopi #142

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef1474d
jds-2.0-input-nms
gopinathkaravati Jul 26, 2023
b36ba55
New COmponent for JD-Selector
gopinathkaravati Jul 27, 2023
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
33 changes: 18 additions & 15 deletions src/components/NInput/NInput.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,33 @@
padding: 1.2rem;
color: @TypographyPrimaryColor;

border-radius: 1.6rem;
width: 100%;
background: @WhiteColor;
// border-radius: 1.6rem;
width: 312px;
//background: @WhiteColor;
font-family: @PrimaryFont;
position: relative;
outline: none;
box-sizing: border-box;
// box-sizing: border-box;
font-size: 1.6rem;
-webkit-appearance: none;
// -webkit-appearance: none;
Copy link
Collaborator

Choose a reason for hiding this comment

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

remove comments or make it different block aside

border:none ;
outline:none !important;
border-radius: 0% !important;
border-bottom: 1.5px solid #141414 !important;
Copy link
Collaborator

Choose a reason for hiding this comment

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

avoid !important

}
.n-input-default-border{
border: 0.2rem solid @ColorSparkleGrey60;
border-bottom: 0.2rem solid @ColorSparkleGrey60;
&:focus {
border: 0.2rem solid @ColorPrimary60;
border-bottom: 0.2rem solid @ColorPrimary60;
}
}
.n-success-border{
border: 0.2rem solid @SuccessColor;
border-bottom: 0.2rem solid @SuccessColor;
}
.n-warning-border{
border: 0.2rem solid @WarningColor;
border-bottom: 0.2rem solid @WarningColor;
}
.n-error-border{
border: 0.2rem solid @ErrorColor;
border-bottom: 0.2rem solid @ErrorColor;
}
.n-input-underinfo{
color: @PrimaryGrey80;
Expand Down Expand Up @@ -151,15 +154,15 @@ input[type="search"]::-webkit-search-cancel-button {

.nitrozen-input-prefix{
margin: auto;
box-sizing: border-box;
//box-sizing: border-box;
color: @TypographyPrimaryColor;
z-index: @ZIndex3;
left: 1rem;
position: absolute;
}
.nitrozen-input-suffix {
margin: auto;
box-sizing: border-box;
// box-sizing: border-box;
color: @TypographyPrimaryColor;
z-index: @ZIndex3;
position: absolute;
Expand All @@ -173,7 +176,7 @@ input[type="search"]::-webkit-search-cancel-button {
top: 1rem;
}

.nitrozen-remove-left-border {
/* .nitrozen-remove-left-border {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
border-left-color: @WhiteColor;
Expand All @@ -183,7 +186,7 @@ input[type="search"]::-webkit-search-cancel-button {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
border-right-color: @WhiteColor;
}
} */

.nitrozen-input-grp {
display: flex;
Expand Down
14 changes: 7 additions & 7 deletions src/components/NInput/NInput.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,14 @@
v-bind:class="{
'nitrozen-search-input-padding': showSearchIcon || showPrefix,
'nitrozen-search-input-right-padding': showSuffix,
'n-success-border': this.validationState == 'success',
'n-error-border': this.validationState == 'error',
'n-warning-border': this.validationState == 'warning',
'n-input': true,
'input-text': true,
'n-input-default-border': !['success', 'error', 'warning'].includes(
'n-success': this.validationState == 'success',
// 'n-error-border': this.validationState == 'error',
// 'n-warning-border': this.validationState == 'warning',
/* 'n-input-default-border': !['success', 'error', 'warning'].includes(
this.validationState
),
), */
}"
v-on:keyup="eventEmit($event, 'keyup')"
v-on:change="eventEmit($event, 'change')"
Expand Down Expand Up @@ -88,14 +88,14 @@
v-on:keypress="eventEmit($event, 'keypress')"
v-bind:class="{
'n-input-textarea': type == 'textarea',
'n-success-border': this.validationState == 'success',
/* 'n-success-border': this.validationState == 'success',
'n-error-border': this.validationState == 'error',
'n-warning-border': this.validationState == 'warning',
'n-input': true,
'input-text': true,
'n-input-default-border': !['success', 'error', 'warning'].includes(
this.validationState
),
), */
}"
:maxlength="maxlength"
:disabled="disabled"
Expand Down
83 changes: 46 additions & 37 deletions src/pages/demo.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
@stepperClicked="stepperClicked"
></nitrozen-stepper>
<div class="stepper-btn-container">
<nitrozen-button v-flat-btn @click="stepperNext"
<nitrozen-button @click="stepperNext"
>Next</nitrozen-button
>
</div>
Expand All @@ -94,17 +94,17 @@

<!-- Flat Button -->
<div class="main-div space-between">
<nitrozen-button v-flat-btn @click="someFunc"
<nitrozen-button @click="someFunc"
>Primary Flat {{ numberOfClick }}</nitrozen-button
>
<div class="hover-new">
<nitrozen-button v-flat-btn>Hover Flat</nitrozen-button>
<nitrozen-button >Hover Flat</nitrozen-button>
</div>
<nitrozen-button v-flat-btn :showProgress="true"></nitrozen-button>
<nitrozen-button v-flat-btn :focused="true"
<nitrozen-button :showProgress="true"></nitrozen-button>
<nitrozen-button :focused="true"
>Focused Flat</nitrozen-button
>
<nitrozen-button v-flat-btn :disabled="true"
<nitrozen-button :disabled="true"
>Disabled Flat</nitrozen-button
>
</div>
Expand All @@ -125,19 +125,19 @@

<!-- Rounded Button -->
<div class="main-div space-between">
<nitrozen-button v-flat-btn :rounded="true">Rounded</nitrozen-button>
<nitrozen-button :rounded="true">Rounded</nitrozen-button>
<div class="hover-new">
<nitrozen-button v-flat-btn :rounded="true">Hover</nitrozen-button>
<nitrozen-button :rounded="true">Hover</nitrozen-button>
</div>
<nitrozen-button
v-flat-btn

:rounded="true"
:showProgress="true"
></nitrozen-button>
<nitrozen-button v-flat-btn :rounded="true" :focused="true"
<nitrozen-button :rounded="true" :focused="true"
>Focused</nitrozen-button
>
<nitrozen-button v-flat-btn :rounded="true" :disabled="true"
<nitrozen-button :rounded="true" :disabled="true"
>Disabled</nitrozen-button
>
</div>
Expand All @@ -158,31 +158,31 @@

<!-- Secondary Flat Button -->
<div class="main-div space-between">
<nitrozen-button v-flat-btn :theme="'secondary'"
<nitrozen-button :theme="'secondary'"
>Primary Small Flat</nitrozen-button
>
<nitrozen-button v-flat-btn :theme="'secondary'"
<nitrozen-button :theme="'secondary'"
size="medium"
>Primary Medium Flat</nitrozen-button
>
<nitrozen-button v-flat-btn :theme="'secondary'"
<nitrozen-button :theme="'secondary'"
size="large"
>Primary Large Flat</nitrozen-button
>
<div class="hover-new">
<nitrozen-button v-flat-btn :theme="'secondary'"
<nitrozen-button :theme="'secondary'"
>Hover Flat</nitrozen-button
>
</div>
<nitrozen-button
v-flat-btn

:showProgress="true"
:theme="'secondary'"
></nitrozen-button>
<nitrozen-button v-flat-btn :focused="true" :theme="'secondary'"
<nitrozen-button :focused="true" :theme="'secondary'"
>Focused Flat</nitrozen-button
>
<nitrozen-button v-flat-btn :disabled="true" :theme="'secondary'"
<nitrozen-button :disabled="true" :theme="'secondary'"
>Disabled Flat</nitrozen-button
>
</div>
Expand All @@ -207,29 +207,29 @@

<!-- Secondary Rounded Button -->
<div class="main-div space-between">
<nitrozen-button v-flat-btn :theme="'secondary'" :rounded="true"
<nitrozen-button :theme="'secondary'" :rounded="true"
>Rounded</nitrozen-button
>
<div class="hover-new">
<nitrozen-button v-flat-btn :theme="'secondary'" :rounded="true"
<nitrozen-button :theme="'secondary'" :rounded="true"
>Hover</nitrozen-button
>
</div>
<nitrozen-button
v-flat-btn

:showProgress="true"
:theme="'secondary'"
:rounded="true"
></nitrozen-button>
<nitrozen-button
v-flat-btn

:focused="true"
:rounded="true"
:theme="'secondary'"
>Disabled</nitrozen-button
>
<nitrozen-button
v-flat-btn

:disabled="true"
:rounded="true"
:theme="'secondary'"
Expand Down Expand Up @@ -267,23 +267,23 @@
<div class="main-div">
<div class="grouping">
<div class="width-50">
<nitrozen-button v-flat-btn>Save</nitrozen-button>
<nitrozen-button >Save</nitrozen-button>
<nitrozen-button v-stroke-btn>Cancel</nitrozen-button>
</div>

<div class="width-50">
<nitrozen-button v-flat-btn>Save</nitrozen-button>
<nitrozen-button >Save</nitrozen-button>
<nitrozen-button>Cancel</nitrozen-button>
</div>
</div>
</div>

<!-- Large Button -->
<div class="main-div space-between">
<nitrozen-button v-flat-btn :size="'large'"
<nitrozen-button :size="'large'"
>Large Button</nitrozen-button
>
<nitrozen-button v-flat-btn :size="'large'" :theme="'secondary'"
<nitrozen-button :size="'large'" :theme="'secondary'"
>Large Button</nitrozen-button
>
</div>
Expand All @@ -297,16 +297,16 @@
<nitrozen-button :href="'https://google.com'" :focused="true"
>Focused</nitrozen-button
>
<!-- <nitrozen-button v-flat-btn :large="true" :theme="'secondary'">Large Button</nitrozen-button> -->
<!-- <nitrozen-button :large="true" :theme="'secondary'">Large Button</nitrozen-button> -->
</div>

<div class="main-div space-between">
<nitrozen-button v-flat-btn :icon="'facebook'" :theme="'secondary'"
<nitrozen-button :icon="'facebook'" :theme="'secondary'"
>Facebook</nitrozen-button
>
<nitrozen-button
@click="autofocusSearch = !autofocusSearch"
v-flat-btn

:icon="'bag'"
:theme="'secondary'"
>Bag</nitrozen-button
Expand All @@ -330,10 +330,9 @@
:required="true"
:label="'Input with Error Message'"
></nitrozen-input>
<nitrozen-error v-if="inputModel == ''"
>Field is required</nitrozen-error
>
</div>



<div class="main-div">
<nitrozen-input
Expand All @@ -343,6 +342,14 @@
></nitrozen-input>
</div>

<div class="main-div">
<nitrozen-input
:id="2"
:placeholder="'Enter Name'"
:label="'Input with Placeholderrrr'"
></nitrozen-input>
</div>

<div class="main-div">
<nitrozen-input
:id="3"
Expand Down Expand Up @@ -376,6 +383,8 @@
></nitrozen-input>
</div>



<div class="main-div">
<nitrozen-input
:id="6"
Expand Down Expand Up @@ -727,16 +736,16 @@
</div>

<div class="main-div space-between">
<nitrozen-button v-flat-btn @click="openDialog('alert')"
<nitrozen-button @click="openDialog('alert')"
>Alert Dialog</nitrozen-button
>
<nitrozen-button v-flat-btn @click="openDialog('confirm')"
<nitrozen-button @click="openDialog('confirm')"
>Confirmation Dialog</nitrozen-button
>
<nitrozen-button v-flat-btn @click="openDialog"
<nitrozen-button @click="openDialog"
>Select Dialog</nitrozen-button
>
<nitrozen-button v-flat-btn @click="openDialog('choose')"
<nitrozen-button @click="openDialog('choose')"
>Choose Dialog</nitrozen-button
>
</div>
Expand Down