Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
bdebb61
добавляет наставника
MadinaSatem Jul 5, 2024
c8e5744
Добавляет ссылку наставника
MadinaSatem Jul 5, 2024
894acb4
Добавили изменения в индекс
MadinaSatem Jul 13, 2024
b684444
Добавили Привет мир!
MadinaSatem Jul 13, 2024
b65fa36
Merge pull request #2 from MadinaSatem/module1-task4
MadinaSatem Jul 13, 2024
abda41b
Попытка
MadinaSatem Jul 14, 2024
0e66a01
Merge pull request #3 from MadinaSatem/module1-task4
MadinaSatem Jul 14, 2024
48715be
Попытка вторая
MadinaSatem Jul 14, 2024
bd070d7
Merge pull request #4 from MadinaSatem/module1-task4
MadinaSatem Jul 14, 2024
fd7e56d
Create static.yml
MadinaSatem Jul 14, 2024
9ade5a0
Последняя попытка
MadinaSatem Jul 14, 2024
69d2746
Merge pull request #5 from MadinaSatem/module1-task4
MadinaSatem Jul 14, 2024
8caf17b
2.28. Разметка
MadinaSatem Jul 17, 2024
1c01f7f
Исправлены замечания Разметка
MadinaSatem Jul 18, 2024
7b17ef6
Третий модуль
MadinaSatem Jul 21, 2024
01a493b
Проверка сборкой пройдена
MadinaSatem Jul 25, 2024
84ff304
4.13. Создайте файловую структуру для стилизации
MadinaSatem Jul 25, 2024
8d91a0a
4.27. Создайте базовую стилизацию с помощью препроцессора
MadinaSatem Jul 29, 2024
8d52bc0
первые правки по спрайтам
MadinaSatem Aug 4, 2024
7204012
Векторная графика добавлена, предварительный просмотр
MadinaSatem Aug 9, 2024
48aa3c5
Слайдер полуготов
MadinaSatem Aug 13, 2024
f9ffec7
выполнено 70% задания
MadinaSatem Sep 5, 2024
6f3f252
Начата верстка каталога
MadinaSatem Sep 10, 2024
8b23161
Запущ=шила на предпроверку
MadinaSatem Sep 17, 2024
49b2d9b
отправлено на проверку наставнику
MadinaSatem Sep 23, 2024
9836903
ИСправлены все замечания. отправлено на проверку
MadinaSatem Sep 24, 2024
af23b71
7. Адаптивные декоративные элементы. Первая проверка.
MadinaSatem Nov 3, 2024
7112370
7. Адаптивные декоративные элементы
MadinaSatem Nov 20, 2024
b024f47
проблемы в javascript
MadinaSatem Dec 17, 2024
5918fee
Навигация скачет
MadinaSatem Dec 20, 2024
8b11710
Не совпадает Pixel Perfext
MadinaSatem Dec 22, 2024
9940a26
Вопросы к скрипту
MadinaSatem Dec 25, 2024
7d3e1d9
Очень много вопросов
MadinaSatem Jan 6, 2025
0aba0a1
9.15. Улучшение скорости загрузки
MadinaSatem Jan 7, 2025
1899cba
Опять проблемы в секции map
MadinaSatem Jan 8, 2025
c3b3885
Отправляет на первый допуск
MadinaSatem Jan 14, 2025
93d50cd
Пробует на допуск к наставнику
MadinaSatem Jan 14, 2025
cfe5cbe
Отправляет на третий допуск к наставнику
MadinaSatem Jan 18, 2025
1ffa9f9
Отправляет на допуск к наставнику четвертая попытка
MadinaSatem Jan 19, 2025
93525f8
Отправляет на 6й допуск
MadinaSatem Jan 20, 2025
d668a92
отправляет на финальную проверку наставнику
MadinaSatem Jan 20, 2025
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
43 changes: 43 additions & 0 deletions .github/workflows/static.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# Simple workflow for deploying static content to GitHub Pages
name: Deploy static content to Pages

on:
# Runs on pushes targeting the default branch
push:
branches: ["master"]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
permissions:
contents: read
pages: write
id-token: write

# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
concurrency:
group: "pages"
cancel-in-progress: false

jobs:
# Single deploy job since we're just deploying
deploy:
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Setup Pages
uses: actions/configure-pages@v5
- name: Upload artifact
uses: actions/upload-pages-artifact@v3
with:
# Upload entire repository
path: '.'
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v4
2 changes: 1 addition & 1 deletion Readme.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Личный проект «Кэт энерджи»

* Студент: [Мадина Арсамакова](https://up.htmlacademy.ru/adaptive-individual/2/user/2467455).
* Наставник: `Неизвестно`.
* Наставник: [Малик Киров](https://habr.com/ru/users/Boberdober/).

---

Expand Down
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

397 changes: 397 additions & 0 deletions source/catalog.html

Large diffs are not rendered by default.

Binary file added source/favicon.ico
Binary file not shown.
Binary file added source/favicons/android-chrome-192x192.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 added source/favicons/android-chrome-512x512.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 added source/favicons/apple-touch-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions source/favicons/browserconfig.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<browserconfig>
<msapplication>
<tile>
<square150x150logo src="/mstile-150x150.png"/>
<TileColor>#da532c</TileColor>
</tile>
</msapplication>
</browserconfig>
Binary file added source/favicons/favicon-16x16.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 added source/favicons/favicon-32x32.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 added source/favicons/mstile-150x150.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
27 changes: 27 additions & 0 deletions source/favicons/safari-pinned-tab.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes.
1 change: 1 addition & 0 deletions source/icons/arrow.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions source/icons/bottle.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions source/icons/clock.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions source/icons/closebutton.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions source/icons/gift.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions source/icons/greensquare.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions source/icons/iconeat.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions source/icons/leaf.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions source/icons/linemore.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions source/icons/logohtml.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions source/icons/logotext.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions source/icons/menubutton.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions source/icons/procat.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions source/icons/slider.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions source/icons/slider2.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions source/icons/slimcat.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions source/icons/subscribeline.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions source/icons/telegram.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions source/icons/vkontakte.svg
Loading
Loading