Skip to content

Commit 4f342b7

Browse files
committed
Merge remote-tracking branch 'origin/master' into caption-shortcode
2 parents c51dbe3 + c5fa192 commit 4f342b7

File tree

11 files changed

+691
-37
lines changed

11 files changed

+691
-37
lines changed

.changeset/README.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Changesets
2+
3+
Hello and welcome! This folder has been automatically generated by `@changesets/cli`, a build tool that works
4+
with multi-package repos, or single-package repos to help you version and publish your code. You can
5+
find the full documentation for it [in our repository](https://github.com/changesets/changesets)
6+
7+
We have a quick list of common questions to get you started engaging with this project in
8+
[our documentation](https://github.com/changesets/changesets/blob/master/docs/common-questions.md)

.changeset/config.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"$schema": "https://unpkg.com/@changesets/[email protected]/schema.json",
3+
"changelog": ["@changesets/changelog-github", {"repo": "primer/doctocat"}],
4+
"commit": false,
5+
"linked": [],
6+
"access": "public",
7+
"baseBranch": "master",
8+
"updateInternalDependencies": "patch",
9+
"ignore": ["docs"]
10+
}

.changeset/lovely-beds-talk.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@primer/gatsby-theme-doctocat': patch
3+
---
4+
5+
Make the navigation dropdown background color dark

.changeset/silent-schools-remember.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@primer/gatsby-theme-doctocat': patch
3+
---
4+
5+
Update the navigation dropdown icon from a `chrevon` to a `caret` to follow our [progressive disclosure guidelines](https://primer.style/design/ui-patterns/progressive-disclosure#progressive-disclosure-ui-patterns)

.github/workflows/ci.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: CI
2+
on: [push]
3+
jobs:
4+
ci:
5+
name: CI
6+
runs-on: ubuntu-latest
7+
steps:
8+
- name: Checkout repo
9+
uses: actions/checkout@master
10+
11+
- name: Set up Node.js 10.x
12+
uses: actions/setup-node@master
13+
with:
14+
node-version: 10
15+
16+
- name: Install dependencies
17+
run: yarn
18+
19+
- name: Test
20+
run: yarn workspace @primer/gatsby-theme-doctocat test

.github/workflows/main.yml

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

.github/workflows/release.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Release
2+
on:
3+
push:
4+
branches:
5+
- master
6+
jobs:
7+
release:
8+
name: Release
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: Checkout repo
12+
uses: actions/checkout@master
13+
with:
14+
# This makes Actions fetch all Git history so that Changesets can generate changelogs with the correct commits
15+
fetch-depth: 0
16+
17+
- name: Set up Node.js 12.x
18+
uses: actions/setup-node@master
19+
with:
20+
node-version: 12.x
21+
22+
- name: Install dependencies
23+
run: yarn
24+
25+
- name: Create release pull request or publish to npm
26+
id: changesets
27+
uses: changesets/action@master
28+
with:
29+
publish: yarn release
30+
env:
31+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
32+
NPM_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}

docs/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"private": true,
23
"name": "docs",
34
"version": "1.0.0",
45
"license": "MIT",

package.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
{
22
"private": true,
33
"scripts": {
4-
"start": "yarn workspace docs develop"
4+
"start": "yarn workspace docs develop",
5+
"release": "changeset publish"
56
},
67
"workspaces": [
78
"theme",
89
"docs"
9-
]
10+
],
11+
"dependencies": {
12+
"@changesets/changelog-github": "^0.2.7",
13+
"@changesets/cli": "^2.10.3"
14+
}
1015
}

theme/src/components/nav-dropdown.js

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
1-
import {Absolute, BorderBox, StyledOcticon, Text, themeGet} from '@primer/components'
2-
import {ChevronDownIcon} from '@primer/octicons-react'
1+
import {
2+
Absolute,
3+
BorderBox,
4+
StyledOcticon,
5+
Text,
6+
themeGet,
7+
} from '@primer/components'
8+
import {TriangleDownIcon} from '@primer/octicons-react'
39
import React from 'react'
410
import styled from 'styled-components'
511
import Details from './details'
@@ -11,15 +17,16 @@ function NavDropdown({title, children}) {
1117
<>
1218
<summary style={{cursor: 'pointer'}} onClick={toggle}>
1319
<Text>{title}</Text>
14-
<StyledOcticon icon={ChevronDownIcon} ml={1} />
20+
<StyledOcticon icon={TriangleDownIcon} ml={1} />
1521
</summary>
1622
<Absolute>
1723
<BorderBox
18-
bg="white"
24+
bg="gray.8"
1925
py={1}
2026
mt={2}
2127
boxShadow="medium"
22-
color="gray.8"
28+
borderColor="gray.7"
29+
color="white"
2330
>
2431
{children}
2532
</BorderBox>

0 commit comments

Comments
 (0)