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

Fixed multiple select label color #832

Merged
merged 8 commits into from
Jun 5, 2024
Merged

Fixed multiple select label color #832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
56c4c2a
Refactor css styles into styled modules
Tamir198 May 27, 2024
889129d
Extract all components to separate file
Tamir198 May 27, 2024
3db0cf7
Merge branch 'thecyberworld:dev' into dev
Tamir198 May 29, 2024
8adee8c
Merge branch 'thecyberworld:dev' into dev
Tamir198 Jun 1, 2024
e8b5bf3
Merge branch 'thecyberworld:dev' into dev
Tamir198 Jun 2, 2024
c865395
Fix select label wrong color
Tamir198 Jun 2, 2024
54fcc22
Merge branch 'dev' into storybook-fixes
ArkadiK94 Jun 5, 2024
0a91ca8
chore: change label text
ArkadiK94 Jun 5, 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
7 changes: 6 additions & 1 deletion src/components/Common/MultipleSelect/MultipleSelect.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React from "react";
import { Option, Select, SelectContainer } from "./MultipleSelectElements";
import styled from "styled-components";

/*
optionsValuesWithLabels=[
Expand All @@ -19,7 +20,7 @@ const MultipleSelect = ({ selectLabel, selectedValue, onValueSelect, optionsValu
});
return (
<SelectContainer>
{selectLabel && <label htmlFor="Select">{selectLabel}:</label>}
{selectLabel && <StyledLabel htmlFor="Select">{selectLabel}:</StyledLabel>}
<Select
name={selectLabel.toLowerCase()}
value={defaultValue || selectedValue}
Expand All @@ -30,4 +31,8 @@ const MultipleSelect = ({ selectLabel, selectedValue, onValueSelect, optionsValu
</SelectContainer>
);
};

const StyledLabel = styled.label`
color: #d7d7d7;
`;
export default MultipleSelect;
2 changes: 1 addition & 1 deletion src/components/Common/MultipleSelect/MultipleSelect.stories.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const Template = ({ optionsValuesWithLabels, ...args }) => (

export const Default = Template.bind({});
Default.args = {
selectLabel: "Select an option",
selectLabel: "Label",
selectedValue: "",
defaultValue: "",
optionsValuesWithLabels: [
Expand Down