-
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
base: master
Are you sure you want to change the base?
Develop #2724
Changes from 15 commits
26611c0
f684375
1f6391e
7d0726c
244e105
8af3e2d
afb74de
1e69ae7
e7d24a4
827c094
6d9026d
17e4c16
7577a9c
07a2855
c39ba00
3e6fa67
f00d5cf
cf913f1
081594b
5a0363f
a293d9c
8e9f74f
4145495
2a2d3b2
170eae3
db3770c
38ea391
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| /backstop_data | ||
| /dist | ||
| /node_modules |
| 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 |
| 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 |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,17 +6,126 @@ | |
| 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> | ||
|
|
||
| <div class="header__motto"> | ||
| <h2 class="header__motto__tittle">Take the Streets</h2> | ||
| </div> | ||
| </header> | ||
|
|
||
| <main class="main"> | ||
|
|
||
| <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 photo" src="src/images/photos/bike1_mobile.jpg" | ||
| alt="Bike Sporty 4"/> | ||
|
|
||
| <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 photo" src="src/images/photos/bike2_mobile.jpg" | ||
| alt="Ride in town ST"/> | ||
| <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 photo" src="src/images/photos/bike3_mobile.jpg" | ||
|
|
||
| alt="Agile ride 3"/> | ||
| <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 photo" src="src/images/photos/unlock1_mobile.jpg" | ||
| alt="Auto Unlock-1"/> | ||
| <img class="details__detail__photos__photo photo" src="src/images/photos/unlock2_mobile.jpg" | ||
| alt="Auto Unlock-2"/> | ||
| </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__photos__photo photo" src="src/images/photos/light1_mobile.jpg" | ||
| alt="lights1"/> | ||
| <img class="details__detail__photos__photo photo" src="src/images/photos/light2_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 photo" src="src/images/photos/breakes1_mobile.jpg" | ||
| alt="breakes1"/> | ||
| <img class="details__detail__photos__photo photo" src="src/images/photos/breakes2_mobile.jpg" | ||
| alt="breakes2"/> | ||
| </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> | ||
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| main.css | ||
| main.css.map |
This file was deleted.
This file was deleted.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,2 @@ | ||
| @import 'utils/vars'; | ||
| @import 'utils/mixins'; | ||
| @import 'utils/extends'; | ||
| @use 'utils/mixins'; | ||
| @use 'utils/reset'; |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| .compare { | ||
| display: flex; | ||
| justify-content: center; | ||
| flex-wrap: wrap; | ||
|
|
||
| &__title { | ||
| justify-content: center; | ||
| height: 32px; | ||
| padding-top: 92px; | ||
| font-family: Poppins, sans-serif; | ||
| font-weight: 500; | ||
| font-style: normal; | ||
| font-size: 32px; | ||
| line-height: 32px; | ||
| letter-spacing: -1.5px; | ||
| text-transform: capitalize; | ||
| } | ||
|
|
||
| &__bikes { | ||
| display: flex; | ||
| justify-content: center; | ||
| flex-wrap: wrap; | ||
| padding-top: 8px; | ||
| } | ||
|
|
||
| &__bike { | ||
| padding-top: 40px; | ||
|
|
||
| &-name { | ||
| font-family: Poppins, sans-serif; | ||
| font-weight: 700; | ||
| font-style: normal; | ||
| font-size: 24px; | ||
| line-height: 140%; | ||
| padding-top: 32px; | ||
| } | ||
|
|
||
| &-description { | ||
| font-family: Poppins, sans-serif; | ||
| font-weight: 300; | ||
| font-style: normal; | ||
| font-size: 16px; | ||
| line-height: 140%; | ||
| padding-top: 8px; | ||
| } | ||
|
|
||
| &-price { | ||
| font-family: Poppins, sans-serif; | ||
| font-weight: 700; | ||
| font-style: normal; | ||
| font-size: 24px; | ||
| line-height: 140%; | ||
| padding-top: 16px; | ||
| } | ||
| } | ||
| } |
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