Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
01f9070
make lang button wider
jlord May 28, 2018
573d000
version 4.3.0
jlord May 28, 2018
7eaaa5c
Add list of supported languages to readme
jlord Aug 13, 2018
67d5dee
Cambiando "and" por "y"
juananruiz Sep 12, 2018
c14960d
Duplicate es_CO to jumpstart es_ES
mirenbz Sep 18, 2018
8d9a218
Translate 1_get_git
mirenbz Sep 18, 2018
e16927f
Translate 2-repository
mirenbz Sep 18, 2018
8ff2317
Begin translating 3-commit-to-it
mirenbz Sep 18, 2018
a901cb6
Change Git Shell to Git CMD for Windows
Sep 19, 2018
86622df
Change hello-world to hola-mundo
Sep 19, 2018
37061d0
Translate 3-commit-to-it
Sep 19, 2018
95c4bae
Translate 4-githubbin
Sep 19, 2018
18f5098
Translate 5-remote-control
Sep 19, 2018
ef59515
Translate 6-forks-clones
Sep 19, 2018
88e8310
Translate 7-branches
Sep 19, 2018
ebc799c
Translate 8-small-world
Sep 19, 2018
b045b8c
Translate 9-pull
Sep 19, 2018
1b70c0d
Translate 10-requesting-pullrequest
Sep 19, 2018
606c2a4
Translate 11-merge
Sep 19, 2018
2a1ca1e
Translate buttons
Sep 19, 2018
867664e
Translate pages
Sep 19, 2018
a78316a
Add new locale to menus
Sep 19, 2018
9f5145c
Set es_ES for es alias
Sep 19, 2018
e1c59e3
Add es_ES to README
Sep 24, 2018
0638829
Merge pull request #231 from mberasategi/es_ES
jlord Sep 25, 2018
bdc4cbe
Fix typos in 4_githubbin.html
diegocasillas Oct 6, 2018
ac04891
Fix typos in 5_remote_control.html
diegocasillas Oct 6, 2018
780b85a
Fix typos in 6_forks_and_clones.html
diegocasillas Oct 6, 2018
996d499
Fix typos in 7_branches_arent_just_for_birds.html
diegocasillas Oct 6, 2018
163256b
Fix typos in 9_pull_never_out_of_date.html
diegocasillas Oct 6, 2018
3de27cb
Fix typos in 10_requesting_you_pull_please.html
diegocasillas Oct 6, 2018
0d353b9
Fix typos in 11_merge_tada.html
diegocasillas Oct 6, 2018
de2594f
Merge pull request #234 from diegocasillas/spanish-translation
jlord Oct 8, 2018
adec755
Asegurate → Asegúrate
jlord Oct 8, 2018
eac0502
Merge pull request #230 from juananruiz/patch-1
jlord Oct 8, 2018
9eba724
Update README.md
franciosi Nov 7, 2018
8c64b82
Merge pull request #242 from franciosi/patch-2
jlord Nov 7, 2018
fb309c4
Fixed slight typo
0x15F9 Feb 16, 2019
ae749bd
Merge pull request #252 from 0x15F9/master
Mar 11, 2019
7934d09
Adding a link to the GUI overview
jotoeri Mar 12, 2019
d808d9c
Merge pull request #257 from jotoeri/add-guilink
Mar 13, 2019
25a3ca9
Create SECURITY.md
jlord Jul 14, 2021
3524cb4
Testing things
jlord Jul 1, 2022
2fd692f
Rename funding.yml to .github/funding.yml
jlord Jul 1, 2022
a8b4742
Bump qs from 6.5.2 to 6.5.3
dependabot[bot] Dec 8, 2022
e7551c5
Merge pull request #369 from jlord/dependabot/npm_and_yarn/qs-6.5.3
jlord Jan 11, 2023
671eacc
Adaptations for the Manchester Codes pre-course
joestephens May 10, 2018
e337169
Updated README
joestephens May 11, 2018
b25bc0a
Rebranded to Command shift
StuartCowley May 19, 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
1 change: 1 addition & 0 deletions .github/funding.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
open_collective: git-it-electron
37 changes: 10 additions & 27 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,38 +1,23 @@
# Git-it (Desktop App)
# Git-it (Desktop App) - adapted for Command Shift

