diff --git a/src/index.css b/src/index.css index 14abadb..864316a 100644 --- a/src/index.css +++ b/src/index.css @@ -4,11 +4,12 @@ box-sizing: border-box; } + body { margin: 0; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', - 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', - 'Helvetica Neue', sans-serif; + 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', + 'Helvetica Neue', sans-serif; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; box-sizing: border-box; @@ -16,7 +17,7 @@ body { code { font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New', - monospace; + monospace; } [data-theme='1'] { diff --git a/src/s2-homeworks/hw07/HW7.module.css b/src/s2-homeworks/hw07/HW7.module.css new file mode 100644 index 0000000..b1ef09c --- /dev/null +++ b/src/s2-homeworks/hw07/HW7.module.css @@ -0,0 +1,4 @@ +.container { + display: flex; + gap: 110px; +} \ No newline at end of file diff --git a/src/s2-homeworks/hw07/HW7.tsx b/src/s2-homeworks/hw07/HW7.tsx index e2fce1c..431c9d0 100644 --- a/src/s2-homeworks/hw07/HW7.tsx +++ b/src/s2-homeworks/hw07/HW7.tsx @@ -2,6 +2,7 @@ import React, { useState } from 'react' import SuperSelect from './common/c5-SuperSelect/SuperSelect' import SuperRadio from './common/c6-SuperRadio/SuperRadio' import s2 from '../../s1-main/App.module.css' +import s from './HW7.module.css' const arr = [ { id: 1, value: 'x' }, @@ -14,26 +15,30 @@ const HW7 = () => { console.log(value) return ( -
-
homeworks 7
+
+
Homework #7
{/*should work (должно работать)*/} -
- -
-
- +
+
+
+ +
+
+ +
+
) diff --git a/src/s2-homeworks/hw07/common/c5-SuperSelect/SuperSelect.module.css b/src/s2-homeworks/hw07/common/c5-SuperSelect/SuperSelect.module.css index c50c2fa..afa0f29 100644 --- a/src/s2-homeworks/hw07/common/c5-SuperSelect/SuperSelect.module.css +++ b/src/s2-homeworks/hw07/common/c5-SuperSelect/SuperSelect.module.css @@ -1,18 +1,19 @@ .select { - width: 100px; - padding: 5px; + padding-left: 10px; + width: 165px; + height: 24px; cursor: pointer; appearance: none; - background-color: var(--primary); - background-image: linear-gradient(45deg, transparent 50%, currentColor 50%), - linear-gradient(135deg, currentColor 50%, transparent 50%); - background-position: calc(100% - 20px) calc(1px + 50%), - calc(100% - 16px) calc(1px + 50%); - background-size: 4px 4px, 4px 4px; + background-color: transparent; + background-image: url('./chevron-down.svg'); + background-position: right center; background-repeat: no-repeat; border-radius: 2px; - border: 2px solid var(--primary); - color: var(--primary-content); + border: 1px solid #C2C2C2; + color: #000000; + font-family: 'Montserrat', sans-serif; + font-weight: 400; + font-size: 14px; } .select:focus { diff --git a/src/s2-homeworks/hw07/common/c5-SuperSelect/chevron-down.svg b/src/s2-homeworks/hw07/common/c5-SuperSelect/chevron-down.svg new file mode 100644 index 0000000..7ce7b07 --- /dev/null +++ b/src/s2-homeworks/hw07/common/c5-SuperSelect/chevron-down.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/s2-homeworks/hw07/common/c6-SuperRadio/SuperRadio.module.css b/src/s2-homeworks/hw07/common/c6-SuperRadio/SuperRadio.module.css index c2c8ce9..610d4d1 100644 --- a/src/s2-homeworks/hw07/common/c6-SuperRadio/SuperRadio.module.css +++ b/src/s2-homeworks/hw07/common/c6-SuperRadio/SuperRadio.module.css @@ -1,26 +1,41 @@ .radio { + margin: 0; + -webkit-appearance: none; appearance: none; - height: 10px; - width: 10px; - + height: 20px; + width: 20px; cursor: pointer; border-radius: 50%; - outline: none; - background: #335533; + border: 2px solid black; + display: grid; + place-content: center; } -.radio:hover { - border: 2px solid #cc99ff; +.radio::before { + content: ""; + width: 10px; + height: 10px; + border-radius: 50%; + transform: scale(0); + transition: 120ms transform ease-in-out; + background-color: black; } -.radio:checked { - background: #55ffff; -} -.radio:focus { - border: 2px solid #cc99ff; +.radio:checked::before { + transform: scale(1); } .label { cursor: pointer; + display: flex; + align-items: center; + gap: 13px; + width: max-content; +} + +.options { + display: flex; + flex-direction: column; + gap: 21px; } diff --git a/src/s2-homeworks/hw07/common/c6-SuperRadio/SuperRadio.tsx b/src/s2-homeworks/hw07/common/c6-SuperRadio/SuperRadio.tsx index be4a477..da353aa 100644 --- a/src/s2-homeworks/hw07/common/c6-SuperRadio/SuperRadio.tsx +++ b/src/s2-homeworks/hw07/common/c6-SuperRadio/SuperRadio.tsx @@ -69,7 +69,7 @@ const SuperRadio: React.FC = ({ )) : [] - return <>{mappedOptions} + return
{mappedOptions}
} export default SuperRadio