-
Notifications
You must be signed in to change notification settings - Fork 32
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.
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
JDS Components #140
Open
vijayanandsp
wants to merge
6
commits into
gofynd:jds-2.0
Choose a base branch
from
vijayanandsp:jds-com
base: jds-2.0
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
JDS Components #140
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
ab39658
*** NBtn Components added
vijayanandsp 280fa55
Revert "*** NBtn Components added"
vijayanandsp 26b65b9
*** NBtn component added
vijayanandsp 9fca621
*** jds dropdown component added
vijayanandsp 22de1a0
*** Numeric Code Component added
vijayanandsp b042e18
*** jds for spinner and jds for progressbar added
vijayanandsp File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,6 +2,12 @@ | |
|
||
.n-button { | ||
height: 4rem; | ||
padding: 10px 20px; | ||
border: 1px solid #ddd; | ||
color: @BlackColor; | ||
background-color: @PrimaryTextColor!important; | ||
border-radius: 4px; | ||
font-size: 14px; | ||
cursor: pointer; | ||
box-shadow: none; | ||
font-family: @PrimaryFont; | ||
|
@@ -19,6 +25,12 @@ | |
padding: 0rem 2rem; | ||
border-radius: 0.3rem; | ||
color: @WhiteColor; | ||
height: 32px; | ||
border-radius: 1000px; | ||
justify-content: center; | ||
align-items: center; | ||
font-weight: 700; | ||
line-height: 13px; | ||
|
||
&:disabled { | ||
cursor: not-allowed; | ||
|
@@ -72,6 +84,36 @@ | |
} | ||
} | ||
|
||
.n-button-add { | ||
background-image: url("../../assets/ic_add.png"); | ||
background-repeat: no-repeat; | ||
background-color: @PrimaryTextColor; | ||
color: @BlackColor; | ||
cursor: pointer; | ||
border-radius: 3250px; | ||
padding: 10px 21px 7px 10px; | ||
display: flex; | ||
flex-direction: row; | ||
gap: 26px; | ||
align-items: center; | ||
justify-content: center; | ||
flex-shrink: 0; | ||
position: relative; | ||
background-position: calc(100% - 3px) center; | ||
width: 70px; | ||
} | ||
.n-button-delete { | ||
position: absolute; | ||
background-image: url("../../assets/ic_remove.png"); | ||
background-repeat: no-repeat; | ||
cursor: pointer; | ||
align-items: center; | ||
background-position: calc(100% - 3px) center; | ||
background-size: 15px; | ||
padding: 10px 21px 7px 10px; | ||
font-size: 12px; | ||
} | ||
|
||
.hover-state { | ||
pointer-events: none; | ||
} | ||
|
@@ -217,7 +259,7 @@ | |
} | ||
|
||
.n-button-rounded { | ||
border-radius: 40px; | ||
border-radius: 1000px; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 1000px instead use % |
||
} | ||
|
||
.n-button-large { | ||
|
@@ -232,7 +274,7 @@ | |
} | ||
|
||
.n-button-mid { | ||
height: 4.8rem; | ||
// height: 4.8rem; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. remove comments |
||
font-size: @BaseFontSize + 3; | ||
line-height: 2.5rem; | ||
min-width: 4.8rem; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,101 +1,82 @@ | ||
<template> | ||
<div class="n-button-content" :class="'nitrozenButtonClass'"> | ||
<div class="social-icon" v-if="icon"> | ||
<nitrozen-icon v-if="icon" :name="icon" :size="getIconSize" :color="iconColor"/> | ||
<div class="n-button-content abcd" :class="{'disable-click':showProgress}"> | ||
<div class="social-icon" v-if="icon"> | ||
<nitrozen-icon v-if="icon" :name="icon" :size="getIconSize" :color="iconColor"/> | ||
</div> | ||
<slot/> | ||
<div v-if="showProgress" class="n-btn-spin"> | ||
<img class="n-btn-spinner" src="https://cdn.pixelbin.io/v2/falling-surf-7c8bb8/fyprod/wrkr/misc/general/free/original/loader.gif"> | ||
</div> | ||
</div> | ||
<slot/> | ||
<div v-if="showProgress" class="n-btn-spin"> | ||
<img class="n-btn-spinner" src="https://cdn.pixelbin.io/v2/falling-surf-7c8bb8/fyprod/wrkr/misc/general/free/original/loader.gif"> | ||
</div> | ||
</div> | ||
</template> | ||
|
||
<script> | ||
import NIcon from './../NIcon/NIcon.vue'; | ||
export default { | ||
components: { | ||
'nitrozen-icon': NIcon, | ||
}, | ||
name: 'nitrozen-button-content', | ||
props: { | ||
showProgress: { | ||
type: Boolean, | ||
default: false | ||
}, | ||
icon: { | ||
type: String | ||
}, | ||
size: { | ||
type: String | ||
}, | ||
iconColor:{ | ||
type:String, | ||
default:"#FFFFFF" | ||
}, | ||
flat: { | ||
type: Boolean | ||
}, | ||
stroke: { | ||
type: Boolean | ||
</template> | ||
|
||
<script> | ||
import NIcon from './../NIcon/NIcon.vue'; | ||
export default { | ||
components: { | ||
'nitrozen-icon': NIcon, | ||
}, | ||
name: 'nitrozen-button-content', | ||
props: { | ||
showProgress: { | ||
type: Boolean, | ||
default: false | ||
}, | ||
icon: { | ||
type: String | ||
}, | ||
size: { | ||
type: String | ||
}, | ||
iconColor:{ | ||
type:String, | ||
default:"#FFFFFF" | ||
} | ||
}, | ||
theme: { | ||
type: String | ||
computed: { | ||
getIconSize(){ | ||
let iconSize = { | ||
'small': 10, | ||
'medium': 14, | ||
'large': 18 | ||
} | ||
return iconSize[this.size] | ||
} | ||
}, | ||
computed: { | ||
getIconSize(){ | ||
let iconSize = { | ||
'small': 10, | ||
'medium': 14, | ||
'large': 18 | ||
} | ||
return iconSize[this.size] | ||
}, | ||
nitrozenButtonClass() { | ||
return { | ||
'disable-click':this.showProgress, | ||
'n-flat-button': this.flat == true, | ||
'n-flat-button-primary': this.flat == true && this.theme == 'primary', | ||
'n-flat-button-secondary': this.flat == true && this.theme == 'secondary', | ||
'n-button-stroke': this.stroke == true, | ||
'n-button-stroke-primary': this.stroke == true && this.theme == 'primary', | ||
'n-button-stroke-secondary': this.stroke == true && this.theme == 'secondary', | ||
} | ||
} | ||
} | ||
} | ||
</script> | ||
|
||
<style lang="less"> | ||
.n-button-content { | ||
display: flex; | ||
align-items: center; | ||
height: 100%; | ||
justify-content: center; | ||
gap: 10px; | ||
} | ||
.n-btn-spinner{ | ||
text-align:center; | ||
} | ||
|
||
.n-btn-spin{ | ||
display: flex; | ||
justify-content: center; | ||
} | ||
.social-icon{ | ||
float: left; | ||
position: relative; | ||
// left: -20px; | ||
display: flex; | ||
img{ | ||
background: white; | ||
</script> | ||
|
||
<style lang="less"> | ||
.n-button-content { | ||
display: flex; | ||
align-items: center; | ||
height: 100%; | ||
justify-content: center; | ||
gap: 10px; | ||
} | ||
.n-btn-spinner{ | ||
text-align:center; | ||
} | ||
|
||
.n-btn-spin{ | ||
display: flex; | ||
justify-content: center; | ||
} | ||
.social-icon{ | ||
float: left; | ||
position: relative; | ||
// left: -20px; | ||
display: flex; | ||
img{ | ||
background: white; | ||
} | ||
svg{ | ||
height: 24px; | ||
width: 24px; | ||
} | ||
} | ||
svg{ | ||
height: 24px; | ||
width: 24px; | ||
.disable-click { | ||
pointer-events: none; | ||
} | ||
} | ||
.disable-click { | ||
pointer-events: none; | ||
} | ||
</style> | ||
</style> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
avoid using
!important