valitydev/camp-git-shallow-dive
14
0
Fork 0
mirror of https://github.com/valitydev/camp-git-shallow-dive.git synced 2024-11-06 00:15:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #10 from DenisHedgehog/tasks/fourth

Browse Source 
col-4 and col-8 changed to col-6
This commit is contained in:
Andrew Mayorov 2018-07-24 15:42:40 +03:00 committed by GitHub
commit 7b65f7d5fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
presentation.md
View File

@ -405,11 +405,11 @@ Switched to a new branch 'fix/spelling'
## Состояния файлов
--
.col-4[
.col-6[
* Находящиеся в **стейджинге**, попадающие в грядущий коммит
]
.col-8[
.col-6[
<pre class="terminal">
Changes to be committed:
(use &quot;git reset HEAD &lt;file&gt;...&quot; to unstage)
@ -420,15 +420,17 @@ Changes to be committed:
--
.col-4[
.col-6[
* Изменённые в **рабочей копии** репозитория, но ещё не попавшие в **стейджинг**
]
.col-8[
.col-6[
<pre class="terminal">
Changes not staged for commit:
(use &quot;git add &lt;file&gt;...&quot; to update what will be committed)
(use &quot;git checkout -- &lt;file&gt;...&quot; to discard changes in working directory)
(use &quot;git add &lt;file&gt;...&quot; to update what
will be committed)
(use &quot;git checkout -- &lt;file&gt;...&quot; to
discard changes in working directory)
<span style="color:red;">modified: SCENARIOS.md</span>
</pre>
@ -436,14 +438,15 @@ Changes not staged for commit:
--
.col-4[
* Новые, ещё не включённые в **репозиторий**
.col-6[
* Новые, ещё не влючённые в **репозиторий**
]
.col-8[
.col-6[
<pre class="terminal">
Untracked files:
(use &quot;git add &lt;file&gt;...&quot; to include in what will be committed)
(use &quot;git add &lt;file&gt;...&quot; to include in
what will be committed)
<span style="color:red;">package-lock.json</span>
<span style="color:red;">withdrawal.svg</span>

2
template/style.scss
View File

@ -165,7 +165,7 @@ blockquote {
pre.terminal {
padding: 1em;
font-size: 16px;
font-size: 16px;
background-color: $dark;
color: $light;
}