-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update Lux to 5.5.1 Update old lux tags with new lux- tags Remove the loading class as part of the event listener Co-authored-by: Jane Sandberg <sandbergja@users.noreply.github.com>
- Loading branch information
1 parent
bcfbe9c
commit c9e3666
Showing
58 changed files
with
2,505 additions
and
1,743 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,26 @@ | ||
| import Vue from "vue/dist/vue.esm"; | ||
| import system from "lux-design-system"; | ||
| import "lux-design-system/dist/system/system.css"; | ||
| import "lux-design-system/dist/system/tokens/tokens.scss"; | ||
| // eslint-disable-next-line no-unused-vars | ||
| import { createApp } from "vue"; | ||
| import lux from "lux-design-system"; | ||
| import Rails from "@rails/ujs"; // we need to import Rails so vite adds it to the module | ||
| import CopyToClipboard from "../components/copy_to_clipboard"; | ||
| import LockerSizeFilter from "../components/locker_size_filter"; | ||
| import "lux-design-system/dist/style.scss"; | ||
| import "lux-design-system/dist/style.css"; | ||
|
|
||
| Vue.use(system); | ||
| const app = createApp({}); | ||
| const createMyApp = () => createApp(app); | ||
|
|
||
| // create the LUX app and mount it to wrappers with class="lux" | ||
| document.addEventListener("DOMContentLoaded", () => { | ||
| document.getElementsByTagName("html")[0].classList.remove("loading"); | ||
| var elements = document.getElementsByClassName("lux"); | ||
| for (var i = 0; i < elements.length; i++) { | ||
| new Vue({ | ||
| el: elements[i], | ||
| }); | ||
| document.addEventListener('DOMContentLoaded', () => { | ||
| document.getElementsByTagName('html')[0].classList.remove("loading"); | ||
| const elements = document.getElementsByClassName('lux') | ||
| for (let i = 0; i < elements.length; i++) { | ||
| createMyApp().use(lux) | ||
| .mount(elements[i]); | ||
| } | ||
| <<<<<<< HEAD | ||
| new CopyToClipboard(); | ||
| new LockerSizeFilter(); | ||
| }); | ||
| ======= | ||
| }) | ||
| >>>>>>> 99c3e9b (Update npm packages) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| <wrapper> | ||
| <grid-container class="stretch-height" horizontal="center"> | ||
| <grid-item vertical="center" columns="sm-8 lg-8"> | ||
| <text-style variation="default"> | ||
| <lux-wrapper> | ||
| <lux-grid-container class="stretch-height" horizontal="center"> | ||
| <lux-grid-item vertical="center" columns="sm-8 lg-8"> | ||
| <lux-text-style variation="default"> | ||
| You must | ||
| <hyperlink href="<%= user_cas_omniauth_authorize_path %>" variation="button solid" data-method="post" size="large">Login with NetID</hyperlink> | ||
| <lux-hyperlink href="<%= user_cas_omniauth_authorize_path %>" variation="button solid" data-method="post" size="large">Login with NetID</lux-hyperlink> | ||
| to view the requested resource. | ||
| </text-style> | ||
| </grid-item> | ||
| </grid-container> | ||
| </wrapper> | ||
| </lux-text-style> | ||
| </lux-grid-item> | ||
| </lux-grid-container> | ||
| </lux-wrapper> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 9 additions & 9 deletions
18
app/views/locker_applications/_building_select_form.html.erb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,21 @@ | ||
| <wrapper> | ||
| <lux-wrapper> | ||
| <%= form_with(model: locker_application, local: true) do |form| %> | ||
| <%= form.hidden_field :user_uid , value: locker_application.uid %> | ||
| <grid-container horizontal="center" class="stretch-height"> | ||
| <grid-item columns="lg-4 md-6 sm-12 auto" vertical="center" > | ||
| <lux-grid-container horizontal="center" class="stretch-height"> | ||
| <lux-grid-item columns="lg-4 md-6 sm-12 auto" vertical="center" > | ||
| <div class="library-selection-box"> | ||
| <input-select | ||
| <lux-input-select | ||
| label="Library" | ||
| name="locker_application[building_id]" | ||
| id="locker_application_building_id" | ||
| width="expand" | ||
| value="" | ||
| required | ||
| :options="<%= Building.building_choices.to_json %>" | ||
| ></input-select> | ||
| <input-button type="submit" variation="solid">Next</input-button> | ||
| ></lux-input-select> | ||
| <lux-input-button type="submit" variation="solid">Next</lux-input-button> | ||
| </div> | ||
| </grid-item> | ||
| </grid-container> | ||
| </lux-grid-item> | ||
| </lux-grid-container> | ||
| <% end %> | ||
| </wrapper> | ||
| </lux-wrapper> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.