Skip to content

Commit

Permalink
Merge pull request #642 from ripe-tech/v-pca/641-add-tiny-prop
Browse files Browse the repository at this point in the history
641 - add tiny as part of size prop
  • Loading branch information
joao-conde authored Nov 9, 2023
2 parents acbb133 + 962ef03 commit cfc8cc0
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added

* `title` and `subTitle` optional props to Lightbox component - [#635](https://github.com/ripe-tech/ripe-components-vue/issues/635)
* `backgroundColor` optional prop to Input component - [#638](https://github.com/ripe-tech/ripe-components-vue/issues/638)
* `tiny` as an option to the size prop in the Section Expandable component- [#641](https://github.com/ripe-tech/ripe-components-vue/issues/641)

### Changed

Expand Down
3 changes: 1 addition & 2 deletions vue/components/ui/atoms/input/input.stories.js
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,7 @@ storiesOf("Components/Atoms/Input", module)
v-bind:min-width="minWidth"
v-bind:height="height"
v-bind:debounce-delay="debounceDelay"
v-bind:max-length="maxLength"
v-bind:background-color="'#f9fAfd'" />
v-bind:max-length="maxLength" />
</form-input>
<p>Text: {{ valueData }}</p>
</div>
Expand Down
7 changes: 1 addition & 6 deletions vue/components/ui/atoms/input/input.vue
Original file line number Diff line number Diff line change
Expand Up @@ -158,10 +158,6 @@ export const Input = {
maxLength: {
type: Number,
default: null
},
backgroundColor: {
type: String,
default: null
}
},
mounted: function() {
Expand Down Expand Up @@ -223,8 +219,7 @@ export const Input = {
"min-width": this.minWidth === null ? null : `${this.minWidth}px`,
"font-size": this.fontSize === null ? null : `${this.fontSize}px`,
"font-weight": this.fontWeight === null ? null : `${this.fontWeight}`,
"text-align": this.align,
"background-color": this.backgroundColor === null ? null : this.backgroundColor
"text-align": this.align
};
return base;
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ storiesOf("Components/Molecules/Section Expandable", module)
default: select(
"Size",
{
Tiny: "tiny",
Small: "small",
Medium: "medium",
Large: "large"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@
letter-spacing: 0.35px;
}
.section-expandable > .header > .title.title-tiny {
font-size: 12px;
}
.section-expandable > .header > .title.title-small {
font-size: 14px;
}
Expand Down

1 comment on commit cfc8cc0

@vercel
Copy link

@vercel vercel bot commented on cfc8cc0 Nov 9, 2023

Choose a reason for hiding this comment

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

Please sign in to comment.