Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
5728052
feat(slider!): slider core tokens (CSS-177)
mlogsdon18 Mar 21, 2023
43ab185
feat: pr feedback around soft-coding
bernhard-adobe Nov 29, 2022
607c533
feat: setting border radii an var correction
bernhard-adobe Nov 30, 2022
926f5ee
feat: upping core vars to 5.0.0
bernhard-adobe Nov 30, 2022
cfbc6d8
feat: core-tokens 5.0.0 line-height fix
bernhard-adobe Nov 30, 2022
023d913
feat: addressing PR feedback
bernhard-adobe Dec 6, 2022
c5dd15d
feat: adjusting high contrast mode colors
bernhard-adobe Dec 7, 2022
e3ce21e
feat: rounding corners
bernhard-adobe Dec 7, 2022
fe3ac62
feat: high contrast slider tick
bernhard-adobe Dec 8, 2022
1d16a42
feat: minor test removal
bernhard-adobe Dec 8, 2022
719091e
feat: border rings for slider
bernhard-adobe Dec 8, 2022
34359a2
feat: correct border token for down + ramp high contrast color
bernhard-adobe Dec 9, 2022
073139f
feat: make tick slider handles align to ticks (follow up on #1289)
bernhard-adobe Dec 14, 2022
51f23bc
feat: slider tick position
bernhard-adobe Dec 20, 2022
d72038a
feat: border-width down change (follow up on #1154)
bernhard-adobe Jan 11, 2023
712f830
feat: fill color for handle, variant ramp and ticks (from #1154)
bernhard-adobe Jan 11, 2023
24c7066
feat: border-width adjustment for handle-down
bernhard-adobe Jan 12, 2023
83b187b
feat: removing commented out width calculations
bernhard-adobe Jan 12, 2023
04cfe44
feat: widths, top, height in sizes and starts
bernhard-adobe Jan 23, 2023
763264d
feat: sizing widths and heights, including animations
bernhard-adobe Jan 23, 2023
0efa252
feat: remove double-mods and contrast mods
bernhard-adobe Jan 24, 2023
5f7a912
feat: use t-shirt sized handle size, move ramp forced colors bottom, …
bernhard-adobe Jan 25, 2023
3098998
feat: high contrast feedback
bernhard-adobe Jan 25, 2023
91f7df1
feat: custom vars for ticks
bernhard-adobe Jan 25, 2023
2bbd886
feat: t-shirt size default
bernhard-adobe Jan 26, 2023
e993361
feat: correct 32px height
bernhard-adobe Jan 27, 2023
c586c17
feat: high-contrast mode simplifications
bernhard-adobe Jan 27, 2023
47c1f8f
feat: slider control height now 16px
bernhard-adobe Jan 30, 2023
1432f0b
feat: adding margin to the bottom of handle
bernhard-adobe Jan 30, 2023
6d5ee12
feat: more control spacing for tick-variant
bernhard-adobe Jan 31, 2023
812542f
feat: cjk rename
bernhard-adobe Feb 2, 2023
b48518c
feat: updated label margin
bernhard-adobe Feb 2, 2023
fc2867b
feat: slider label block-end margins via design update
bernhard-adobe Feb 3, 2023
faf94d3
feat: 80px removal
bernhard-adobe Feb 3, 2023
83cb956
feat: disabled tick-mark colors use disabled background-color token.
bernhard-adobe Feb 3, 2023
20cb09d
feat: setting slider tick marks and label
bernhard-adobe Feb 4, 2023
7bb0aa0
fix(slider): disabled tick label color
lunarfusion Feb 6, 2023
5fccce0
fix(slider): refactor without :has
lunarfusion Feb 6, 2023
2e59a31
chore(slider): use latest tokens dependency
pfulton Feb 6, 2023
d31cad3
chore(slider): manual version bump for beta release
pfulton Feb 6, 2023
cf74a44
fix(slider): resolve malformed CSS
pfulton Feb 6, 2023
0576fe0
fix(slider): resolve malformed syntax
pfulton Feb 6, 2023
bf9077d
style(slider): add cursor pointer
mlogsdon18 Mar 21, 2023
4f4e7ac
chore(slider): remove unneeded classes and add headings to docs
mlogsdon18 Mar 21, 2023
de8c6f6
feat: update tokens package and added new tokens for bottom-to-text
mlogsdon18 Mar 21, 2023
b8b8f59
refactor(slider): adding in updated tokens and label sizing to docs
mlogsdon18 Mar 21, 2023
3a36d07
feat(slider): add gradient story
mlogsdon18 Mar 22, 2023
f0bcaa4
docs(slider): added range variant instructions for three handles
mlogsdon18 Mar 22, 2023
d7be94c
chore(slider): add todos for tokens still needed
mlogsdon18 Mar 22, 2023
543c220
chore(slider): manual prerelease bump
castastrophe Mar 27, 2023
3486ca5
fix(slider): remove unneeded css
mlogsdon18 Mar 28, 2023
f39ccb9
fix(slider): fix stories by importing css
mlogsdon18 Mar 29, 2023
8fae25e
fix(slider): add background color to ticks handle
mlogsdon18 Mar 30, 2023
58f2443
chore(slider): use latest deps & manual version bump
pfulton Mar 31, 2023
dbd3d1a
fix(slider): update slider height tokens
mlogsdon18 Apr 20, 2023
0239eb5
chore(slider,fieldlabel): update stories
mlogsdon18 Apr 21, 2023
779f0ee
fix(slider): fix spacing for label to control
mlogsdon18 Apr 21, 2023
51fe786
fix(slider): add slider-control-to-field-label
mlogsdon18 Apr 21, 2023
4a93bde
fix(slider): update docs to use field label component
mlogsdon18 Apr 21, 2023
7186a19
docs(slider): fix mods
mlogsdon18 Apr 21, 2023
d2003ff
chore(tokens): remove unneeded slider tokens
mlogsdon18 Apr 21, 2023
6c8ba5f
refactor(slider): remove unused variables
mlogsdon18 Apr 21, 2023
3884778
chore(slider): upgrade tokens package
mlogsdon18 Apr 21, 2023
6f178be
chore(slider): version bumps for dependencies
mlogsdon18 May 1, 2023
ed40554
fix(slider): fix slider vertical centering
mlogsdon18 May 4, 2023
045f746
chore(slider): remove slider-bottom-to-handle tokens
mlogsdon18 May 4, 2023
3eab1b4
fix(slider): vertical align label and value
mlogsdon18 May 5, 2023
6f14c3b
fix(fieldlabel): fix line height
mlogsdon18 May 5, 2023
871c25d
fix(slider): update field label and value position
mlogsdon18 May 5, 2023
bee47b7
fix(slider): utilize field-label-to-control negative margin
mlogsdon18 May 8, 2023
0aeec6f
fix(fieldlabel): add min-block-size based on a missed token
mlogsdon18 May 8, 2023
db9bb5a
fix(slider): only add negative margin if label is present
mlogsdon18 May 8, 2023
c2418fa
chore(slider): use latest dependencies & beta bump
pfulton May 8, 2023
883881b
docs(fieldlabel, slider): update mods
mlogsdon18 May 16, 2023
f3a2480
chore(slider): updating tokens release
mlogsdon18 May 17, 2023
6fd1604
docs(slider): removing extra classes and fixing duplicate ids
mlogsdon18 May 17, 2023
7583b60
refactor(slider): format CSS to be a bit easier to read for debugging
mlogsdon18 May 17, 2023
0c15aa3
chore(slider): manual version bump for beta release
pfulton May 18, 2023
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
21 changes: 8 additions & 13 deletions components/fieldlabel/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,23 @@ governing permissions and limitations under the License.
*/

.spectrum-FieldLabel {
--spectrum-fieldlabel-min-height: var(--spectrum-component-height-75);
--spectrum-fieldlabel-color: var(--spectrum-neutral-subdued-content-color-default);

--spectrum-field-label-top-to-asterisk: var(--spectrum-field-label-top-to-asterisk-medium);
--spectrum-field-label-text-to-asterisk: var(--spectrum-field-label-text-to-asterisk-medium);

--spectrum-fieldlabel-font-weight: var(--spectrum-regular-font-weight);
--spectrum-fieldlabel-line-height: var(--spectrum-line-height-100);
--spectrum-fieldlabel-line-height-cjk: var(--spectrum-cjk-line-height-100);
}

.spectrum-FieldLabel--sizeS {
--spectrum-fieldlabel-min-height: var(--spectrum-component-height-75);
--spectrum-fieldlabel-top-to-text: var(--spectrum-component-top-to-text-75);
--spectrum-fieldlabel-bottom-to-text: var(--spectrum-component-bottom-to-text-75);
--spectrum-fieldlabel-font-size: var(--spectrum-font-size-75);

--spectrum-fieldlabel-line-height: var(--spectrum-line-height-100);
--spectrum-fieldlabel-line-height-cjk: var(--spectrum-cjk-line-height-100);

--spectrum-fieldlabel-side-padding-top: var(--spectrum-component-top-to-text-75);
--spectrum-fieldlabel-side-padding-right: var(--spectrum-spacing-100);

Expand All @@ -35,13 +36,11 @@ governing permissions and limitations under the License.
}

.spectrum-FieldLabel--sizeM {
--spectrum-fieldlabel-min-height: var(--spectrum-component-height-75);
--spectrum-fieldlabel-top-to-text: var(--spectrum-component-top-to-text-75);
--spectrum-fieldlabel-bottom-to-text: var(--spectrum-component-bottom-to-text-75);
--spectrum-fieldlabel-font-size: var(--spectrum-font-size-75);

--spectrum-fieldlabel-line-height: var(--spectrum-line-height-200);
--spectrum-fieldlabel-line-height-cjk: var(--spectrum-cjk-line-height-200);

--spectrum-fieldlabel-side-padding-top: var(--spectrum-component-top-to-text-75);
--spectrum-fieldlabel-side-padding-right: var(--spectrum-spacing-200);

Expand All @@ -50,13 +49,11 @@ governing permissions and limitations under the License.
}

.spectrum-FieldLabel--sizeL {
--spectrum-fieldlabel-min-height: var(--spectrum-component-height-100);
--spectrum-fieldlabel-top-to-text: var(--spectrum-component-top-to-text-100);
--spectrum-fieldlabel-bottom-to-text: var(--spectrum-component-bottom-to-text-100);
--spectrum-fieldlabel-font-size: var(--spectrum-font-size-100);

--spectrum-fieldlabel-line-height: var(--spectrum-line-height-100);
--spectrum-fieldlabel-line-height-cjk: var(--spectrum-cjk-line-height-100);

--spectrum-fieldlabel-side-padding-top: var(--spectrum-component-top-to-text-100);
--spectrum-fieldlabel-side-padding-right: var(--spectrum-spacing-200);

Expand All @@ -65,13 +62,11 @@ governing permissions and limitations under the License.
}

.spectrum-FieldLabel--sizeXL {
--spectrum-fieldlabel-min-height: var(--spectrum-component-height-200);
--spectrum-fieldlabel-top-to-text: var(--spectrum-component-top-to-text-200);
--spectrum-fieldlabel-bottom-to-text: var(--spectrum-component-bottom-to-text-200);
--spectrum-fieldlabel-font-size: var(--spectrum-font-size-200);

--spectrum-fieldlabel-line-height: var(--spectrum-line-height-200);
--spectrum-fieldlabel-line-height-cjk: var(--spectrum-cjk-line-height-200);

--spectrum-fieldlabel-side-padding-top: var(--spectrum-component-top-to-text-200);
--spectrum-fieldlabel-side-padding-right: var(--spectrum-spacing-200);

Expand All @@ -81,8 +76,8 @@ governing permissions and limitations under the License.

.spectrum-FieldLabel {
display: block;

box-sizing: border-box;
min-block-size: var(--mod-fieldlabel-min-height, var(--spectrum-fieldlabel-min-height));

padding-block: var(--spectrum-fieldlabel-top-to-text) var(--spectrum-fieldlabel-bottom-to-text);
padding-inline: 0;
Expand Down
1 change: 1 addition & 0 deletions components/fieldlabel/metadata/mods.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
| `--mod-fieldlabel-font-weight` |
| `--mod-fieldlabel-line-height` |
| `--mod-fieldlabel-line-height-cjk` |
| `--mod-fieldlabel-min-height` |
| `--mod-fieldlabel-side-padding-right` |
| `--mod-fieldlabel-side-padding-top` |
| `--mod-spacing-300` |
Expand Down
6 changes: 5 additions & 1 deletion components/fieldlabel/stories/template.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ export const Template = ({
customClasses = [],
size = "m",
label,
alignment = "left",
id,
forInput,
alignment,
isDisabled,
isRequired,
style = {},
Expand Down Expand Up @@ -41,6 +43,8 @@ export const Template = ({
...customClasses.reduce((a, c) => ({ ...a, [c]: true }), {}),
})}
style=${ifDefined(styleMap(style))}
id=${ifDefined(id)}
for=${ifDefined(forInput)}
>
${label}
${isRequired ?
Expand Down
2 changes: 1 addition & 1 deletion components/slider/gulpfile.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
module.exports = require('@spectrum-css/component-builder');
module.exports = require('@spectrum-css/component-builder-simple');
Loading