diff --git a/src/base/variable.less b/src/base/variable.less index 095ed6e3..cf3c4f03 100644 --- a/src/base/variable.less +++ b/src/base/variable.less @@ -160,11 +160,11 @@ @ColorSecondaryGrey60: var(--ColorSecondaryGrey60, #b5b5b5); @ColorSecondaryGrey40: var(--ColorSecondaryGrey40, #e0e0e0); @ColorSecondaryGrey20: var(--ColorSecondaryGrey20, #f5f5f5); -@ColorSparkle20: var(--ColorSparkle20, #e8faf7); -@ColorSparkle30: var(--ColorSparkle30, #a7f6e9); -@ColorSparkle40: var(--ColorSparkle40, #7aebd9); +@ColorSparkle20: var(--ColorSparkle20, #e5f1f7); +@ColorSparkle30: var(--ColorSparkle30,#89dcff); +@ColorSparkle40: var(--ColorSparkle40, #67c3ef); @ColorSparkle50: var(--ColorSparkle50, #1eccb0); -@ColorSparkle60: var(--ColorSparkle60, #1e7b74); +@ColorSparkle60: var(--ColorSparkle60, #0c5273); @ColorSparkle70: var(--ColorSparkle70, #0e5c4f); @ColorSparkle80: var(--ColorSparkle80, #08332c); @ColorSparkleInverse: var(--ColorSparkleInverse, #08332c); diff --git a/src/components/NAvatar/NAvatar.vue b/src/components/NAvatar/NAvatar.vue new file mode 100644 index 00000000..e661c6e6 --- /dev/null +++ b/src/components/NAvatar/NAvatar.vue @@ -0,0 +1,124 @@ + + + + + + \ No newline at end of file diff --git a/src/components/NAvatar/index.js b/src/components/NAvatar/index.js new file mode 100644 index 00000000..bd9bd2c3 --- /dev/null +++ b/src/components/NAvatar/index.js @@ -0,0 +1,2 @@ +import NAvatar from './NAvatar.vue'; +export default NAvatar; \ No newline at end of file diff --git a/src/components/NSearchBox/NSearchBox.vue b/src/components/NSearchBox/NSearchBox.vue new file mode 100644 index 00000000..b2d4223c --- /dev/null +++ b/src/components/NSearchBox/NSearchBox.vue @@ -0,0 +1,161 @@ + + + \ No newline at end of file diff --git a/src/components/NSearchBox/index.js b/src/components/NSearchBox/index.js new file mode 100644 index 00000000..b2ff6031 --- /dev/null +++ b/src/components/NSearchBox/index.js @@ -0,0 +1,2 @@ +import NSearchBox from './NSearchBox.vue'; +export default NSearchBox; \ No newline at end of file diff --git a/src/components/NTab/NTab.vue b/src/components/NTab/NTab.vue index a0d1911d..bc90dead 100644 --- a/src/components/NTab/NTab.vue +++ b/src/components/NTab/NTab.vue @@ -1,12 +1,14 @@ @@ -16,7 +18,10 @@ .nitrozen-tab-container { display: flex; width: 100%; + transition: background-color var(@TransitionsEaseQuick); + .nitrozen-tab { + position: relative; display: flex; width: 100%; box-sizing: border-box; @@ -27,11 +32,33 @@ -ms-overflow-style: none; padding: 0; margin: 0; + transition: transform 0.3s ease; &::-webkit-scrollbar { display: none; } } + + .bottom-bar { + position: absolute; + bottom: 0; + height: 3px; + background-color: @ColorPrimary50; + transition: @TransitionsDurationRapid; + z-index: 1; +} + +.inactive-tab { + color: grey; /* Set the text color to grey for inactive tabs */ +} +} +.nitrozen-tab-item:hover:not(.nitrozen-tab-active) { + color: black; } + +.nitrozen-tab-active{ + color: black; +} + + \ No newline at end of file diff --git a/src/components/NTabItem/NTabItem.vue b/src/components/NTabItem/NTabItem.vue index 9989f5b0..274960a3 100644 --- a/src/components/NTabItem/NTabItem.vue +++ b/src/components/NTabItem/NTabItem.vue @@ -1,6 +1,11 @@ @@ -13,6 +18,10 @@ export default { id: { type: [Number, String], default: () => "nitrozen-tab-item" + NitrozenUuid() + }, + icon: { + type: String, + default: "" } } }; @@ -25,13 +34,17 @@ export default { color: @TypographyPrimaryColor; font-family: @PrimaryFont; cursor: pointer; - margin-right: 24px; - padding-bottom: 24px; - font-size: 14px; - font-weight: 400; + padding: @SpacingS; + font-size: 18px; + font-weight: 500; } -.nitrozen-tab-active { - color: @SecondaryColor; - border-bottom: 3px solid @SecondaryColor; +.icon-container img { + width: @SpacingM; + height: @SpacingM; + margin-right: @SpacingXs; +} +.text-container{ + text-overflow: ellipsis; + overflow: hidden; } diff --git a/src/components/NTag/NTag.vue b/src/components/NTag/NTag.vue new file mode 100644 index 00000000..0c043b0d --- /dev/null +++ b/src/components/NTag/NTag.vue @@ -0,0 +1,104 @@ + + + + + \ No newline at end of file diff --git a/src/components/NTag/index.js b/src/components/NTag/index.js new file mode 100644 index 00000000..226f4e33 --- /dev/null +++ b/src/components/NTag/index.js @@ -0,0 +1,3 @@ +import NTag from './NTag.vue'; + +export default NTag; \ No newline at end of file diff --git a/src/components/index.js b/src/components/index.js index c85b82f3..6425db93 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -18,6 +18,9 @@ import NitrozenStepper from './NStepper'; import NitrozenToggleBtn from './NToggleBtn'; import NitrozenTooltip from './NTooltip'; import NitrozenCustomForm from './NCustomForm'; +import NitrozenAvatar from './NAvatar'; +import NitrozenSearchBox from './NSearchBox' +import NitrozenTag from './NTag'; export { NitrozenAutocomplete, @@ -40,4 +43,7 @@ export { NitrozenToggleBtn, NitrozenTooltip, NitrozenCustomForm, + NitrozenAvatar, + NitrozenSearchBox, + NitrozenTag } diff --git a/src/pages/demo.vue b/src/pages/demo.vue index b6264daf..af43b571 100644 --- a/src/pages/demo.vue +++ b/src/pages/demo.vue @@ -67,9 +67,50 @@ +
+ + +
+
+ + + +
+
+ + + + + + + + + + + + +
- Next
@@ -94,142 +135,142 @@
- Primary Flat {{ numberOfClick }}
- Hover Flat + Hover Flat
- - + Focused Flat - Disabled Flat
- Primary Stroke + Primary Stroke
- Hover Stroke + Hover Stroke
- Focused Stroke - Disabled Stroke
- Rounded + Rounded
- Hover + Hover
- Focused - Disabled
- Rounded + Rounded
- Hover + Hover
- Focused - Disabled
- Primary Small Flat - Primary Medium Flat - Primary Large Flat
- Hover Flat
- Focused Flat - Disabled Flat
- Primary
- Hover
- Focused Stroke - Disabled
- Rounded
- Hover
Disabled
- Primary
- Hover
Focused
- Save - Cancel + Save + Cancel
- Save + Save Cancel
@@ -280,10 +321,10 @@
- Large Button - Large Button
@@ -297,16 +338,16 @@ Focused - +
- Facebook Bag
- Alert Dialog - Confirmation Dialog - Select Dialog - Choose Dialog
@@ -815,6 +856,7 @@ export default { multiSelect: [11,12,13,14,15,21,22,23,24,25], numberOfClick: 0, abcd: true, + isActive: false, singleCheckboxModel: true, inputModel: "Some Value", numberModel: 1, @@ -905,12 +947,17 @@ export default { name: "Lemon", }, { - name: "Lime", + name: "Discover", }, { name: "Apple", }, ], + fruitsIcon:[ + "https://cdn.pixelbin.io/v2/falling-surf-7c8bb8/fyndnp/wrkr/x5/products/pictures/item/free/original/bY8N9S67n-Test.png", + "https://cdn.pixelbin.io/v2/falling-surf-7c8bb8/fyndnp/wrkr/x5/products/pictures/item/free/original/bY8N9S67n-Test.png", + "https://cdn.pixelbin.io/v2/falling-surf-7c8bb8/fyndnp/wrkr/x5/products/pictures/item/free/original/bY8N9S67n-Test.png" + ], dataItems: [ "Tess", "Kurtas",