-
Notifications
You must be signed in to change notification settings - Fork 4
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
Vite3 rebase nov22 #11281
Vite3 rebase nov22 #11281
Changes from 3 commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
VITE_PROCESS_ENV_CDN_URL=https://assets.quill.org | ||
VITE_PROCESS_ENV_PUSHER_KEY= | ||
VITE_PROCESS_ENV_RAILS_ENV=default | ||
VITE_DEFAULT_URL=http://localhost:5000 | ||
VITE_CMS_URL=https://cms.quill.org | ||
VITE_ENV=development |
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,12 @@ | ||
@import "../../../client/node_modules/react-datetime/css/react-datetime"; | ||
|
||
@import "variables"; | ||
@import "bootstrap-sprockets"; | ||
@import 'variables'; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This isn't really a code comment, but just a general one that it is probably worth sending out a note about the major structural changes (like having to explicitly import every nested scss file) to |
||
@import '_mixins'; | ||
@import 'shared/icons'; | ||
@import "bootstrap"; | ||
@import "mixins"; | ||
@import "../../../client/app/assets/styles/home.scss"; | ||
@import "custom"; | ||
@import "pages/**/*"; | ||
@import "cms/**/*"; | ||
@import "shared/icons"; | ||
@import "shared/**/*"; | ||
@import "pages/index"; | ||
@import "cms/index"; | ||
@import "shared/index"; | ||
@import "print"; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
@import 'activities.scss'; | ||
@import 'blog_posts.scss'; | ||
@import 'cms_table.scss'; | ||
@import 'subscription.scss'; | ||
@import 'unit_templates.scss'; | ||
@import 'blog_post.scss'; | ||
@import 'cms.scss'; | ||
@import 'recommendations_table.scss'; | ||
@import 'unit_template_editor.scss'; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,85 @@ | ||
@import 'custom_activity_pack/index.scss'; | ||
@import 'premium_hub/index.scss'; | ||
@import 'progress_reports/index.scss'; | ||
@import 'student_dashboard/index.scss'; | ||
@import 'teacher_dashboard/index.scss'; | ||
@import 'unit_templates/index.scss'; | ||
|
||
@import '404_page.scss'; | ||
@import 'about-page.scss'; | ||
@import 'about-us-pages.scss'; | ||
@import 'accounts_session_and_password_reset.scss'; | ||
@import 'activities.scss'; | ||
@import 'activity_categories.scss'; | ||
@import 'add_class.scss'; | ||
@import 'admin.scss'; | ||
@import 'admin_access.scss'; | ||
@import 'administrator.scss'; | ||
@import 'amplify.scss'; | ||
@import 'archived_classrooms_manager.scss'; | ||
@import 'assign-dates.scss'; | ||
@import 'assign_a_new_activity.scss'; | ||
@import 'assignment_flow.scss'; | ||
@import 'beta.scss'; | ||
@import 'blog_posts.scss'; | ||
@import 'blog_posts_header_section.scss'; | ||
@import 'careers.scss'; | ||
@import 'champion.scss'; | ||
@import 'choose_classroom_lesson.scss'; | ||
@import 'class-page.scss'; | ||
@import 'classrooms.scss'; | ||
@import 'cms_activity_classifications.scss'; | ||
@import 'cms_unit_templates.scss'; | ||
@import 'college_board.scss'; | ||
@import 'contact.scss'; | ||
@import 'create-a-class.scss'; | ||
@import 'custom_activity_pack'; | ||
@import 'diagnostic-planner.scss'; | ||
@import 'edit-coteacher.scss'; | ||
@import 'empty-unit-container.scss'; | ||
@import 'empty_progress_report.scss'; | ||
@import 'faq.scss'; | ||
@import 'google_mismatch.scss'; | ||
@import 'google_sync.scss'; | ||
@import 'grade_level_warning_modal.scss'; | ||
@import 'home.scss'; | ||
@import 'iframed_pages.scss'; | ||
@import 'invite-students.scss'; | ||
@import 'lesson-recommendations.scss'; | ||
@import 'lesson_planner_and_unit_template_editor.scss'; | ||
@import 'manage-classes.scss'; | ||
@import 'manage-units.scss'; | ||
@import 'misc-pages.scss'; | ||
@import 'my_account.scss'; | ||
@import 'my_activities.scss'; | ||
@import 'my_lessons.scss'; | ||
@import 'new_account_page.scss'; | ||
@import 'no_classroom.scss'; | ||
@import 'pathways.scss'; | ||
@import 'premium_banner.scss'; | ||
@import 'premium_features_table.scss'; | ||
@import 'premium_hub'; | ||
@import 'premium_page.scss'; | ||
@import 'press.scss'; | ||
@import 'preview_or_launch_modal.scss'; | ||
@import 'privacy.scss'; | ||
@import 'profile.scss'; | ||
@import 'progress_reports'; | ||
@import 'quill_academy.scss'; | ||
@import 'request_quote.scss'; | ||
@import 'rosters.scss'; | ||
@import 'scorebook_page.scss'; | ||
@import 'sign_up.scss'; | ||
@import 'signin.scss'; | ||
@import 'student_dashboard'; | ||
@import 'student_results.scss'; | ||
@import 'subscriptions.scss'; | ||
@import 'teacher_dashboard'; | ||
@import 'teacher_fixes.scss'; | ||
@import 'teacher_guide.scss'; | ||
@import 'teacher_premium.scss'; | ||
@import 'team.scss'; | ||
@import 'tutorials.scss'; | ||
@import 'update-assigned-students.scss'; | ||
@import 'unit_templates'; | ||
@import 'user-select-role.scss'; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
@import './admin_teachers/admins-teachers.scss'; | ||
@import './admin_teachers/admin-teacher.scss'; | ||
@import './data-export.scss'; | ||
@import './filterable-reports.scss'; | ||
@import './impact_page.scss'; | ||
@import './integrations.scss'; | ||
@import './premium-hub.scss'; | ||
@import './premium-hub-header.scss'; | ||
@import './top.scss'; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
@import './progress_reports_landing_page.scss'; | ||
@import './diagnostic_questions_analysis.scss'; | ||
@import './diagnostic_reports.scss'; | ||
@import './skills_table.scss'; | ||
@import './diagnostic_release_method_modal.scss'; | ||
@import './progress_reports_premium_bar.scss'; | ||
@import './diagnostic_growth_results_summary.scss'; | ||
@import './progress_reports.scss'; | ||
@import './diagnostic_activity_packs.scss'; | ||
@import './trial_expired.scss'; | ||
@import './diagnostic_individual_pack.scss'; | ||
@import './reports_header.scss'; | ||
@import './student-overview.scss'; | ||
@import './progress-reports-2018.scss'; | ||
@import './diagnostic_individual_student_responses.scss'; | ||
@import './toggle_explanation.scss'; | ||
@import './diagnostic_modal.scss'; | ||
@import './diagnostic_student_responses_index.scss'; | ||
@import './empty_diagnostic_progress_reports.scss'; | ||
@import './download-report.scss'; | ||
@import './diagnostic_recommendations.scss'; | ||
@import './diagnostic_results_summary.scss'; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
@import './student_profile_header.scss'; | ||
@import './pinned_activity.scss'; | ||
@import './select_a_classroom.scss'; | ||
@import './student-profile-modal.scss'; | ||
@import './student_navbar.scss'; | ||
@import './student-feedback-modal.scss'; | ||
@import './student_profile_unit.scss'; | ||
@import './student_profile_classwork_tabs.scss'; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Probably something we can do as a follow-up, but we should probably remove these commented-out lines (and restore parity re: using the production
CMS_URL
env variable, since right now this file is the same asProcfile.static
).