-
Notifications
You must be signed in to change notification settings - Fork 1.1k
solution #710
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
Eksonurit
wants to merge
2
commits into
mate-academy:master
Choose a base branch
from
Eksonurit: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
solution #710
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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 |
|---|---|---|
| @@ -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
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,14 +6,162 @@ | |
| name="viewport" | ||
| content="width=device-width, initial-scale=1.0" | ||
| /> | ||
| <title>Title</title> | ||
| <title>Museum</title> | ||
| <link | ||
| rel="stylesheet" | ||
| href="src/styles/main.scss" | ||
| /> | ||
| <link | ||
| rel="icon" | ||
| type="image/x-icon" | ||
| href="src/icons/NA MU.svg" | ||
| /> | ||
| </head> | ||
| <body> | ||
| <h1>Hello Mate Academy</h1> | ||
| <script src="src/scripts/main.js"></script> | ||
| <main> | ||
| <header class="header"> | ||
| <a | ||
| class="burger-menu" | ||
| href="#aside-menu" | ||
| id="header-burger" | ||
| ></a> | ||
| <section class="header__content"> | ||
| <div class="header__content__inner mt-md-1"> | ||
| <img | ||
| src="src/icons/NA MU.svg" | ||
|
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. do not use spaces in file names |
||
| alt="Museum Logo" | ||
| class="header__logo" | ||
| /> | ||
| </div> | ||
|
|
||
| <aside | ||
| class="aside__menu text-white" | ||
| id="aside-menu" | ||
| > | ||
| <div class="menu"> | ||
| <nav class="text-white menu__nav"> | ||
| <a | ||
| class="burger-menu-close" | ||
| id="aside-burger" | ||
| href="#" | ||
| ></a> | ||
| <ul class="menu__list text-white list row g-0 flew-wrap gx-md-5"> | ||
| <li class="menu__item col-6 col-md-6 col-lg-6"> | ||
| <a | ||
| class="text-white" | ||
| href="#" | ||
| > | ||
| Галерея | ||
| </a> | ||
| </li> | ||
|
|
||
| <li class="menu__item col-6 col-md-6 col-lg-6"> | ||
| <a | ||
| class="text-white" | ||
| href="#" | ||
| > | ||
| Про Нас | ||
| </a> | ||
| </li> | ||
|
|
||
| <li class="menu__item col-6 col-md-6 col-lg-6"> | ||
| <a | ||
| class="text-white" | ||
| href="#" | ||
| > | ||
| Виставки та події | ||
| </a> | ||
| </li> | ||
|
|
||
| <li class="menu__item col-6 col-md-6 col-lg-6"> | ||
| <a | ||
| class="text-white" | ||
| href="#" | ||
| > | ||
| Контакти | ||
| </a> | ||
| </li> | ||
| </ul> | ||
| </nav> | ||
| <div class="divider"></div> | ||
| <div class="schedule"> | ||
| <span class="shedule-title">Графік роботи</span> | ||
| <ul class="schedule__list list"> | ||
| <li class="schedule__list__element"> | ||
| <span class="fw-semibold">12:00 - 20:00</span> | ||
| середа | ||
| </li> | ||
| <li class="schedule__list__element"> | ||
| <span class="fw-semibold">12:00 - 20:00</span> | ||
| четвер | ||
| </li> | ||
| <li class="schedule__list__element"> | ||
| <span class="fw-semibold">12:00 - 20:00</span> | ||
| п'ятниця | ||
| </li> | ||
| <li class="schedule__list__element"> | ||
| <span class="fw-semibold">11:00 - 19:00</span> | ||
| субота | ||
| </li> | ||
| <li class="schedule__list__element"> | ||
| <span class="fw-semibold">11:00 - 19:00</span> | ||
| неділя | ||
| </li> | ||
| </ul> | ||
| <div class="schedule-desc"> | ||
| <span class="fw-semibold">Вихідні:</span> | ||
| понеділок, вівторок | ||
| <br /> | ||
| Каса припиняє роботу за 1 годину до закриття музею | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </aside> | ||
| <div | ||
| class="menu-overlay" | ||
| id="menu-overlay" | ||
| ></div> | ||
| </section> | ||
| <div class="header__main title-wrapper row g-0 mt-xl-6"> | ||
| <h1 class="col-12 text-center text-md-start header__title">ХУДОЖНІЙ МУЗЕЙ</h1> | ||
| <div class="header__events d-none d-xl-block mt-xl-5"> | ||
| <span class="header__events-span">ПОДІЇ</span> | ||
| <div class="header__events-line"></div> | ||
| </div> | ||
| <button class="ticket__button position-relative col-12"> | ||
| <span class="ticket__button-text">КВИТКИ</span> | ||
| <div class="button-arrow for-ticket-block"> | ||
| <svg | ||
| width="24" | ||
| height="24" | ||
| viewBox="0 0 24 24" | ||
| fill="none" | ||
| xmlns="http://www.w3.org/2000/svg" | ||
| > | ||
| <g clip-path="url(#clip0_320_174)"> | ||
| <path | ||
| d="M8.59 16.59L13.17 12L8.59 7.41L10 6L16 12L10 18L8.59 16.59Z" | ||
| fill="#D7DDE3" | ||
| /> | ||
| </g> | ||
| <defs> | ||
| <clipPath id="clip0_320_174"> | ||
| <rect | ||
| width="24" | ||
| height="24" | ||
| fill="white" | ||
| /> | ||
| </clipPath> | ||
| </defs> | ||
| </svg> | ||
| </div> | ||
| </button> | ||
| </div> | ||
| </header> | ||
| </main> | ||
| <script | ||
| src="src/scripts/main.js" | ||
| type="module" | ||
| ></script> | ||
| </body> | ||
| </html> | ||
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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
BIN
+767 KB
src/images/Natsionalnij-hudozhnij-muzej-Ukrayini-Kiyiv-10-1800x1200.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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 +1,57 @@ | ||
| 'use strict'; | ||
| import '../styles/main.scss'; | ||
| import Swiper from 'swiper'; | ||
| import { Navigation, Pagination } from 'swiper/modules'; | ||
|
|
||
| import 'swiper/css'; | ||
| import 'swiper/css/navigation'; | ||
| import 'swiper/css/pagination'; | ||
|
|
||
| // eslint-disable-next-line no-new | ||
| new Swiper('.swiper', { | ||
| modules: [Navigation, Pagination], | ||
|
|
||
| slidesPerView: 1.1, | ||
| spaceBetween: 20, | ||
|
|
||
| navigation: { | ||
| nextEl: '.swiper-button-next', | ||
| prevEl: '.swiper-button-prev', | ||
| }, | ||
| pagination: { | ||
| el: '.swiper-pagination', | ||
| clickable: true, | ||
| }, | ||
| breakpoints: { | ||
| 768: { | ||
| slidesPerView: 2.1, | ||
| }, | ||
| 1200: { | ||
| slidesPerView: 3.5, | ||
| }, | ||
| }, | ||
| }); | ||
|
|
||
| const removeOverlay = () => { | ||
| menuOverlay.classList.remove('is-active'); | ||
| }; | ||
|
|
||
| const openMenuButton = document.getElementById('header-burger'); | ||
|
|
||
| const menuOverlay = document.getElementById('menu-overlay'); | ||
|
|
||
| openMenuButton.addEventListener('click', () => { | ||
| menuOverlay.classList.add('is-active'); | ||
| }); | ||
|
|
||
| const closeMenuButton = document.getElementById('aside-burger'); | ||
|
|
||
| closeMenuButton.addEventListener('click', removeOverlay); | ||
|
|
||
| const links = document.querySelectorAll('a'); | ||
|
|
||
| links.forEach((link) => { | ||
| link.addEventListener('click', removeOverlay); | ||
| }); | ||
|
|
||
| openMenuButton.removeEventListener('click', removeOverlay); |
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.
in general it's better to use one approach for styling, because here i can see tailwind and external style files at the same time. And it's can be hard to maintain this project