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.

Sign up for GitHub

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

Jump to bottom

Fix home page adaptive #1595

Merged
merged 4 commits into from
Oct 24, 2023
Merged

Fix home page adaptive #1595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
afed148
fix first section adaptive
asselzhl Oct 2, 2023
e2118d8
fix adaptive of image section
asselzhl Oct 3, 2023
3bd2e3b
fix footer adaptive
asselzhl Oct 3, 2023
748aeb8
fix header adaptive
asselzhl Oct 3, 2023
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
26 changes: 13 additions & 13 deletions resources/views/home/landing.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
<section class="my-5">
<div class="container">
<div class="row">
<div class="col col-lg-7">
<div class="col-md-12 col-lg-7">
<h2 class="fw-bold text-uppercase">{{ __('landing.what_for') }}</h2>
<p class="lead">{{ __('landing.what_do') }}</p>
<h3 class="mt-5">{{ __('landing.this_is') }}</h3>
<div class="row row-cols-2 row-cols-lg-4 mb-5 mb-lg-0">
<div class="row row-cols-2 row-cols-lg-4 mb-5 mb-lg-0 gy-3">
<div class="col">
<span class="h3 text-primary">{{ $countChapters }}</span>
<div>{{ __('landing.content.1') }}</div>
Expand All @@ -26,9 +26,9 @@
</div>
</div>
</div>
<div class="col col-lg-5">
<div class="border-0 card d-flex h-100 ps-3">
<div class="card-body d-flex flex-column justify-content-center">
<div class="col-md-11 col-lg-5 p-0">
<div class="border-0 card d-flex h-100 ps-3 pe-3">
<div class="card-body d-flex flex-column justify-content-center p-0">
<h2 class="card-title">{{ __('landing.features') }}</h2>
<ul class="card-text">
<li>{{ __('landing.features_list.1') }}</li>
Expand All @@ -48,8 +48,8 @@

<section class="mb-5 bg-dark text-light">
<div class="container">
<div class="row align-items-center">
<div class="col col-md-6">
<div class="row">
<div class="col col-lg-6 d-flex flex-column justify-content-center py-4">
<h1 class="fw-bold mb-5 text-uppercase">{{ __('landing.title.1') }}
<span class="text-primary">{{ __('landing.title.2') }}</span>
</h1>
Expand All @@ -70,7 +70,7 @@
</figcaption>
</figure>
</div>
<div class="d-none d-md-block col-md-6 text-center">
<div class="d-none d-lg-block col-md-6 text-center align-self-end">
<img src="{{ mix('images/Patchouli_Gives_SICP.png') }}" alt="{{ __('landing.start_learning') }}"
class="img-fluid">
</div>
Expand All @@ -80,21 +80,21 @@ class="img-fluid">

<section class="mb-5">
<div class="container px-1">
<div class="row d-flex justify-content-center gx-2">
<div class="col-2 text-center">
<div class="row d-flex justify-content-center gx-2 gy-3">
<div class="col-6 col-md-3 text-center">
<i class="bi bi-book fs-1 text-primary"></i>
<p class="h2">{{ __('landing.actions_list.1') }}</p>
</div>
<div class="col-3 text-center">
<div class="col-6 col-md-3 text-center">
<i class="bi bi-code-square fs-1 text-primary"></i>
<p class="h2">{{ __('landing.actions_list.2') }}</p>
</div>

<div class="col-4 text-center">
<div class="col-6 col-md-3 text-center">
<i class="bi bi-pen fs-1 text-primary"></i>
<p class="h2">{{ __('landing.actions_list.3') }}</p>
</div>
<div class="col-3 text-center">
<div class="col-6 col-md-3 text-center">
<i class="bi bi-award fs-1 text-primary"></i>
<p class="h2">{{ __('landing.actions_list.4') }}</p>
</div>
Expand Down
8 changes: 4 additions & 4 deletions resources/views/layouts/_footer.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<footer>
<div class="container">
<div class="row gap-4 gap-lg-0 row-cols-1 row-cols-lg-4 py-5">
<div class="col">
<div class="col-5">
<ul class="nav flex-column align-items-start">
<li><a href="{{ route('pages.show', ['page' => 'about']) }}"
class="nav-link px-0">{{ __('layout.footer.about') }}</a></li>
Expand All @@ -11,7 +11,7 @@ class="nav-link px-0">{{ __('layout.footer.source_code') }}</a></li>
class="nav-link px-0">{{ __('layout.footer.volunteers_in_tg') }}</a></li>
</ul>
</div>
<div class="col">
<div class="col-5">
<div class="fw-bold">{{ __('layout.footer.help') }}</div>
<ul class="nav flex-column align-items-start">
<li><a href="https://ru.hexlet.io/blog" class="nav-link px-0">{{ __('layout.footer.blog') }}</a>
Expand All @@ -22,7 +22,7 @@ class="nav-link px-0">{{ __('layout.footer.volunteers_in_tg') }}</a></li>
class="nav-link px-0">{{ __('layout.footer.recommended_books') }}</a></li>
</ul>
</div>
<div class="col">
<div class="col-5">
<div class="fw-bold">{{ __('layout.footer.other_os_projects') }}</div>
<ul class="nav flex-column align-items-start">
<li><a class="nav-link px-0"
Expand All @@ -33,7 +33,7 @@ class="nav-link px-0">{{ __('layout.footer.recommended_books') }}</a></li>
href="https://github.com/Hexlet/hexlet-friends">{{ __('layout.footer.os_projects.friends') }}</a></li>
</ul>
</div>
<div class="col">
<div class="col-5">
<div class="fw-bold">{{ __('layout.footer.additionally') }}</div>
<ul class="nav flex-column align-items-start">
<li><a class="nav-link px-0"
Expand Down
2 changes: 1 addition & 1 deletion resources/views/layouts/_nav.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
$user = Auth::user();
@endphp

<header class="navbar navbar-expand-lg">
<header class="navbar navbar-expand-xl">
<nav class="container py-2 border-bottom">
<a href="{{ LaravelLocalization::getLocalizedURL($currentLocale, route('home')) }}" class="navbar-brand">
<img src="{{ mix("images/logo-$currentLocale.svg") }}" alt="{{ __('layout.nav.logo_alt') }}" height="25px"
Expand Down