-
Notifications
You must be signed in to change notification settings - Fork 3
Use default font-size #826
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
Merged
Merged
Changes from 9 commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
c1b1ead
remove text-sm and text-sm/6 from `subjects/`views
agusmazzeor 1318f28
remove text-sm and text-sm/6 from `shared/`views
agusmazzeor a605dbf
remove text-sm and text-sm/6 from `transcripts/`views
agusmazzeor 2b993e9
remove text-sm and text-sm/6 from `subject_plans/`views
agusmazzeor c6d32b3
remove text-sm and text-sm/6 from `devie/`views
agusmazzeor 374213a
remove text-sm and text-sm/6 from `components/`views
agusmazzeor 1ef95f4
remove text-sm and text-sm/6 from `users/passkeys/`views
agusmazzeor 953408a
only keep text-sm in the Curso/Examen header?
agusmazzeor 5b0a255
fix
agusmazzeor 059f950
return blank lines
agusmazzeor 6304dec
add missing div?
agusmazzeor 1f283e2
Merge remote-tracking branch 'origin/master' into am--use-default-text
120a06f
chore: remove welcome banner
d1f32f1
chore: remove all text-sm and add text-sm in layout
nicolastemciuc 4ecc915
Merge remote-tracking branch 'origin/master' into am--use-default-text
nicolastemciuc e38a396
Remove last `text-sm`
nicolastemciuc File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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,5 +1,4 @@ | ||
| <div class="flex flex-row items-center p-4 mb-4 rounded-lg bg-red-100 text-red-600"> | ||
| <%= material_icon("cancel") %> | ||
|
|
||
| <span class="ms-3 text-sm/6 font-medium"><%= flash[:alert] %></span> | ||
| <span class="ms-3 text-sm font-medium"><%= flash[:alert] %></span> | ||
| </div> |
This file contains hidden or 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
agusmazzeor marked this conversation as resolved.
Show resolved
Hide resolved
|
This file contains hidden or 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,27 +1,19 @@ | ||
| <div data-navigation-drawer-target="drawer" class="fixed inset-y-0 w-64 bg-white transform -translate-x-full transition-transform duration-300 z-50 space-y-2 font-semibold text-sm px-3" > | ||
| <div data-navigation-drawer-target="drawer" class="fixed inset-y-0 w-64 bg-white transform -translate-x-full transition-transform duration-300 z-50 space-y-2 font-semibold px-3" > | ||
| <%= image_tag "icon.png", class: "size-12 mb-4 mt-2" %> | ||
|
|
||
| <%= drawer_menu_navigation_item "Avance de Carrera", root_path %> | ||
|
|
||
| <%= drawer_menu_navigation_item "Todas las Materias", all_subjects_path %> | ||
|
|
||
| <%= drawer_menu_navigation_item "Materias INCO semestre actual", current_optional_subjects_path %> | ||
|
|
||
| <% if ENV['ENABLE_PLANNER'].present? %> | ||
| <%= drawer_menu_navigation_item "Planificador", subject_plans_path, new_badge: true %> | ||
| <% end %> | ||
|
|
||
| <hr class="text-gray-200"/> | ||
|
|
||
| <%= link_to "https://github.com/cedarcode/mi_carrera", target: "_blank", class: "flex items-center gap-1 p-2 rounded-sm hover:bg-gray-100 text-gray-600 hover:text-gray-800" do %> | ||
| <%= material_icon("open_in_new") %> | ||
| Colabora en Github | ||
| <% end %> | ||
|
|
||
| <%= link_to "mailto:feedback-micarrera@cedarcode.com", target: "_blank", class: "flex items-center gap-1 p-2 rounded-sm hover:bg-gray-100 text-gray-600 hover:text-gray-800" do %> | ||
| <%= material_icon("rate_review") %> | ||
| Opina de la app | ||
| <% end %> | ||
| </div> | ||
|
|
||
| <div data-navigation-drawer-target="overlay" data-action="click->navigation-drawer#toggle" class="fixed inset-0 bg-black/30 hidden z-40"></div> |
This file contains hidden or 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 hidden or 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,10 +1,10 @@ | ||
| <div class="sticky bg-purple-100 w-full top-14 sm:top-16" data-controller="welcome-banner"> | ||
| <div class="max-w-[600px] mx-auto px-3 py-2.5 flex items-center gap-x-3"> | ||
| <p class="text-sm/6 text-gray-900"> | ||
| <p class="text-gray-900"> | ||
| ¡Bienvenido! Marcá los cursos y exámenes que aprobaste para ver qué materias podés cursar. | ||
| </p> | ||
| <%= form_with url: user_onboardings_path, method: :patch, data: { turbo: true, action: "welcome-banner#dismiss" } do |f| %> | ||
| <%= f.button 'Listo', class: "py-1 text-sm font-semibold text-primary cursor-pointer uppercase" %> | ||
| <%= f.button 'Listo', class: "py-1 font-semibold text-primary cursor-pointer uppercase" %> | ||
| <% end %> | ||
| </div> | ||
| </div> |
This file contains hidden or 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,4 +1,4 @@ | ||
| <div class="mx-4 my-3 font-medium text-sm"> | ||
| <div class="mx-4 my-3 font-medium"> | ||
| <% planned_approvable_ids = planned_subjects.map { |subject| [subject.course.id, subject.exam&.id] }.flatten.compact %> | ||
| <strong> Créditos planeados:</strong> <%= Subject.approved_credits(planned_approvable_ids) %> | ||
| </div> |
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.