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

Add task solution #2662

Open
wants to merge 32 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
48faf26
positioning header
Mykyta-snacj Jul 31, 2024
669dc7d
CSS for main secondary header
Mykyta-snacj Jul 31, 2024
51733d4
CSS for main secondary header
Mykyta-snacj Jul 31, 2024
a90f960
CSS for main secondary header
Mykyta-snacj Jul 31, 2024
d6cdace
add main paragrph / add section title
Mykyta-snacj Aug 1, 2024
b8910fc
add poducts articles
Mykyta-snacj Aug 1, 2024
b6940dd
better BEM classes
Mykyta-snacj Aug 1, 2024
0273696
better BEM fix font-family error
Mykyta-snacj Aug 1, 2024
ce2d608
details section basic version
Mykyta-snacj Aug 2, 2024
b9613e9
Details button
Mykyta-snacj Aug 2, 2024
bbb7123
Fixing mistakes / add spaces
Mykyta-snacj Aug 2, 2024
7e290f1
add section contact-us
Mykyta-snacj Aug 3, 2024
929e872
add section contact-us
Mykyta-snacj Aug 3, 2024
7b71b74
better BEM / add footer
Mykyta-snacj Aug 3, 2024
1dcf72e
rework block form / add hovers for buttons and inputs
Mykyta-snacj Aug 4, 2024
cf04373
add block navigation
Mykyta-snacj Aug 5, 2024
703597e
max-content for items in navigation
Mykyta-snacj Aug 5, 2024
9ab7b1a
add block menu
Mykyta-snacj Aug 6, 2024
a6dbe79
menu transition
Mykyta-snacj Aug 6, 2024
3e902b2
working menu
Mykyta-snacj Aug 6, 2024
7f4d1c4
rework margins
Mykyta-snacj Aug 7, 2024
9996ac0
grid for main
Mykyta-snacj Aug 8, 2024
2775707
grid for sections details and compaire bikes
Mykyta-snacj Aug 8, 2024
8dc07f9
grid setcion contact
Mykyta-snacj Aug 9, 2024
b1539a5
grid menu and adaptive font size for header block
Mykyta-snacj Aug 10, 2024
149d1cf
make build
Mykyta-snacj Aug 10, 2024
ce3ae02
rework style for desktop and tablet versions
Mykyta-snacj Aug 11, 2024
0ce05d2
Final page v0.1
Mykyta-snacj Aug 13, 2024
2da8f3d
fixing bugs and add some variables
Mykyta-snacj Aug 14, 2024
50afdaf
fix mistake for titles
Mykyta-snacj Aug 14, 2024
8eb43bb
Final page v0.2
Mykyta-snacj Aug 15, 2024
a53a3b4
Final page v0.3
Mykyta-snacj Aug 15, 2024
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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ In this task, you will learn how to implement a landing page. To do that:
- [Nothing](https://www.figma.com/file/DtkQmQ797hk0nI4KfMi2Uq/BOSE-New-Version?type=design&node-id=6802-139&t=L7eKz5YKLN0m5WxR-0)
- watch the lesson videos and implement your page blocks similarly to the videos;
- **DON'T** try to do it `Pixel Perfect` - implement it the most `simple` way so it looks similar;
- when you finish the first block of your page deploy it and create a Pull Request with a [DEMO LINK](https://<your_account>.github.io/layout_miami/)
- when you finish the first block of your page deploy it and create a Pull Request with a [DEMO LINK](https://Mykyta-snacj.github.io/layout_miami/)
- after each next block do the same (add, commit and push the changes, and deploy the updated demo;
- check yourself using the [CHECKLIST](https://github.com/mate-academy/layout_miami/blob/master/checklist.md) when finished;
3 changes: 0 additions & 3 deletions src/images/cross.svg

This file was deleted.

3 changes: 0 additions & 3 deletions src/images/crown.svg

This file was deleted.

Binary file modified src/images/favicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/images/logo.png
Binary file not shown.
3 changes: 0 additions & 3 deletions src/images/menu.svg

This file was deleted.

3 changes: 0 additions & 3 deletions src/images/menu_hover.svg

This file was deleted.

3 changes: 0 additions & 3 deletions src/images/phone.svg

This file was deleted.

Binary file removed src/images/photos/1.jpg
Binary file not shown.
Binary file removed src/images/photos/2.jpg
Binary file not shown.
Binary file removed src/images/photos/3.jpg
Binary file not shown.
Binary file removed src/images/photos/4.jpg
Binary file not shown.
Binary file removed src/images/photos/5.jpg
Binary file not shown.
Binary file removed src/images/photos/6.jpg
Binary file not shown.
Binary file added src/images/photos/header-background.jpg

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this image has low quality
you should import this whole picture and then adjust it's position
image

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 20 additions & 2 deletions src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,15 @@
name="viewport"
content="width=device-width, initial-scale=1.0"
/>
<title>Miami</title>
<title>MyBiKE</title>
<link
rel="shortcut icon"
href="./images/favicon.png"
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@500;700&family=Roboto:wght@400;500;700&display=swap" rel="stylesheet">
<link
rel="stylesheet"
href="./styles/main.scss"
Expand All @@ -17,6 +25,16 @@
></script>
</head>
<body>
<h1>Miami</h1>
<header class="header">
<h1 class="title">
Take the Streets
</h1>
</header>

<main class="main">
<h2 class="title title--secondary">
Move Free
</h2>
</main>
</body>
</html>
4 changes: 4 additions & 0 deletions src/styles/.blocks/main.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.main {
padding: 60px 20px;
background-color: #1D1D1D;
}
12 changes: 12 additions & 0 deletions src/styles/blocks/header.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
.header {
box-sizing: border-box;
display: flex;
flex-direction: column;
justify-content: flex-end;
padding: 0 20px 88px;
min-height: 100vh;
background-color: #484848;
background-image: url(../images/photos/header-background.jpg);
background-repeat: no-repeat;
background-size: cover;
}
19 changes: 19 additions & 0 deletions src/styles/blocks/title.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
.title {
font-family: Poppins, Helvetica, sans-serif;
font-size: 36px;
font-weight: 700;
line-height: 36px;
letter-spacing: -1.5px;
text-align: center;

color: #fff;

&--secondary {
font-family: Poppins, Helvetica, sans-serif;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you don't need to repeat styles from title

font-size: 32px;
font-weight: 500;
line-height: 32px;
letter-spacing: -1.5px;
text-align: left;
}
}
11 changes: 4 additions & 7 deletions src/styles/main.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
@import 'utils';
@import 'fonts';
@import 'typography';

body {
background: $c-gray;
}
@import './utils/reset';
@import './blocks/header';
@import './blocks/title';
@import '.blocks/main';
135 changes: 135 additions & 0 deletions src/styles/utils/reset.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,135 @@
/* http://meyerweb.com/eric/tools/css/reset/
v2.0 | 20110126
License: none (public domain)
*/

html,
body,
div,
span,
applet,
object,
iframe,
h1,
h2,
h3,
h4,
h5,
h6,
p,
blockquote,
pre,
a,
abbr,
acronym,
address,
big,
cite,
code,
del,
dfn,
em,
img,
ins,
kbd,
q,
s,
samp,
small,
strike,
strong,
sub,
sup,
tt,
var,
b,
u,
i,
center,
dl,
dt,
dd,
ol,
ul,
li,
fieldset,
form,
label,
legend,
table,
caption,
tbody,
tfoot,
thead,
tr,
th,
td,
article,
aside,
canvas,
details,
embed,
figure,
figcaption,
footer,
header,
hgroup,
menu,
nav,
output,
ruby,
section,
summary,
time,
mark,
audio,
video {
margin: 0;
padding: 0;
border: 0;
font-family: inherit;
font-size: 100%;
vertical-align: baseline;
}

/* HTML5 display-role reset for older browsers */
article,
aside,
details,
figcaption,
figure,
footer,
header,
hgroup,
menu,
nav,
section {
display: block;
}

body {
line-height: 1;
}

ol,
ul {
list-style: none;
}

blockquote,
q {
quotes: none;
}

blockquote::before,
blockquote::after,
q::before,
q::after {
content: '';
content: none;
}

table {
border-collapse: collapse;
border-spacing: 0;
}
4 changes: 4 additions & 0 deletions src/workspace.code-workspace
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"folders": [],
"settings": {}
}
Loading