Skip to content

Commit e2783c4

Browse files
authored
Merge pull request #404 from github/upgrade-primer
Update Primer
2 parents 567d254 + c1ffa71 commit e2783c4

File tree

210 files changed

+1852
-5033
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

210 files changed

+1852
-5033
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ _site/
44
.jekyll-metadata
55
.sass-cache/
66
bin
7-
node_modules
7+
test/node_modules
88
/vendor
99
Gemfile.lock
1010
css/main.scss

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ node_js:
44
- 6
55
before_install:
66
- rvm install 2.3.3
7+
- npm install -g npm@5
78
install:
89
- npm install
910
- bundle install
@@ -17,6 +18,7 @@ cache:
1718
bundler: true
1819
directories:
1920
- node_modules
21+
- test/node_modules
2022
# Tell Travis to build gh-pages branch
2123
# https://docs.travis-ci.com/user/customizing-the-build#Safelisting-or-blocklisting-branches
2224
branches:

_config.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ sass:
4646
sass_dir: assets/css/
4747
load_paths:
4848
- node_modules
49-
- node_modules/**/*/node_modules
5049

5150
branch: gh-pages
5251

_includes/footer.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<footer class="bg-white border-top text-center pt-5">
2-
<div class="container-lg px-3 mx-auto">
2+
<div class="container-lg p-responsive mx-auto">
33

44
<div class="d-flex flex-wrap flex-items-stretch">
55
<div class="col-12 col-sm-6 mb-4 col-border">

_layouts/article-alt.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
---
44

55
<nav class="main-nav">
6-
<div class="container-lg edged mx-auto clearfix">
6+
<div class="container-lg mx-auto clearfix">
77
<div class="float-sm-right">
88
<ul class="main-links d-flex flex-wrap flex-items-stretch border-left border-bottom border-sm-0 list-style-none">
99
<li class="d-inline-block border-right">
@@ -23,7 +23,7 @@
2323
</nav>
2424

2525
<header class="bg-gray-light">
26-
<div class="container-lg mx-auto px-3">
26+
<div class="container-lg p-responsive mx-auto">
2727
<h1 class="alt-h1 lh-condensed text-center my-6 py-md-6">{{ page.title }}</h1>
2828
<p class="lead text-center text-gray col-md-8 mx-auto mb-4 position-relative">{{ page.description }}</p>
2929
</div>

_layouts/article.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
---
44

55
<nav class="main-nav">
6-
<div class="container-lg edged mx-auto clearfix">
6+
<div class="container-lg mx-auto clearfix">
77
<div class="float-sm-right">
88
<ul class="main-links d-flex flex-wrap flex-items-stretch border-left border-bottom border-sm-0 list-style-none">
99
<li class="d-inline-block border-right">
@@ -23,7 +23,7 @@
2323
</nav>
2424

2525
<header class="article-header {{ page.class }} bg-gray-light">
26-
<div class="container-lg mx-auto px-3">
26+
<div class="container-lg p-responsive clearfix mx-auto">
2727

2828
<h1 class="alt-h1 lh-condensed text-center mb-3">{{ page.title }}</h1>
2929
<p class="lead text-center text-gray col-md-8 mx-auto mb-4 position-relative">{{ page.description }}</p>

index.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
---
44

55
<nav class="main-nav">
6-
<div class="container-lg edged mx-auto clearfix">
6+
<div class="container-lg mx-auto clearfix">
77
<div class="float-sm-right">
88
<ul class="main-links d-flex flex-wrap flex-items-stretch border-left border-bottom border-sm-0 list-style-none">
99
<li class="d-inline-block border-right">
@@ -20,7 +20,7 @@
2020
<div class="bg-gray-light">
2121

2222
<header class="py-4 py-md-6">
23-
<div class="container-lg mx-auto text-center px-3 pt-6">
23+
<div class="container-lg p-responsive mx-auto text-center pt-6">
2424
<h1 class="alt-h1">Open Source Guides</h1>
2525
<p class="alt-lead text-gray mb-md-5 col-md-8 mx-auto">
2626
Open source software is made by people just like you. Learn how to launch and grow your project.
@@ -32,8 +32,8 @@ <h1 class="alt-h1">Open Source Guides</h1>
3232
</div>
3333
</header>
3434

35-
<div class="container-lg px-3 pb-6">
36-
<div class="gut-md d-flex flex-wrap flex-items-stretch pb-md-6">
35+
<div class="container-lg p-responsive pb-6">
36+
<div class="gutter-sm d-flex flex-wrap flex-items-stretch pb-md-6">
3737
{% assign articles = site.articles | sort: 'order' %}
3838
{% for article in articles %}
3939
<div class="col-12 col-sm-9 mx-auto col-md-6 mt-4 mt-lg-5">

node_modules/primer-alerts/CHANGELOG.md

Lines changed: 0 additions & 78 deletions
This file was deleted.

node_modules/primer-alerts/README.md

Lines changed: 0 additions & 151 deletions
This file was deleted.

node_modules/primer-alerts/build/build.css

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)