Compare commits
13 Commits
3c258c664e
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| a7ae981fd8 | |||
| b1c906bd03 | |||
| 788eb01fa2 | |||
| 0fe1439621 | |||
| 20c59f113d | |||
| e5ccd4cf97 | |||
| 0c4ab26c45 | |||
| 0d13bb2256 | |||
| 385669ac7c | |||
| fcb263d1dd | |||
| caecf366f9 | |||
| 53af3c7f42 | |||
| 4875b000ba |
74
README.md
74
README.md
@@ -15,18 +15,80 @@ cd GitCheatSheet
|
||||
```
|
||||
**Задание 3**. Заполните второй столбец таблицы html-файла. После заполнения каждой ячейки индексируйте измененные файлы и выполняйте коммит.
|
||||
```sh
|
||||
git add index.html README.md
|
||||
git commit -m "Added desc of git init command"
|
||||
[pavetr@pavetr-arch-laptop GitCheatSheet]$ git add index.html README.md; git commit -m "Added desc of git clone command"
|
||||
[main b270f43] Added desc of git clone command
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
[pavetr@pavetr-arch-laptop GitCheatSheet]$ git add index.html README.md; git commit -m "Added desc of git add command"
|
||||
[main 884e0b8] Added desc of git add command
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
[pavetr@pavetr-arch-laptop GitCheatSheet]$ git add index.html README.md; git commit -m "Added desc of git add . command"
|
||||
[main 112a687] Added desc of git add . command
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
[pavetr@pavetr-arch-laptop GitCheatSheet]$ git add index.html README.md; git commit -m "Added desc of git commit -m command"
|
||||
[main 1f4f040] Added desc of git commit -m command
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
[pavetr@pavetr-arch-laptop GitCheatSheet]$ git add index.html README.md; git commit -m "Added desc of git commit -a -m command"
|
||||
[main c686bf6] Added desc of git commit -a -m command
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
[pavetr@pavetr-arch-laptop GitCheatSheet]$ git add index.html README.md; git commit -m "Added desc of git push command"
|
||||
[main f4e95da] Added desc of git push command
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
[pavetr@pavetr-arch-laptop GitCheatSheet]$ git add index.html README.md; git commit -m "Added desc of git status command"
|
||||
[main c6e7d93] Added desc of git status command
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
[pavetr@pavetr-arch-laptop GitCheatSheet]$ git add index.html README.md; git commit -m "Added desc of git log command"
|
||||
[main 71c468a] Added desc of git log command
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
[pavetr@pavetr-arch-laptop GitCheatSheet]$ git add index.html README.md; git commit -m "Added desc of git branch command"
|
||||
[main af3772e] Added desc of git branch command
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
[pavetr@pavetr-arch-laptop GitCheatSheet]$ git add index.html README.md; git commit -m "Added desc of git checkout command"
|
||||
[main 64198db] Added desc of git checkout command
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
[pavetr@pavetr-arch-laptop GitCheatSheet]$ git add index.html README.md; git commit -m "Added desc of git checkout -b command"
|
||||
[main 9076419] Added desc of git checkout -b command
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
[pavetr@pavetr-arch-laptop GitCheatSheet]$ git add index.html README.md; git commit -m "Added desc of git remote command"
|
||||
[main 3c258c6] Added desc of git remote command
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
```
|
||||
**Задание 4**. Дополните файл style.css. Создайте и примените на странице не менее 5-ти стилей. Индексируйте измененные файлы и выполните коммит.
|
||||
```sh
|
||||
git <команда добавления>
|
||||
git <команда коммита>
|
||||
[pavetr@pavetr-arch-laptop GitCheatSheet]$ git add .; git commit -m "Changed page font to Erbaum Book"
|
||||
[main 4875b00] Changed page font to Erbaum Book
|
||||
3 files changed, 18 insertions(+), 12 deletions(-)
|
||||
create mode 100644 static/Erbaum-Book.ttf
|
||||
[pavetr@pavetr-arch-laptop GitCheatSheet]$ git add .; git commit -m "Changed css task command in readme"
|
||||
[main 53af3c7] Changed css task command in readme
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
[pavetr@pavetr-arch-laptop GitCheatSheet]$ git add .; git commit -m "Inverted webpage theme to dark"
|
||||
[main caecf36] Inverted webpage theme to dark
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
[pavetr@pavetr-arch-laptop GitCheatSheet]$ git add .; git commit -m "Changed links style"
|
||||
[main fcb263d] Changed links style
|
||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||
[pavetr@pavetr-arch-laptop GitCheatSheet]$ git add .; git commit -m "Added table borders"
|
||||
[main 385669a] Added table borders
|
||||
1 file changed, 9 insertions(+)
|
||||
[pavetr@pavetr-arch-laptop GitCheatSheet]$ git add .; git commit -m "Added themed components"
|
||||
[main 0d13bb2] Added themed components
|
||||
2 files changed, 8 insertions(+), 4 deletions(-)
|
||||
[pavetr@pavetr-arch-laptop GitCheatSheet]$ git add .; git commit -m "Styled footer bg and links"
|
||||
[main 0c4ab26] Styled footer bg and links
|
||||
1 file changed, 20 insertions(+), 7 deletions(-)
|
||||
[pavetr@pavetr-arch-laptop GitCheatSheet]$ git add .; git commit -m "Highlighted even table rows"
|
||||
[main e5ccd4c] Highlighted even table rows
|
||||
1 file changed, 3 insertions(+)
|
||||
[pavetr@pavetr-arch-laptop GitCheatSheet]$ git add .; git commit -m "Changed footer margins"
|
||||
[main 20c59f1] Changed footer margins
|
||||
1 file changed, 7 insertions(+), 3 deletions(-)
|
||||
```
|
||||

|
||||
|
||||
**Задание 5**. Создайте пустой (без файлов) публичный удаленный репозиторий в своем аккаунте на GitHub.
|
||||
|
||||
**Задание 6**. Отправьте изменения на удаленный репозиторий. Если будет необходимость, настройте подключения к удаленному репозиторию.
|
||||
```sh
|
||||
git <команда подключения к удаленному репозиторию, если это было необходимо>
|
||||
git <команда отправки изменений>
|
||||
git remote add origin https://git.pavetr.ru/pavetr/GitCheatSheet.git
|
||||
git push
|
||||
```
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
</head>
|
||||
<body>
|
||||
<div class="header exam">
|
||||
<h2>
|
||||
<h2 class="themed">
|
||||
Шпаргалка по Git
|
||||
</h2>
|
||||
</div>
|
||||
<div class="exam" id="table">
|
||||
<table>
|
||||
<caption>Команды Git</caption>
|
||||
<caption class="themed">Команды Git</caption>
|
||||
<tr>
|
||||
<th>Команда</th>
|
||||
<th>Описание</th>
|
||||
@@ -76,7 +76,7 @@
|
||||
</table>
|
||||
</div >
|
||||
<div class="exam">
|
||||
<h4>Тесты на знание команд Git</h4>
|
||||
<h4 class="themed">Тесты на знание команд Git</h4>
|
||||
<ol >
|
||||
<li><a href="https://progtask.ru/test-po-git/">Тест по Git</a></li>
|
||||
<li><a href="https://www.learnqa.ru/gittest">Тест на знание Git</a></li>
|
||||
@@ -85,7 +85,7 @@
|
||||
</div>
|
||||
<footer>
|
||||
<div class="exam">
|
||||
<lh>Полезные ссылки</lh>
|
||||
<lh class="themed">Полезные ссылки</lh>
|
||||
<ul>
|
||||
<li><a class="foo" href="https://labs-org.ru/html/">html</a></li>
|
||||
<li><a class="foo" href="https://labs-org.ru/css/">css</a></li>
|
||||
|
||||
BIN
static/Erbaum-Book.ttf
Normal file
BIN
static/Erbaum-Book.ttf
Normal file
Binary file not shown.
70
style.css
70
style.css
@@ -1,3 +1,21 @@
|
||||
@font-face {
|
||||
font-family: "Erbaum Book";
|
||||
src: url("static/Erbaum-Book.ttf");
|
||||
}
|
||||
|
||||
.themed {
|
||||
color: #71ff55;
|
||||
}
|
||||
|
||||
* {
|
||||
font-family: "Erbaum Book", "Courier New", Courier, monospace;
|
||||
color: white;
|
||||
}
|
||||
|
||||
body {
|
||||
background-color: black;
|
||||
}
|
||||
|
||||
.header {
|
||||
justify-content: center;
|
||||
text-align: center;
|
||||
@@ -5,24 +23,46 @@
|
||||
ol li {
|
||||
list-style-position: inside;
|
||||
}
|
||||
.exam {
|
||||
font-family: 'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Geneva, Verdana, sans-serif;
|
||||
}
|
||||
#table {
|
||||
line-height:200%
|
||||
line-height: 200%;
|
||||
}
|
||||
a:hover {
|
||||
color: #71ff55;
|
||||
}
|
||||
a {
|
||||
text-decoration: underline;
|
||||
color: white;
|
||||
transition: color 300ms;
|
||||
}
|
||||
|
||||
table {
|
||||
border: 1px white solid;
|
||||
border-collapse: collapse;
|
||||
}
|
||||
td {
|
||||
border: 1px white solid;
|
||||
padding: 0.5rem;
|
||||
}
|
||||
tr:nth-child(even) {
|
||||
background-color: rgba(100, 100, 100, 0.25);
|
||||
}
|
||||
footer {
|
||||
padding-top: 3px;
|
||||
padding-bottom: 3px;
|
||||
padding-left: 30px;
|
||||
background: #444;
|
||||
color: white;
|
||||
background: #9e9e9e;
|
||||
background: linear-gradient(
|
||||
0deg,
|
||||
rgba(100, 100, 100, 1) 0%,
|
||||
rgba(100, 100, 100, 0) 100%
|
||||
);
|
||||
position: absolute;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
width: 100svw;
|
||||
ul {
|
||||
list-style: none;
|
||||
padding-left: 0;
|
||||
}
|
||||
a.foo:hover {
|
||||
text-decoration-color: black;
|
||||
color: black;
|
||||
}
|
||||
a.foo {
|
||||
text-decoration-color: white;
|
||||
color: white;
|
||||
.exam {
|
||||
margin: 10px;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user