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.

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

Use lux-styleguidist #984

Merged
merged 66 commits into from
Apr 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
934743d
Use lux-styleguidist
christinach Dec 29, 2023
65f0770
Remove vue@2 dependencies from tests
christinach Jan 18, 2024
92f8102
upgrades vue-test-utils to a compatible version and removes localVue …
sdellis Jan 31, 2024
c99e5fa
Replace instances of InputText with LuxInputText
christinach Feb 8, 2024
9ca03e7
In vue 3, we no longer need .$el
sandbergja Feb 8, 2024
a32583b
Use the Vue 3 plugin and component loading syntax (#994)
sandbergja Feb 14, 2024
cdb03e4
Use lux-heading and lux-text-style components from lux (#996)
sandbergja Feb 15, 2024
2590b88
Add Rails UJS back to the javascript (#997)
sandbergja Feb 21, 2024
3387e7b
Use lux-data-table, rather than data-table (#1005)
sandbergja Feb 23, 2024
954c3d4
Build and use lux-styleguidist in CI (#1007)
maxkadel Feb 23, 2024
6561041
Fix indentation using yarn lint (#1008)
maxkadel Feb 23, 2024
c229967
Update hyperlink to lux-hyperlink
christinach Feb 21, 2024
b8a9d16
Update lux to 5.0.0-alpha.12
christinach Feb 26, 2024
d846aee
Add prefix in Lux Components
christinach Feb 26, 2024
18a11a9
Vue components call lux components with the lux- prefix (#1022)
sandbergja Feb 27, 2024
5f9cd2c
Eslint should ignore the Rails/ujs import (#1023)
sandbergja Feb 27, 2024
c002912
Use the LuxInputSelect's focusSelect() method (#1026)
sandbergja Feb 27, 2024
fde98b9
Resolve yarn test warnings
sandbergja Feb 27, 2024
925ae82
Update eslint ecmaVersion (#1027)
sandbergja Feb 27, 2024
5b36118
Fix views/shared/ specs (#1030)
maxkadel Feb 27, 2024
64f4148
Fix views/absence_requests specs (#1031)
maxkadel Feb 27, 2024
604c3fd
Fixes #1009 (#1028)
maxkadel Feb 27, 2024
e5246b7
Fix test failures for spec/views/travel_requests (#1029)
sandbergja Feb 27, 2024
ad5ebd8
i1013: address delegate system test failure (#1032)
sandbergja Feb 27, 2024
73c9683
Update components with prefixs. Towards #1017 (#1033)
christinach Feb 27, 2024
7758417
Update components with prefixs. Towards #1017 (#1034)
christinach Feb 27, 2024
84af74b
Update components with lux prefix towards #1017 (#1035)
christinach Feb 27, 2024
c9bd2e5
Update dropdown prefix with lux (#1037)
christinach Feb 27, 2024
7d2a1db
Upgrading absence request form for new lux (#1038)
sandbergja Feb 28, 2024
10795e2
Update components with lux prefix: my_requests_spec, edit.html.erb, n…
christinach Feb 28, 2024
7b6175f
Use lux-tag and lux-input-button (#1041)
maxkadel Feb 28, 2024
f471106
Get a little farther in the test before failing (#1044)
maxkadel Feb 29, 2024
7c462e6
Update lux version to 5.0.0-alpha.15 (#1045)
christinach Feb 29, 2024
f307b53
Update selectors in view tests to match new lux components (#1046)
sandbergja Feb 29, 2024
5090dec
Update lux to alpha.16 (#1052)
christinach Mar 1, 2024
6cf35c5
lux 5.0.0-alpha.17 (#1056)
sandbergja Mar 1, 2024
f168d99
Run CI against published lux-styleguidist release (#1057)
maxkadel Mar 1, 2024
7cfdb10
Lux 5.0.0-alpha18 (#1058)
sandbergja Mar 4, 2024
93f7736
Mount the vue application to the parent of our top component (#1059)
sandbergja Mar 4, 2024
02ef126
Listen for inputvaluechange event, rather than the input event (#1061)
sandbergja Mar 4, 2024
960a34c
update lux to 5.0.0-alpha.19 (#1060)
christinach Mar 4, 2024
7739aa5
Update lux to alpha.21 (#1064)
christinach Mar 4, 2024
197922d
Fix styles in the help page (#1072)
sandbergja Mar 5, 2024
46c9b93
lux alpha.22 release (#1073)
christinach Mar 5, 2024
299b748
Add lux prefix in various components (#1074)
christinach Mar 5, 2024
4ac4dca
Update wrapper component with lux prefix (#1075)
christinach Mar 5, 2024
8245c83
Update alert with lux prefix- fix delegation (#1076)
christinach Mar 5, 2024
222643f
Lux prelease alpha.23 (#1077)
christinach Mar 5, 2024
503fc23
Lux prerelease alpha.25 (#1087)
christinach Mar 7, 2024
e64d527
Lux 5.0.0-alpha.26 prerelease (#1089)
christinach Mar 7, 2024
cd772d1
Update slot syntax (#1094)
sandbergja Mar 8, 2024
04766d3
Upgrade lux to 5.0.0-alpha.27 (#1103)
christinach Mar 14, 2024
ca9a7b2
Fix test for card-header (#1107)
maxkadel Mar 15, 2024
687b9fb
Add lux prefix in help page (#1111)
christinach Mar 15, 2024
79dbdd1
Removed hard-coded styles (#1112)
rladdusaw Mar 18, 2024
85c189e
Sending the escape key to close the autocomplete that was blocking bu…
rladdusaw Mar 18, 2024
f1f0254
Update lux to 5.0.0-alpha.28 (#1114)
christinach Mar 19, 2024
1c6ef06
Sending tab to clear autocomplete instead of escape (#1115)
rladdusaw Mar 19, 2024
a274851
lux release 5.0.0-alpha.29 (#1119)
christinach Mar 21, 2024
6efad60
Update lux to alpha-5.0.0-30 (#1120)
christinach Mar 21, 2024
eb3c212
Update lux to alpha-5.0.0-31 (#1122)
christinach Mar 21, 2024
6ae2a58
update lux to 5.0.0-alpha.32 (#1124)
christinach Mar 26, 2024
443c95f
Update lux to alpha-5.0.0-33 release (#1125)
christinach Mar 26, 2024
e80af51
Lux 5.0.0-beta.2 (#1128)
christinach Mar 27, 2024
5dabfd0
lux-design-system release 5.0.0-beta.3 (#1132)
christinach Mar 29, 2024
bda6cec
Update location_loader_spec Array spec with contain_exactly (#1133)
christinach Mar 29, 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
1 change: 0 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ jobs:
keys:
- approvals-yarn-v1-{{ checksum "yarn.lock" }}
- approvals-yarn-v1-

- run:
name: Yarn Install
command: yarn install --cache-folder ~/.cache/yarn
Expand Down
2 changes: 1 addition & 1 deletion .eslintrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ globals:
Atomics: readonly
SharedArrayBuffer: readonly
parserOptions:
ecmaVersion: 2018
ecmaVersion: 2020
sourceType: module
parser: vue-eslint-parser
plugins:
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,5 @@ node_modules
# https://vitejs.dev/guide/env-and-mode.html#env-files
*.local

.vscode/

12 changes: 6 additions & 6 deletions app/assets/stylesheets/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ $green: #c3ed79;
}

body {
background-color: $color-grayscale-warm-lighter;
font-family: $font-family-system;
background-color: var(--color-grayscale-warm-lighter);
font-family: var(--font-family-system);
}

// Adds space to main-content of page
Expand All @@ -31,19 +31,19 @@ body {

.current-delegate span {
display: block;
font-weight: $font-weight-bold;
font-weight: var(--font-weight-bold);
line-height: 40px;
margin: 0 auto;
max-width: 1400px;

.lux-link.button.outline {
background-color: $color-white;
background-color: var(--color-white);
border: 0;
line-height: 1;

&:hover,
&:focus {
color: $color-bleu-de-france-darker;
color: var(--color-bleu-de-france-darker);
}

@media (max-width: 899px) {
Expand All @@ -57,7 +57,7 @@ body {

p {
line-height: 1.6;
font-weight: $font-weight-regular;
font-weight: var(--font-weight-regular);
margin-top: 1rem;
}
}
Expand Down
14 changes: 7 additions & 7 deletions app/assets/stylesheets/_card.scss
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@

.help {
a {
color: $color-rich-black;
color: var(--color-rich-black);
font-weight: bold;
text-decoration: none;

Expand Down Expand Up @@ -140,19 +140,19 @@
}

.tip-card {
background: $color-white;
background: var(--color-white);
border-color: transparent;
border-left: 4px solid $color-bleu-de-france;
border-left: 4px solid var(--color-bleu-de-france);
border-radius: 0;
box-shadow: $box-shadow-small;
color: $color-rich-black;
box-shadow: var(--box-shadow-small);
color: var(--color-rich-black);
line-height: 1.6;
padding: 12px 24px 12px 30px;
position: relative;

&::before {
content: "i";
background-color: $color-bleu-de-france;
background-color: var(--color-bleu-de-france);

position: absolute;
top: 14px;
Expand All @@ -163,7 +163,7 @@
border-radius: 100%;
text-align: center;
line-height: 20px;
font-weight: $font-weight-bold;
font-weight: var(--font-weight-bold);
font-size: 14px;
}
}
10 changes: 5 additions & 5 deletions app/assets/stylesheets/_estimates.scss
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
}

td {
border: 1px solid $color-grayscale-light;
border: 1px solid var(--color-grayscale-light);
margin: 0 0 -1px 0;
padding-top: 2.25rem;
position: relative;
Expand All @@ -122,10 +122,10 @@
&:nth-of-type(5):before { content: "Total"; }

&:before {
background: $color-grayscale-warm-lighter;
border-bottom: 1px solid $color-grayscale-light;
border-right: 1px solid $color-grayscale-light;
color: $color-grayscale-dark;
background: var(--color-grayscale-warm-lighter);
border-bottom: 1px solid var(--color-grayscale-light);
border-right: 1px solid var(--color-grayscale-light);
color: var(--color-grayscale-dark);
font-size: 10px;
font-weight: bold;
padding: 5px;
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/_notes.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
.notes li {
padding-bottom: 1rem;
margin: 1rem 0;
border-bottom: 1px solid $color-grayscale-light;
border-bottom: 1px solid var(--color-grayscale-light);
display: flex;
overflow-wrap: break-word;
word-break: break-word;
Expand Down
30 changes: 15 additions & 15 deletions app/assets/stylesheets/_parameters.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.search-filter-sort.lux-card {
border: 1px solid $color-grayscale-warm-light;
border: 1px solid var(--color-grayscale-warm-light);
box-shadow: none;
background: lighten($color-grayscale-warm-light, 17%);
background: lighten(rgb(210, 202, 173), 17%);
}

.lux-col .lux-search-box,
Expand All @@ -11,15 +11,15 @@
}

.filter-applied {
border-top: 1px solid $color-grayscale-warm-light;
border-top: 1px solid var(--color-grayscale-warm-light);
margin-top: 1rem;
padding-top: 1rem;
}

.filter-label {
color: $color-grayscale-darker;
color: var(--color-grayscale-darker);
display: block;
font-size: $font-size-small;
font-size: var(--font-size-small);
margin: 0 0 0.5rem 1rem;
}

Expand Down Expand Up @@ -54,7 +54,7 @@
.lux-search-box .lux-button,
.lux-search-box .lux-button.text {
width: auto;
background-color: lighten($color-grayscale-warm-light, 20%);
background-color: lighten(rgb(210, 202, 173), 20%);
}

.date-filter form {
Expand All @@ -74,29 +74,29 @@
}

.pagination a {
box-shadow: $box-shadow-small;
border-radius: $border-radius-default;
background-color: $color-white;
padding: $space-x-small $space-small;
margin-left: $space-xx-small;
box-shadow: var(--box-shadow-small);
border-radius: var(--border-radius-default);
background-color: var(--color-white);
padding: var(--space-x-small) var(--space-small);
margin-left: var(--space-xx-small);
text-decoration: none;
color: $color-rich-black;
color: var(--color-rich-black);
display: inline-block;

@media (max-width: 599px) {
margin-bottom: $space-x-small;
margin-bottom: var(--space-x-small);
}

&:hover,
&:focus {
box-shadow: $box-shadow-selected;
box-shadow: var(--box-shadow-selected);
outline: 0;
}
}

.page.current {
background-color: initial;
box-shadow: none;
padding: $space-xx-small;
padding: var(--space-xx-small);
text-align: center;
}
17 changes: 2 additions & 15 deletions app/assets/stylesheets/application.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
*= require_self
*/

@import "lux-design-system/dist/system/tokens/tokens";
@import "lux-design-system/dist/system/system.utils.scss";
@import "lux-design-system/dist/style.css";

@import "base";
@import "card";
Expand Down Expand Up @@ -50,17 +49,5 @@
}

article.full-width {
width: 100%;
display: flex;
align-items: flex-start;
flex-flow: row wrap;
box-sizing: border-box;
margin: 24px 0 24px 0;
font-family: franklin-gothic-urw,Helvetica,Arial,sans-serif;
line-height: 1.6;
background: #fff;
box-shadow: 0 0 0 1px rgba(92,106,196,.1);
color: #001123;
position: relative;
margin-bottom: 0;
margin: 24px 0 0;
}
8 changes: 4 additions & 4 deletions app/javascript/components/eventDateModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,22 @@
</slot>
</div>
<div class="modal-footer">
<input-button
<lux-input-button
type="button"
variation="solid"
size="small"
@button-clicked="submit"
>
Continue
</input-button>
<input-button
</lux-input-button>
<lux-input-button
type="button"
variation="outline"
size="small"
@button-clicked="$emit('closeModal')"
>
Go Back
</input-button>
</lux-input-button>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/javascript/components/eventTitleInputWrapper.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div class="event-title-container">
<input-autocomplete
<lux-autocomplete-input
id="travel_request_event_requests_attributes_0_recurring_event_id"
required
name="travel_request[event_requests_attributes][0][recurring_event_id]"
Expand Down
6 changes: 3 additions & 3 deletions app/javascript/components/hoursCalculator.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div>
<date-picker
<lux-date-picker
id="absence_request_date"
name="absence_request[start_date]"
label="Date range"
Expand All @@ -26,15 +26,15 @@
:value="localEndDate"
>

<input-text
<lux-input-text
id="absence_request_hours_requested"
name="absence_request[hours_requested]"
width="expand"
label="Total hours requested"
:helper="helperCaption"
:value="localHoursRequested"
required
@input="updateCaption($event)"
@inputvaluechange="updateCaption($event)"
/>
</div>
</template>
Expand Down
Loading
Loading