Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
af02545
'ya'
Aconer991 Jun 11, 2023
0398896
'new'
Aconer991 Jun 11, 2023
d5ad4b3
initial
Aconer991 Jun 12, 2023
129ab1d
initial
Aconer991 Jun 12, 2023
395842e
.gitignore fixed
Aconer991 Jun 12, 2023
014b831
initial
Aconer991 Jun 21, 2023
3f68e85
'initial'
Aconer991 Jun 22, 2023
e7bafae
verse
Aconer991 Jun 23, 2023
d97608e
Create readme.txt
Aconer991 Jun 23, 2023
6897c20
remove2
Aconer991 Jun 23, 2023
c77d6b0
Update test.html
Aconer991 Jun 23, 2023
5f64e29
Merge branch 'master' of https://github.com/Aconer991/git-basics
Aconer991 Jun 23, 2023
9e82332
hjhjh
Aconer991 Jun 23, 2023
b3fd841
Update index.html
Aconer991 Jun 23, 2023
9f13497
merege
Aconer991 Jun 23, 2023
7a17ff2
new
Aconer991 Jun 23, 2023
502cbc6
grunt
Aconer991 Jun 23, 2023
f82d33f
Update index.html
Aconer991 Jun 23, 2023
8603812
'merge'
Aconer991 Jun 23, 2023
13fb92d
nert
Aconer991 Jun 25, 2023
a49d62a
header
Aconer991 Jul 3, 2023
765ef4c
header
Aconer991 Jul 3, 2023
05e152a
hru
Aconer991 Jul 3, 2023
0380618
header changed
Aconer991 Jul 4, 2023
b4ceec8
script removed
Aconer991 Jul 4, 2023
62fab9c
plus
Aconer991 Jul 4, 2023
a9e8951
newhtml
Aconer991 Jul 4, 2023
9ae3c72
Revert "plus"
Aconer991 Jul 4, 2023
35f4420
Revert "script removed"
Aconer991 Jul 4, 2023
41ea433
Revert "newhtml"
Aconer991 Jul 4, 2023
87fb1f5
2 commits back
Aconer991 Jul 4, 2023
83a85ef
html head
Aconer991 Jul 6, 2023
6bb8b01
Revert "Revert "newhtml""
Aconer991 Jul 6, 2023
2d23744
reveal mixed
Aconer991 Jul 6, 2023
4334ffe
Merge branch 'main' of https://github.com/Aconer991/git-basics
Aconer991 Jul 6, 2023
9265986
Merge branch 'main' of https://github.com/Aconer991/git-basics
Aconer991 Jul 6, 2023
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
5 changes: 5 additions & 0 deletions 1.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
logs/*.log
.DS_Store



Empty file added atack.html
Empty file.
1 change: 1 addition & 0 deletions errors.log
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ggggggg
23 changes: 14 additions & 9 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,22 +1,27 @@
<!DOCTYPE html>
<html>
<head>




<meta charset='utf-8'>
<meta http-equiv='X-UA-Compatible' content='IE=edge'>
<title>Смарт-Экспресс — сайт находится в разработке</title>

<meta name='viewport' content='width=device-width, initial-scale=1'>
<script src='js/jquery-3.6.0.min.js'></script>
<div>новые товары</div
<div>сломанные товары</div>
<div>сломанные товары</div>

<h1>Официальный сайт в разработке </h1>
</head>
<body>
<header>
<nav>
<a href="#services">Услуги</a>
<a href="#contacts">Контакты</a>


</nav>
<div>
<a href="tel:+79039999999">+7 903 999-99-99</a>
<button>Заказать звонок</button>
</div>

</header>
</body>
</html>
</html>
4 changes: 1 addition & 3 deletions js/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ $(function(){
$('.popup-container').css('display', 'none');
};

let clearForm = function(){
$('.popup-container > input[type="text"]').val('');
};


$('.close').on('click', function(){
clearForm();
Expand Down
8 changes: 8 additions & 0 deletions new.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<html>
<head>

<h1> Выравнивание</h1
</head>


</html>
23 changes: 23 additions & 0 deletions q
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
commit d5ad4b334a1cb72a29eecd218dfcee0204711862 (HEAD -> master)
Author: Alexandr <seperaconer@gmail.com>
Date: Mon Jun 12 07:06:46 2023 +0700

initial

commit 0398896de331c12d139bb5e45c2d1cd709fc3daf
Author: Alexandr <seperaconer@gmail.com>
Date: Mon Jun 12 06:23:18 2023 +0700

'new'

commit af025451b48b85282ac8a73e3e2c5a495296e76d
Author: Alexandr <seperaconer@gmail.com>
Date: Mon Jun 12 05:37:28 2023 +0700

'ya'

commit f64b1a258fd13ab31e25d94457d3ca1e4bf8d86c (origin/master, origin/HEAD)
Author: sortedmap <sortedmap@gmail.com>
Date: Thu Jul 22 10:27:35 2021 +0300

initial
1 change: 1 addition & 0 deletions readme.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
jopjknlkjlcvjl;nhbxcnl;vb
Empty file added sample.log
Empty file.
6 changes: 4 additions & 2 deletions test.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@
<meta http-equiv='X-UA-Compatible' content='IE=edge'>
<title>Page Title</title>
<meta name='viewport' content='width=device-width, initial-scale=1'>
<link rel='stylesheet' type='text/css' media='screen' href='main.css'>

<script src='main.js'></script>

<h1>Заголовок</h1>
</head>
<body>

</body>
</html>
</html>