[![Build Status](https://travis-ci.org/jlord/git-it-electron.svg?branch=master)](https://travis-ci.org/jlord/git-it-electron) [![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/)

![screen shot 2016-04-17 at 10 37 55 pm](https://cloud.githubusercontent.com/assets/1305617/14594613/23873f64-04ed-11e6-9d3b-72f424dd0842.png)
Git-it is a desktop (Mac, Windows and Linux) app that teaches you how to use Git and GitHub on the [command line](https://en.wikipedia.org/wiki/Command-line_interface).

Previously it ran _in_ terminal (the command line application) with a guide online but now the guide _is_ the app and it runs on your desktop on its own :sparkles: **This will be the only maintained version going forward** :arrow_right:
![Git-It](screenshot.png)
Git-it is a desktop (Mac, Windows and Linux) app that teaches you how to use Git and GitHub on the [command line](https://en.wikipedia.org/wiki/Command-line_interface). Please work through all of the steps, ensuring you verify your solutions along the way.

---

## Hello future Forkers, Branchers and Pull Requesters!

This application contains challenges for learning Git and GitHub—by using _real_ Git and GitHub, not emulators. You'll be learning the awesome (and not so scary) command line and GitHub which means when you finish all of the challenges you'll have _real_ repositories on your GitHub account and green squares on your [contribution chart](https://github.com/blog/1360-introducing-contributions).

![contributions](https://raw.githubusercontent.com/jlord/git-it/master/ghcc.png)

## What to Install

You will need this app, Git-it as well as a text editor. You'll also of course need Git and the first challenge in Git-it helps you get that set up. But if you want to get a head start, go for it! You'll continue to use Git and your text editor throughout your bright social coding future.

As a part of the challenges you'll also create a (free) account on GitHub. If you've already got one, high-five!
## Applications

#### Git
You will need to use and install this app Git-it, as well as Visual Studio Code to edit the files. You'll also of course need Git (you should have Visual Studio Code and Git installed already).

We recommend installing [GitHub Desktop](http://desktop.github.com) (free) because it installs Git in the most consistent way across supported operating systems (Windows and Mac). We won't use the app itself in the challenges (but it is really useful once you get going in Git!), just the Git that it install for you.
### Git-it

Note—If you're using Windows, you should use the **Git Shell** app as your terminal—it is installed with GitHub Desktop. In Mac and Linux you can use the app **Terminal**, which is already on your computer.

#### Text Editor

I'm quite partial (I'm on the team!) but [Atom](http://atom.io) is a great text editor (also free) and it is built on [Electron.js](http://electron.atom.io), just like Git-it. Visit the website and download the version for your operating system. [Sublime](https://www.sublimetext.com), [Microsoft VS Code](https://code.visualstudio.com) and [Adobe Brackets](http://brackets.io) are other options.

#### Git-it

You can view the [releases](http://github.com/jlord/git-it-electron/releases) section of this repository to find the download for your operating system. Click to download your version. Once it has downloaded to your default Downloads directory, unzip the folder and run the Git-it executable. The executables for Mac, Windows and Linux:
You can view the [releases](https://github.com/MCRcodes/git-it-electron/releases) section of this repository to find the download for your operating system. Click to download your version. Once it has downloaded to your default Downloads directory, unzip the folder and run the Git-it executable. The executables for Mac, Windows and Linux:

![executables](https://cloud.githubusercontent.com/assets/1305617/14696588/2b10abf8-0731-11e6-945e-f3d57114bce9.png)

Expand All @@ -42,13 +27,11 @@ You can view the [releases](http://github.com/jlord/git-it-electron/releases) se

## Get Started!

Open Git-it and click the button to begin the first challenge. Have your terminal and text editor open, too. Follow along with the instructions in each challenge and use the terminal or editor as instructed.
Open Git-it and click the button to begin the first challenge. Have your terminal and Visual Studio Code open too. Follow along with the instructions in each challenge and use the terminal or editor as instructed.

When you've completed the steps in a challenge click 'Verify'. Depending on the challenge you may need to also select the folder you did your work in for Git-it to verify.

**Questions?** [Open an issue](http://github.com/jlord/git-it-electron/issues/new) on this repository.

**Want to contribute or build locally?** See the [contributing documentation](CONTRIBUTING.md)
**Questions?** Post them in your cohort slack channel!

---

Expand Down
5 changes: 5 additions & 0 deletions SECURITY.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Security Policy

## Reporting a Vulnerability

Please email jlord@github.com with reports. I am not a very active maintainer these days but I will try to do what I can <3
43 changes: 22 additions & 21 deletions assets/css/buttons.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

button {
display: inline-block;
background-color: rgba(203, 203, 203, 0.38);
background-color: #322b32;
color: #FFFFFF;
padding: 6px 12px;
margin-bottom: 0;
Expand All @@ -20,11 +20,11 @@ button:focus {
}

button:hover {
background-color: #badfff;
background-color: #201b20;
}

button:disabled {
background-color: rgba(24,105,177,1);
background-color: #695a69;
}

button .octicon {
Expand All @@ -39,30 +39,30 @@ button .octicon {

.btn-primary {
margin: 9px 0;
background: #0087ff;
background: #774872;
color: #fff;
border-radius: 2px;
text-transform: inherit;
}

.btn-secondary {
background: #8cf;
background: #a0639a;
color: #fff;
border-radius: 2px;
}

.btn-white {
background: #fff;
color: #0087ff;
color: #774872;
border-radius: 2px;
}

.btn-outline {
border: 1px solid #8cf;
border: 1px solid #774872;
background: none;
padding: 4px 13px;
border-radius: 3px;
color: #0087ff;
color: #774872;
display: inline-block;
}

Expand All @@ -75,7 +75,7 @@ button .octicon {
}

.btn-primary:hover {
background: #057ce7;
background: #8c5586;
}

.btn-large {
Expand All @@ -89,47 +89,48 @@ button .octicon {
}

.border-group-left {
border: 1px solid #0087ff;
border: 1px solid #774872;
border-radius: 2px 0 0 2px;
padding: 10px 14px;
}

.border-group-middle {
border-top: 1px solid #0087ff;
border-bottom: 1px solid #0087ff;
border-top: 1px solid #774872;
border-bottom: 1px solid #774872;
padding: 10px 14px;
margin-left: -4px;
}

.border-group-right {
border: 1px solid #0087ff;
border: 1px solid #774872;
border-radius: 0 2px 2px 0;
padding: 10px 14px;
}

.border-group-right.btn {
border: 1px solid #88CCFF;
color: #88CCFF;
border-left-color: #0087FF;
border: 1px solid #8c5586;
color: #8c5586;
border-left-color: #774872;
}

.border-group-right.btn:hover {
border: 1px solid #0087ff;
color: #0087ff;
border: 1px solid #774872;
color: #774872;
cursor: pointer;
}

.border-group-container {
color: #0087ff;
color: #774872;
padding: 20px 0;
user-select: none;
}

/* TODO there are two of these */
.lang-select {
padding: 4px 13px;
position: absolute;
height: 36px;
width: 100px;
width: 150px;
margin: 5px 8px;
top: 0;
left: 0;
Expand All @@ -143,7 +144,7 @@ button .octicon {
/*border-top-color: #8cf;*/
border-top-color: #A6A6A6;
position: relative;
left: 40px;
left: 66px;
top: 5px;
pointer-events: none;
display: inline-block;
Expand Down
50 changes: 15 additions & 35 deletions assets/css/new-challenge.css
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,19 @@
}

.blue-border.border-box {
border-color: #BADFFF;
border-color: #a0639a;
}

.blue-border.border-box::before {
color: #0087ff;
color: #774872;
}

.grey-border.border-box {
border-color: #999;
}

.grey-border.border-box::before {
color: rgba(51, 57, 53, 0.83);
color: #322b32;
}


Expand All @@ -53,8 +53,8 @@
}

.blue-border.border-box code {
background: rgba(136, 204, 255, 0.15);
color: #4F6375;
background: #efefef;
color: #333;
}

.blue-border.border-box code.comment {
Expand All @@ -63,7 +63,7 @@
}

gre7-border.border-box code {
background: rgba(157, 166, 179, 0.16);
background: #efefef;
}

/* RESET MARGINS AND PADDINGS IN BOXES
Expand All @@ -88,44 +88,24 @@ gre7-border.border-box code {

/* This option gives solid boxes an octicon tab */

/*.solid-box::before {
margin: -40px -8px 0;
float: left;
border-radius: 2px;
font-family: 'Octicons';
font-weight: 200;
font-size: 32px;
padding: 4px 8px 0px;
}*/

/*.chal-goal.bright-blue.solid-box::before {
content: "\f07b";
background: rgba(136,204,255,1);
}

.chal-background.light-blue.solid-box::before {
content: "\f007";
background: #E6F6FF;
}*/

.solid-box {
border-radius: 2px;
padding: 24px;
margin-bottom: 34px;
}

.light-blue.solid-box {
color: #4F6375;
background: rgba(136, 204, 255, 0.18);
color: #333;
background: #efefef;
}

.bright-blue.solid-box {
color: #fff;
background: rgba(136,204,255,1);
background: #efefef;
}

.bold-blue.solid-box {
background-color: #0087ff;
background-color: #774872;
color: #fff;;
}

Expand Down Expand Up @@ -217,7 +197,7 @@ gre7-border.border-box code {

code {
font-size: 0.8em;
background: rgba(157, 166, 179, 0.16);
background: #efefef;
padding: 6px 6px 3px 6px;
border-radius: 2px;
font-family: 'Liberation Mono', Monaco, Courier New, monospace;
Expand All @@ -231,7 +211,7 @@ code.shell:before {

.blue-border-box code {
border: none;
background: rgba(136, 204, 255, 0.15);
background: #efefef;
}

.prenext {
Expand All @@ -248,14 +228,14 @@ code.shell:before {
-------------------------------------------------------------------------- */

.blue-border-box {
border: 1px solid #BADFFF;
border: 1px solid #efefef;
padding: 18px;
margin: 18px 0 36px;
border-radius: 2px;
}

.blue-border-box code {
border: none;
color: #4F6375;
background: rgba(136, 204, 255, 0.15);
color: #333;
background: #efefef;
}
Loading