-
Notifications
You must be signed in to change notification settings - Fork 2.3k
Develop #2724
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
Open
Patryk91sz
wants to merge
27
commits into
mate-academy:master
Choose a base branch
from
Patryk91sz:develop
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Develop #2724
Changes from 14 commits
Commits
Show all changes
27 commits
Select commit
Hold shift + click to select a range
26611c0
Initial commit
Patryk91sz f684375
Positioning Header logo
Patryk91sz 1f6391e
Pos logo
Patryk91sz 7d0726c
Headers loc
Patryk91sz 244e105
Setting header background
Patryk91sz 8af3e2d
First block completed
Patryk91sz afb74de
add task solution
Patryk91sz 1e69ae7
Compare section mobile ready
Patryk91sz e7d24a4
Details block complete
Patryk91sz 827c094
Details complete
Patryk91sz 6d9026d
details complete
Patryk91sz 17e4c16
Fight with mertch
Patryk91sz 7577a9c
Merge branch 'develop' of https://github.com/Patryk91sz/layout_miami …
Patryk91sz 07a2855
Readme update
Patryk91sz c39ba00
Images centring
Patryk91sz 3e6fa67
Site mobile complete. Next menu, connect icons and buttons.
Patryk91sz f00d5cf
Mobile ver looks good, connections left.
Patryk91sz cf913f1
Looks good mobile-ver, connections left.v2
Patryk91sz 081594b
Working menu, and earlier fixes
Patryk91sz 5a0363f
Merge branch 'develop' of https://github.com/Patryk91sz/layout_miami …
Patryk91sz a293d9c
Bem in html repaired, grid mobile ready.
Patryk91sz 8e9f74f
Bem in html repaired, grid mobile ready.
Patryk91sz 4145495
Mobile and tablet grid ready.
Patryk91sz 2a2d3b2
Readme repaired ;P
Patryk91sz 170eae3
Header and move free ready for desktop.
Patryk91sz db3770c
Center on mobile repaired, desktop grid ready.
Patryk91sz 38ea391
100% Complted
Patryk91sz File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| /backstop_data | ||
| /dist | ||
| /node_modules |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,15 @@ | ||
| # IDE | ||
| .idea | ||
| .vscode | ||
| build | ||
| dist | ||
|
|
||
| # Node | ||
| node_modules | ||
| .DS_Store | ||
|
|
||
| npm-debug.log* | ||
| yarn-debug.log* | ||
| yarn-error.log* | ||
| # MacOS | ||
| .DS_Store | ||
|
|
||
| raw_reports | ||
| reports | ||
| cypress/screenshots | ||
| cypress/videos | ||
| # Generated files | ||
| backstop_data | ||
| dist | ||
| .cache | ||
| .parcel-cache |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,17 +6,122 @@ | |
| name="viewport" | ||
| content="width=device-width, initial-scale=1.0" | ||
| /> | ||
| <title>Miami</title> | ||
| <title>My-Bike</title> | ||
| <link rel="preconnect" href="https://fonts.googleapis.com"> | ||
| <link rel="preconnect" href="https://fonts.gstatic.com" | ||
| crossorigin="anonymous"> | ||
| <link href="https://fonts.googleapis.com/css2?family=Poppins:wght@400;700&display=swap" rel="stylesheet"> | ||
| <link | ||
| rel="stylesheet" | ||
| href="src/styles/main.scss" | ||
| href="src/styles/main.css" | ||
| /> | ||
| <script | ||
| src="src/scripts/main.js" | ||
| defer | ||
| ></script> | ||
| </head> | ||
| <body> | ||
| <h1>Miami</h1> | ||
|
|
||
| <header class="header"> | ||
| <nav class="header__nav"> | ||
|
|
||
| <h1 class="header__nav-logo">MyBiKE</h1> | ||
|
|
||
| <div class="header__nav-buttons"> | ||
| <button class="header__nav-button header__nav-button--phone"> | ||
| <img class="header__nav-button--phone-icon" src="src/images/phone.svg" | ||
| alt="phone Icon"/> | ||
| </button> | ||
| <button class="header__nav-button header__nav-button--menu"> | ||
| <img class="header__nav-button--menu-icon" src="src/images/menu.svg" | ||
| alt="menu Icon"/> | ||
| </button> | ||
| </div> | ||
| </nav> | ||
|
|
||
| <h2 class="header__motto">Take the Streets</h2> | ||
| </header> | ||
|
|
||
| <main class="main-first"> | ||
|
|
||
| <section class="move-free"> | ||
| <h3 class="move-free__title">Move Free</h3> | ||
| <p class="move-free__text">Shift your ride, not<br> | ||
| gears. Find the fastest way to move in the city as the bike adapts intuitively to power the speed you need. | ||
| </p> | ||
| </section> | ||
|
|
||
| <section class="compare"> | ||
| <h3 class="compare__title">Compare bikes</h3> | ||
|
|
||
| <div class="compare__bikes"> | ||
|
|
||
| <article class="compare__bike"> | ||
| <img class="compare__bike-image" src="src/images/photos/bike1-mobile.png" | ||
| alt="bike 1"/> | ||
| <h4 class="compare__bike-name">Sporty 4</h4> | ||
| <p class="compare__bike-description">The iconic frame brought to a new performance height as a sporty, active ride.</p> | ||
| <p class="compare__bike-price">$ 2 590</p> | ||
| </article> | ||
|
|
||
| <article class="compare__bike"> | ||
| <img class="compare__bike-image" src="src/images/photos/bike2-mobile.png" | ||
| alt="bike 1"/> | ||
| <h4 class="compare__bike-name">Ride in town ST</h4> | ||
| <p class="compare__bike-description">An open frame for an upright riding position as the most comfortable ride in town.</p> | ||
| <p class="compare__bike-price">$ 2 590</p> | ||
| </article> | ||
|
|
||
| <article class="compare__bike"> | ||
| <img class="compare__bike-image" src="src/images/photos/bike3-mobile.png" | ||
| alt="bike 1"/> | ||
| <h4 class="compare__bike-name">Agile ride 3</h4> | ||
| <p class="compare__bike-description">The lightweight frame that has earned its street tread as a sleek, agile ride.</p> | ||
| <p class="compare__bike-price">$ 2 090</p> | ||
| </article> | ||
|
|
||
| </div> | ||
| </section> | ||
|
|
||
| <section class="details"> | ||
| <h3 class="details__tittle">The details</h3> | ||
|
|
||
| <article class="details__detail"> | ||
| <div class="details__detail__photos"> | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Typical BEM Mistakes: in BEM you never use |
||
| <img class="details__detail__photos__photo" src="src/images/photos/unlock1-mobile.jpg" | ||
| alt="auto-unlock1"/> | ||
| <img class="details__detail__photos__photo" src="src/images/photos/unlock2-mobile.jpg" | ||
| alt="auto-unlock1"/> | ||
| </div> | ||
| <h4 class="details__detail__tittle">Auto Unlock</h4> | ||
| <p class="details__detail__text">The app senses when you're nearby to unlock automatically. GPS tracking so you know where your bike is and can track it anytime.</p> | ||
| </article> | ||
|
|
||
| <article class="details__detail"> | ||
| <div class="details__detail__photos"> | ||
| <img class="details__detail__photo" src="src/images/photos/lights1-mobile.jpg" | ||
| alt="lights1"/> | ||
| <img class="details__detail__photo" src="src/images/photos/lights2-mobile.jpg" | ||
| alt="lights2"/> | ||
| </div> | ||
| <h4 class="details__detail__tittle">Range & Integrated lights</h4> | ||
| <p class="details__detail__text">The removable battery has up to 70km battery autonomy and weighs only 2.4 kg. Lights integrated into the frame give you always-on visibility day and night.</p> | ||
| </article> | ||
|
|
||
| <article class="details__detail"> | ||
| <div class="details__detail__photos"> | ||
| <img class="details__detail__photos__photo" src="src/images/photos/breakes1-mobile.jpg" | ||
| alt="auto-unlock1"/> | ||
| <img class="details__detail__photos__photo" src="src/images/photos/breakes2-mobile.jpg" | ||
| alt="auto-unlock1"/> | ||
| </div> | ||
| <h4 class="details__detail__tittle">Hydraulic disc brakes & Lightweight</h4> | ||
| <p class="details__detail__text">Brakes with total stopping power the second you make contact. The removable battery has up to 70km battery autonomy and weighs only 2.4 kg. Lights integrated into the frame give you always-on visibility day and night.</p> | ||
| </article> | ||
| <div class="explore"> | ||
| <button class="explore__button" type="button">Explore</button> | ||
| </div> | ||
| </section> | ||
| </main> | ||
| </body> | ||
| </html> | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
you don't have main.css file. use main.scss