From 2866776762c571035d62d0f79980ee637dfe202f Mon Sep 17 00:00:00 2001 From: jordanmccullough Date: Mon, 29 Dec 2014 15:23:17 -0700 Subject: [PATCH 01/16] Add draft of chapter overview sentences --- foundations/index.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/foundations/index.md b/foundations/index.md index a329f5cf3..627305d4b 100644 --- a/foundations/index.md +++ b/foundations/index.md @@ -10,6 +10,8 @@ redirect_from: ## Understanding version control +Explore an **introduction** to core concepts of the [Git](https://git-scm.com) technology and its vocabulary for every-day applications and scenarios. + --- --- @@ -80,6 +82,8 @@ The command line version of Git has a very light footprint. For most platforms, ## Surveying the GitHub platform +Discovery the flexibility of preserving version controlled work, the simplicity of workflows, and **collaborating** with others all in one ecosystem. + --- --- From dd3aefacd148597c224988511b1841543d8439cb Mon Sep 17 00:00:00 2001 From: jordanmccullough Date: Mon, 29 Dec 2014 15:23:42 -0700 Subject: [PATCH 02/16] Refine link, paragraph styles for in-slide content --- _stylesheets/curriculum.scss | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/_stylesheets/curriculum.scss b/_stylesheets/curriculum.scss index 382c670b2..4fc34cb4b 100644 --- a/_stylesheets/curriculum.scss +++ b/_stylesheets/curriculum.scss @@ -225,6 +225,7 @@ table{ .slide{ h2{ font-size: 52px; + margin-bottom: 30px; } h3,h4{ font-size: 42px; @@ -263,6 +264,18 @@ table{ width: 100%; display: table; + a[href^="http://"], + a[href^="https://"]{ + &:after{ + content: ""; + margin-left: 0; + } + } + + p{ + padding: 0 20px; + } + pre{ width: 80%; padding: 2em; From 7b99a9c1f142b9352aa83310c42b01f96c977dd6 Mon Sep 17 00:00:00 2001 From: jordanmccullough Date: Tue, 30 Dec 2014 09:18:24 -0700 Subject: [PATCH 03/16] Add section description for "hosted repos" --- foundations/index.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/foundations/index.md b/foundations/index.md index 627305d4b..8c3b1f979 100644 --- a/foundations/index.md +++ b/foundations/index.md @@ -209,6 +209,8 @@ Sign up for a free GitHub account at [github.com/join](https://github.com/join). ## Creating a hosted repository +Publishing your versioned documents and sharing **projects** on the [GitHub](https://github.com) platform. + --- {% capture lab %} From 3400d53e5424c64f68cd05b21e581f59a71a790d Mon Sep 17 00:00:00 2001 From: jordanmccullough Date: Tue, 30 Dec 2014 09:18:39 -0700 Subject: [PATCH 04/16] Update "GitHub platform" section description --- foundations/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/foundations/index.md b/foundations/index.md index 8c3b1f979..7ac7e9537 100644 --- a/foundations/index.md +++ b/foundations/index.md @@ -82,7 +82,7 @@ The command line version of Git has a very light footprint. For most platforms, ## Surveying the GitHub platform -Discovery the flexibility of preserving version controlled work, the simplicity of workflows, and **collaborating** with others all in one ecosystem. +Discovery the flexibility of preserving version controlled files and the simplicity of **collaboration** workflows all in one ecosystem. --- From ac3c287edcf7381673c68e22f1d21c0ace9874f4 Mon Sep 17 00:00:00 2001 From: jordanmccullough Date: Sat, 3 Jan 2015 21:22:21 -0700 Subject: [PATCH 05/16] Add "Versioning on GitHub" summary --- foundations/index.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/foundations/index.md b/foundations/index.md index 7ac7e9537..06a0b014f 100644 --- a/foundations/index.md +++ b/foundations/index.md @@ -236,6 +236,8 @@ And important decision when creating your repository is in its name. Giving it a ## Touring content versioning on GitHub +Become acquainted with the **GitHub Web Flow** and GitHub interface that provides robust Git version control actions through a web browser. + --- {% capture lab %} From 0833393529930e289d311208137edfcd0775f004 Mon Sep 17 00:00:00 2001 From: jordanmccullough Date: Sat, 3 Jan 2015 21:22:32 -0700 Subject: [PATCH 06/16] Add "Acquiring repos" summary --- foundations/index.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/foundations/index.md b/foundations/index.md index 06a0b014f..a9e992da4 100644 --- a/foundations/index.md +++ b/foundations/index.md @@ -265,6 +265,8 @@ The GitHub web interface allows you to interact and perform many file-affecting ## Acquiring repositories locally +Explore the process of downloading a hosted repository to a **local** machine, the support across tooling, and the options of protocols. + --- --- From e5cc1584c22d4bf0106b36c89c83a1e5ce045851 Mon Sep 17 00:00:00 2001 From: jordanmccullough Date: Sat, 3 Jan 2015 21:22:45 -0700 Subject: [PATCH 07/16] Add "GitHub Flow" summary --- foundations/index.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/foundations/index.md b/foundations/index.md index a9e992da4..c7e134a99 100644 --- a/foundations/index.md +++ b/foundations/index.md @@ -318,6 +318,8 @@ Just as with the Git technology operating on GitHub, local repositories also use ## Exploring the GitHub Flow +Discover the simplicity and flexibility in Git-based collaboration **workflows** with context-specific sets of changes and code review via pull requests + --- --- From 61f394814b76540dce418e511708c32a026a0424 Mon Sep 17 00:00:00 2001 From: jordanmccullough Date: Sat, 3 Jan 2015 21:22:54 -0700 Subject: [PATCH 08/16] Add "Syncing" summary --- foundations/index.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/foundations/index.md b/foundations/index.md index c7e134a99..c2f238182 100644 --- a/foundations/index.md +++ b/foundations/index.md @@ -382,6 +382,8 @@ A branch is a divergent path in the history of the code base. It may contain an ## Syncing local and GitHub repos +Publish and syncrhonize **local** commit history with with a GitHub hosted repository with the flexibility of graphical clients and command line. + --- --- From 3403d7aeb8e9950f1ed0ff325015f558650137a7 Mon Sep 17 00:00:00 2001 From: jordanmccullough Date: Sat, 3 Jan 2015 21:23:05 -0700 Subject: [PATCH 09/16] Add "Visualizing changes" summary --- foundations/index.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/foundations/index.md b/foundations/index.md index c2f238182..bb92c7e2f 100644 --- a/foundations/index.md +++ b/foundations/index.md @@ -419,6 +419,8 @@ git push origin [master|branch] ## Visualizing changes with GitHub +Identifying **changes** across document history is easily achieved through GitHub's interface and support for code, prose, graphics files, and more. + --- ### Details From f099c37fb88456349192ed644cafb7797219ce23 Mon Sep 17 00:00:00 2001 From: jordanmccullough Date: Sat, 3 Jan 2015 21:23:13 -0700 Subject: [PATCH 10/16] Add "GH Pages" summary --- foundations/index.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/foundations/index.md b/foundations/index.md index bb92c7e2f..7b1dcc190 100644 --- a/foundations/index.md +++ b/foundations/index.md @@ -457,6 +457,8 @@ Similarly, 3D file viewing, and then 3D file diffing are also part of the GitHub ## Using GitHub Pages +Craft, version, and publish GitHub-hosted web pages directly from a project repository. + --- From 59a87984f4ab5e2ff1df9e4794df0c52237e2e67 Mon Sep 17 00:00:00 2001 From: jordanmccullough Date: Sat, 3 Jan 2015 21:23:20 -0700 Subject: [PATCH 11/16] Add "Managing" summary --- foundations/index.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/foundations/index.md b/foundations/index.md index 7b1dcc190..a9ab62eb3 100644 --- a/foundations/index.md +++ b/foundations/index.md @@ -467,6 +467,8 @@ Craft, version, and publish GitHub-hosted web pages directly from a project repo ## Managing projects +Identify pending contributions, manage collaborator and permissions access, and curate flexible task lists of project objectives. + --- From abb17f71dbee39afe72f7f3774af2848bc0c64b4 Mon Sep 17 00:00:00 2001 From: jordanmccullough Date: Sat, 3 Jan 2015 21:23:27 -0700 Subject: [PATCH 12/16] Add "Markdown" summary --- foundations/index.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/foundations/index.md b/foundations/index.md index a9ab62eb3..074b71aff 100644 --- a/foundations/index.md +++ b/foundations/index.md @@ -477,6 +477,8 @@ Identify pending contributions, manage collaborator and permissions access, and ## Using GitHub Flavored Markdown +Unleash **communication** potential with GitHub's vast support of simple and effective plain-text document formatting known as Markdown. + --- ### Details From 630fe35d917b6115b4250c2dbee48c74f0ca8b87 Mon Sep 17 00:00:00 2001 From: jordanmccullough Date: Sat, 3 Jan 2015 21:33:57 -0700 Subject: [PATCH 13/16] Add class cover-slide summary --- foundations/index.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/foundations/index.md b/foundations/index.md index 074b71aff..2a68d39c1 100644 --- a/foundations/index.md +++ b/foundations/index.md @@ -6,6 +6,17 @@ redirect_from: - ../workbooks/github-foundations.html --- +--- + + + +# GitHub Foundations + +Core skills for day-to-day use of Git on the command line and GitHub workflows + +--- + + --- ## Understanding version control From 0e00b966fd8ec4943da93fa75b732d56006b5f22 Mon Sep 17 00:00:00 2001 From: jordanmccullough Date: Sat, 3 Jan 2015 22:17:10 -0700 Subject: [PATCH 14/16] Add "objectives" checklist style support for deck summary --- _stylesheets/curriculum.scss | 41 ++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/_stylesheets/curriculum.scss b/_stylesheets/curriculum.scss index 6a4173fef..611de9bdf 100644 --- a/_stylesheets/curriculum.scss +++ b/_stylesheets/curriculum.scss @@ -30,6 +30,8 @@ table{ } } + + // Custom columns for hide/show of TOC .col-content, .col-toc{ transition: padding 300ms, opacity 200ms; @@ -218,6 +220,45 @@ table{ color: $gray; } + .objectives{ + -webkit-column-count: 2; + -moz-column-count: 2; + column-count: 2; + width: 85%; + margin: 0 auto; + text-align: left; + } + + input[type="checkbox"]{ + display:none; + + &+label{ + width: 100%; + line-height: 40px; + + &:before{ + content: " "; + float: left; + font: normal normal 20px octicons; + text-align: center; + height: 20px; + width: 20px; + margin: 10px; + border-radius: 50%; + box-shadow: 0 0 0 2px $gray-lighter; + } + } + + &:checked + label{ + text-decoration: line-through; + + &:before{ + content: "\f03a"; + color: $brand-primary; + } + } + } + // Custom Octicon styling .mega-octicon{ font-size: 110px; From 37af114e6130f7c656b2fa0278a8422bed5d8064 Mon Sep 17 00:00:00 2001 From: jordanmccullough Date: Sat, 3 Jan 2015 22:17:20 -0700 Subject: [PATCH 15/16] Add Foundations class-level objectives checklist --- foundations/index.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/foundations/index.md b/foundations/index.md index 2a68d39c1..8b24d0e92 100644 --- a/foundations/index.md +++ b/foundations/index.md @@ -14,6 +14,16 @@ redirect_from: Core skills for day-to-day use of Git on the command line and GitHub workflows +
+ + + + + + + +
+ --- From 3f95ca884e925e1cefc3b191b4c3dc3deaf6b2c3 Mon Sep 17 00:00:00 2001 From: jordanmccullough Date: Wed, 7 Jan 2015 18:36:27 -0700 Subject: [PATCH 16/16] Refine chapter summaries --- foundations/index.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/foundations/index.md b/foundations/index.md index 8b24d0e92..9e5c83cbf 100644 --- a/foundations/index.md +++ b/foundations/index.md @@ -31,7 +31,7 @@ Core skills for day-to-day use of Git on the command line and GitHub workflows ## Understanding version control -Explore an **introduction** to core concepts of the [Git](https://git-scm.com) technology and its vocabulary for every-day applications and scenarios. +Explore an introduction to core concepts of the [Git](https://git-scm.com) technology and its vocabulary for every-day scenarios. --- @@ -103,7 +103,7 @@ The command line version of Git has a very light footprint. For most platforms, ## Surveying the GitHub platform -Discovery the flexibility of preserving version controlled files and the simplicity of **collaboration** workflows all in one ecosystem. +Discover the flexibility of preserving version controlled files and the simplicity of collaboration workflows all in one ecosystem. --- @@ -230,7 +230,7 @@ Sign up for a free GitHub account at [github.com/join](https://github.com/join). ## Creating a hosted repository -Publishing your versioned documents and sharing **projects** on the [GitHub](https://github.com) platform. +Publish your versioned documents and share projects on the [GitHub](https://github.com) platform. --- @@ -257,7 +257,7 @@ And important decision when creating your repository is in its name. Giving it a ## Touring content versioning on GitHub -Become acquainted with the **GitHub Web Flow** and GitHub interface that provides robust Git version control actions through a web browser. +Explore the GitHub Web Flow and GitHub interface that provides robust Git version control actions all through a web browser. --- @@ -286,7 +286,7 @@ The GitHub web interface allows you to interact and perform many file-affecting ## Acquiring repositories locally -Explore the process of downloading a hosted repository to a **local** machine, the support across tooling, and the options of protocols. +Explore the process of downloading a hosted repository to a local machine, the support across tooling, and the options of protocols. --- @@ -339,7 +339,7 @@ Just as with the Git technology operating on GitHub, local repositories also use ## Exploring the GitHub Flow -Discover the simplicity and flexibility in Git-based collaboration **workflows** with context-specific sets of changes and code review via pull requests +Discover the simplicity and flexibility in Git-based collaboration workflows with context-specific sets of changes and code review via pull requests --- @@ -403,7 +403,7 @@ A branch is a divergent path in the history of the code base. It may contain an ## Syncing local and GitHub repos -Publish and syncrhonize **local** commit history with with a GitHub hosted repository with the flexibility of graphical clients and command line. +Publish and syncrhonize local commit history with a GitHub hosted repository from graphical clients and command line. --- @@ -440,7 +440,7 @@ git push origin [master|branch] ## Visualizing changes with GitHub -Identifying **changes** across document history is easily achieved through GitHub's interface and support for code, prose, graphics files, and more. +Identify changes across document history through GitHub's interface and support for code, prose, graphics files, and more. ---