Skip to content
Open

Develop #1177

Show file tree
Hide file tree
Changes from 2 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
29 changes: 29 additions & 0 deletions .github/workflows/test.yml-template
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: Test

on:
pull_request:
branches: [ master ]

jobs:
build:

runs-on: ubuntu-latest

strategy:
matrix:
node-version: [20.x]

steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- run: npm install
- run: npm test
- name: Upload HTML report(backstop data)
if: ${{ always() }}
uses: actions/upload-artifact@v2
with:
name: report
path: backstop_data
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ Adapt the page to the following screens:
11. `git push origin develop` - to send you code for PR.
12. Create a Pull Request (PR) from your branch `develop` to branch `master` of original repo.
13. Replace `<your_account>` with your Github username in the
[DEMO LINK](https://<your_account>.github.io/layout_dia/).
[DEMO LINK](https://Bo-dikkk.github.io/layout_dia/).
14. Copy `DEMO LINK` to the PR description.

> To update you PR repeat steps 7-11.
80 changes: 75 additions & 5 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,19 +1,89 @@
<!-- #region head -->
<!doctype html>
<html lang="en">
<html class="page" lang="en">
<head>
<meta charset="UTF-8" />
<meta
name="viewport"
content="width=device-width, initial-scale=1.0"
/>
<title>Dia</title>
<title>Air</title>
<link
rel="stylesheet"
href="src/styles/main.scss"
href="src/styles/style.scss"
/>
<link
rel="shortcut icon"
href="src/images/logo/air-logo.svg"
type="image/x-icon"
>
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com">
<link href="https://fonts.googleapis.com/css2?family=Poppins:wght@400;500;600;700&display=swap" rel="stylesheet">

<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com">
<link href="https://fonts.googleapis.com/css2?family=Open+Sans:wght@300..800&display=swap" rel="stylesheet">
</head>
<body>
<h1>Dia</h1>
<!-- #endregion -->
<body class="page__body">
<header class="header">
<div class="container">
<div class="header__content">
<div class="top-bar">
<div class="top-bar__block">
<a href="#" class="top-bar__logo-link">
<img
src="src/images/logo/air-logo.svg"
alt="Air logo"
class="top-bar__logo"
>
</a>
<a
href="#"
class="top-bar__icon top-bar__icon--menu"
></a>
</div>

<a class="top-bar__hire-us" href="#">Hire us</a>
</div>

<div class="header__bottom">
<h1 class="header__title">
Strategic Agency
</h1>

<p class="header__text">
We believe in the power of bold ideas that can solve business challenges.
</p>

<div class="header__button-wrapper">
<div class="header__button">
Learn more
</div>
</div>
</div>
</div>
</div>
<div class="slide-bar">
<div class="slide-bar__buttons">
<a
href="#"
class="slide-bar__button slide-bar__button--left"
></a>
<a
href="#"
class="slide-bar__button slide-bar__button--right"
></a>
</div>

<div class="slide-bar__title">Intro</div>

<div class="slide-bar__text">
By the same illusion which lifts the horizon.
</div>
</div>
</header>
<script src="src/scripts/main.js"></script>
</body>
</html>
9 changes: 5 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"@linthtml/linthtml": "^0.9.6",
"@mate-academy/bemlint": "latest",
"@mate-academy/linthtml-config": "latest",
"@mate-academy/scripts": "^2.1.2",
"@mate-academy/scripts": "^2.1.3",
"@mate-academy/stylelint-config": "latest",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
Expand Down
3 changes: 3 additions & 0 deletions src/images/icons/icon-menu.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions src/images/logo/air-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 10 additions & 2 deletions src/images/slider/arrow-left.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 10 additions & 2 deletions src/images/slider/arrow-right.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/images/slider/slide-img-1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 0 additions & 6 deletions src/styles/_fonts.scss

This file was deleted.

3 changes: 0 additions & 3 deletions src/styles/_typography.scss

This file was deleted.

3 changes: 0 additions & 3 deletions src/styles/_utils.scss

This file was deleted.

3 changes: 3 additions & 0 deletions src/styles/blocks/container.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.container {
padding-inline: 20px;
}
62 changes: 62 additions & 0 deletions src/styles/blocks/header.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
.header {
background-color: $header-bg-color;
color: #fff;
height: 100vh;

&__content {
margin: 0;
}

&__title {
margin: 0;
margin-top: 48px;

font-weight: 600;
font-size: 52px;
line-height: 120%;
letter-spacing: -2px;
}

&__text {
margin: 0;
margin-top: 32px;

font-family: 'Open Sans', sans-serif;
font-weight: 400;
font-size: 18px;
line-height: 150%;
}

&__button-wrapper {
@include page-grid;
}

&__button {
grid-column: span 2;

margin: 0;
margin-top: 72px;
margin-bottom: 48px;
height: 50px;
background-color: #2060f6;
display: flex;
align-items: center;
justify-content: center;
box-sizing: border-box;
border-radius: 8px;

font-weight: 600;
font-size: 15px;
line-height: 100%;

&:hover {
transition: all 0.3s;
background-color: blue;
cursor: pointer;
}

&:active {
background-color: darkblue;
}
}
}
16 changes: 16 additions & 0 deletions src/styles/blocks/page.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
.page {
margin: 0;
padding: 0;

font-family: Poppins, sans-serif;
font-weight: 700;

scroll-behavior: smooth;

&__body {
margin: 0;
padding: 0;
background-color: $c-gray;
min-width: 320px;
}
}
55 changes: 55 additions & 0 deletions src/styles/blocks/slide-bar.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
.slide-bar {
background-image: url(/src/images/slider/slide-img-1.jpg);
border-radius: 30px;
height: 390px;
padding-inline: 20px;
width: 100%;
box-sizing: border-box;
background-size: cover;
background-position: center;

&__buttons {
display: flex;
gap: 16px;
padding-top: 250px;
}

&__button {
display: block;
height: 32px;
width: 32px;
background-size: cover;
background-position: center;

&--left {
background-image: url(/src/images/slider/arrow-left.svg);
}

&--right {
background-image: url(/src/images/slider/arrow-right.svg);
}
}

&__title {
margin: 0;
margin-top: 16px;
text-align: left;
text-transform: uppercase;

font-weight: 700;
font-size: 13px;
line-height: 100%;
letter-spacing: 3px;
}

&__text {
margin: 0;
margin-top: 8px;
text-align: left;

font-family: 'Open Sans', sans-serif;
font-weight: 400;
font-size: 14px;
line-height: 140%;
}
}
Loading
Loading