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

fix: course styling and text updates (resolves #1870, #1872) #1873

Merged
merged 2 commits into from
Jul 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion resources/css/_tokens.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* VARIABLES GENERATED WITH TAILWIND CONFIG ON 7/19/2023.
/* VARIABLES GENERATED WITH TAILWIND CONFIG ON 7/25/2023.
Tokens location: ./tailwind.config.js */
:root {
--space-0: 0;
Expand Down Expand Up @@ -33,6 +33,7 @@
--space-72: 18rem;
--space-80: 20rem;
--space-96: 24rem;
--space-100: 25rem;
--space-192: 48rem;
--space-240: 60rem;
--space-px: 1px;
Expand Down
5 changes: 5 additions & 0 deletions resources/css/routes/courses/_course.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
@supports (width: min(var(--space-100), 100%)) {
.course .grid {
--grid-cell-min-width: var(--space-100);
}
}
2 changes: 1 addition & 1 deletion resources/lang/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@
"Available": "Available",
"Available courses": "Available courses",
"Back": "Back",
"Back to :course": "Back to :course",
"Back to course page": "Back to course page",
"Back to top": "Back to top",
"Banks, federal transportation network (airlines, rail, road and marine transportation providers that cross provincial or international borders), atomic energy, postal and courier services, the broadcasting and telecommunications sectors": "Banks, federal transportation network (airlines, rail, road and marine transportation providers that cross provincial or international borders), atomic energy, postal and courier services, the broadcasting and telecommunications sectors",
"Baseline access needs": "Baseline access needs",
Expand Down
2 changes: 1 addition & 1 deletion resources/lang/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@
"Available": "Disponible",
"Available courses": "Formations disponibles",
"Back": "Précédent",
"Back to :course": "",
"Back to course page": "",
"Back to top": "Revenir en haut",
"Banks, federal transportation network (airlines, rail, road and marine transportation providers that cross provincial or international borders), atomic energy, postal and courier services, the broadcasting and telecommunications sectors": "Banks, federal transportation network (airlines, rail, road and marine transportation providers that cross provincial or international borders), atomic energy, postal and courier services, the broadcasting and telecommunications sectors",
"Baseline access needs": "Besoins de base en matière d'accessibilité",
Expand Down
2 changes: 1 addition & 1 deletion resources/lang/lsq.json
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@
"Available": "Disponible",
"Available courses": "Formations disponibles",
"Back": "Précédent",
"Back to :course": "",
"Back to course page": "",
"Back to top": "Revenir en haut",
"Banks, federal transportation network (airlines, rail, road and marine transportation providers that cross provincial or international borders), atomic energy, postal and courier services, the broadcasting and telecommunications sectors": "Banks, federal transportation network (airlines, rail, road and marine transportation providers that cross provincial or international borders), atomic energy, postal and courier services, the broadcasting and telecommunications sectors",
"Baseline access needs": "Besoins de base en matière d'accessibilité",
Expand Down
15 changes: 9 additions & 6 deletions resources/views/courses/show.blade.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<x-app-layout page-width="wide">
<x-app-layout body-class="course" page-width="wide">
<x-slot name="title">{{ $course->title }}</x-slot>
<x-slot name="header">
<ol class="breadcrumbs" role="list">
Expand Down Expand Up @@ -53,13 +53,16 @@
<h2>{{ __('Modules') }}</h2>
<div class="grid">
@foreach ($modules as $module)
<div class="flex flex-col">
<div class="grid">
{{-- <div class="flex flex-col"> --}}
<div class="card">
<div class="flex items-start justify-between gap-8">
<a
href="{{ localized_route('modules.module-content', ['course' => $course, 'module' => $module]) }}">
{{ $module->title }}
</a>
<h3>
<a
href="{{ localized_route('modules.module-content', ['course' => $course, 'module' => $module]) }}">
{{ $module->title }}
</a>
</h3>
@if ($user->modules->find($module->id)?->getRelationValue('pivot')->finished_content_at)
<span class="badge shrink-0">{{ __('completed') }}</span>
@elseif ($user->modules->find($module->id)?->getRelationValue('pivot')->started_content_at)
Expand Down
2 changes: 1 addition & 1 deletion resources/views/quizzes/show.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
@livewire('email-results', ['quiz' => $course->quiz])
<form action="{{ localized_route('courses.show', $course) }}">
<button>
@svg('heroicon-o-arrow-left') {{ __('Back to :course', ['course' => $course->title]) }}
@svg('heroicon-o-arrow-left') {{ __('Back to course page') }}
</button>
</form>
</div>
Expand Down
1 change: 1 addition & 0 deletions tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ module.exports = {
72: "18rem",
80: "20rem",
96: "24rem",
100: "25rem",
192: "48rem",
240: "60rem"
},
Expand Down