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

Develop #2636

Open
wants to merge 40 commits into
base: master
Choose a base branch
from
Open

Develop #2636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
620e6b5
initial commit
bartKarb Feb 13, 2024
f1c19e3
initial commit
bartKarb Feb 13, 2024
518f3ef
second commit
bartKarb Feb 13, 2024
dc42bcb
Positioning title in header
bartKarb Feb 13, 2024
fed7624
Setting header background
bartKarb Feb 13, 2024
96fb522
HTML for main section
bartKarb Feb 13, 2024
178d4c8
CSS for main secondary header
bartKarb Feb 13, 2024
962d005
Setting font for main block
bartKarb Feb 14, 2024
13bf8b8
Setting font styles for main paragraphs
bartKarb Feb 14, 2024
bde0a72
Pictures for design
bartKarb Feb 14, 2024
f0c62cc
HTML for gallery
bartKarb Feb 14, 2024
3dd7df6
Gallery section basic version done
bartKarb Feb 14, 2024
edeac7c
View all button
bartKarb Feb 14, 2024
c58358f
View all button
bartKarb Feb 14, 2024
3714897
First section fulfilled with text and basic styles
bartKarb Feb 14, 2024
77256c7
Address block
bartKarb Feb 14, 2024
000f6b3
Added form section with styles
bartKarb Feb 15, 2024
534e2f4
Form styles
bartKarb Feb 15, 2024
3c66203
Added intersection with styles
bartKarb Feb 15, 2024
43f1752
Navigation added
bartKarb Feb 15, 2024
9545eee
Menu ready for interaction
bartKarb Feb 15, 2024
e7d20ea
HTML for menu ready
bartKarb Feb 16, 2024
0fd41ca
Menu icons and background
bartKarb Feb 16, 2024
f43f49d
Styling links
bartKarb Feb 16, 2024
bf46954
Menu fully styled
bartKarb Feb 16, 2024
f8a3b02
Menu transition
bartKarb Feb 19, 2024
217f5c9
Working menu
bartKarb Feb 19, 2024
b2189f4
Setting up spacing
bartKarb Feb 19, 2024
ebb6286
Vertical distances corrected
bartKarb Feb 19, 2024
e4f5d59
Sqquare images
bartKarb Feb 19, 2024
51f5252
Media qquery and grid for header
bartKarb Feb 19, 2024
22585c1
Media queries and grid for header
bartKarb Feb 19, 2024
65c3270
Mixin for desktop
bartKarb Feb 19, 2024
55d5ddb
Middle sections styles corrected, grid set up
bartKarb Feb 21, 2024
b2716be
Footer fully set up
bartKarb Feb 21, 2024
a52f6ff
Correcting classes
bartKarb Feb 21, 2024
956cd3f
Updated menu and header
bartKarb Feb 26, 2024
f56b74d
Fixed button and sections alignment
bartKarb Mar 1, 2024
16dad5d
Fixed subtitles and padding
bartKarb Mar 8, 2024
6c37442
Deleted unised button file
bartKarb Mar 10, 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
1 change: 1 addition & 0 deletions .prettier.rc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{ "semi": true, "singleQuote": false, "printWidth": 80, "tabWidth": 2, "useTabs": false, "trailingComma": "all", "bracketSpacing": true, "arrowParens": "avoid", "bracketSameLine": false}
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://bartKarb.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;
1 change: 1 addition & 0 deletions js_stateful-clones
Submodule js_stateful-clones added at 244fac
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"@mate-academy/bemlint": "^0.1.1",
"@mate-academy/eslint-config": "*",
"@mate-academy/linthtml-config": "*",
"@mate-academy/scripts": "^1.2.12",
"@mate-academy/scripts": "^1.7.0",
"@mate-academy/stylelint-config": "^0.0.11",
"@parcel/transformer-sass": "2.10.2",
"backstopjs": "^6.2.2",
Expand Down
2 changes: 2 additions & 0 deletions src/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
styles.css
styles.scc.map
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 removed src/images/favicon.png
Binary file not shown.
Binary file added src/images/header-background-big.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/header-background-medium.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/header-background-smaller.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/header-background.jpg
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/picture-1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/picture-10-wide.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/picture-10.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/picture-2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/picture-3.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/picture-4.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/picture-5.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/picture-6.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/picture-7.jpg
Binary file added src/images/picture-8.jpg
Binary file added src/images/picture-9.jpg
9 changes: 9 additions & 0 deletions src/incons/Company-Logo.svg

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions src/incons/Icon-Burger-menu-hover.svg
10 changes: 10 additions & 0 deletions src/incons/Icon-Burger-menu.svg
3 changes: 3 additions & 0 deletions src/incons/Icon-Close.svg
10 changes: 10 additions & 0 deletions src/incons/Icon-Phone-call.svg
Loading