1
1
mirror of https://github.com/primer/css.git synced 2024-11-24 05:06:04 +03:00

Merge branch 'release-12.4.1' into update-docs

This commit is contained in:
Shawn Allen 2019-06-20 10:57:15 -07:00 committed by GitHub
commit c03d92cbf7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
42 changed files with 62 additions and 139 deletions

18
.github/main.workflow vendored
View File

@ -1,11 +1,6 @@
workflow "lint, test, deploy, publish" {
workflow "lint, test, publish" {
on = "push"
resolves = [
"lint",
"test",
"publish",
"deploy",
]
resolves = ["lint", "test", "publish"]
}
action "install" {
@ -31,12 +26,3 @@ action "publish" {
args = ["--", "--unsafe-perm"]
secrets = ["GITHUB_TOKEN", "NPM_AUTH_TOKEN"]
}
action "deploy" {
needs = "install"
uses = "primer/deploy@v3.0.0"
secrets = [
"GITHUB_TOKEN",
"NOW_TOKEN",
]
}

View File

@ -31,6 +31,7 @@ const exceptions = {
'/packages/primer-product': removed,
'/principles/HTML': moved('/principles/html'),
'/principles/SCSS': moved('/principles/scss'),
'/tools/sketch-templates': removed,
'/whats_new': redirect('https://github.com/primer/primer/releases'),
'/whats_new/changelog': removed,
'/whats_new/changelog/archived_changelog': removed,

View File

@ -1,30 +0,0 @@
import React from 'react'
import {Box} from '@primer/components'
export default function Outline({outline, ...rest}) {
if (outline && outline.length) {
return (
<Box as="details" mb={4}>
<summary>Table of contents</summary>
<OutlineList items={outline} {...rest} />
</Box>
)
}
return null
}
export function OutlineList({items, ...rest}) {
if (items && items.length) {
return (
<ul {...rest}>
{items.map(item => (
<li key={item.id}>
<a href={`#${item.id}`}>{item.title}</a>
<OutlineList items={item.children} />
</li>
))}
</ul>
)
}
return null
}

View File

@ -2,7 +2,6 @@ import React from 'react'
import {Link} from '@primer/components'
import {MarkdownHeading} from '@primer/blueprints'
import {CodeExample} from '@primer/blueprints/next-components'
import Outline from './Outline'
export const H1 = props => <MarkdownHeading {...props} />
export const H2 = props => <MarkdownHeading as="h2" {...props} />
@ -10,28 +9,18 @@ export const H3 = props => <MarkdownHeading as="h3" {...props} />
export const H4 = props => <MarkdownHeading as="h4" {...props} />
export const H5 = props => <MarkdownHeading as="h5" {...props} />
export default function getComponents(page = {}) {
const {outline: getOutline = () => []} = page
return {
h1: H1,
h2: H2,
h3: H3,
h4: H4,
h5: H5,
// render links with our component
a: Link,
// render code blocks with our wrapper around react-live
code: CodeExample,
// render the outline for <p> tags with exactly the text "{:toc}"
p: ({children, ...rest}) => {
if (children === '{:toc}') {
return <Outline outline={getOutline()} {...rest} />
} else {
return <p {...rest}>{children}</p>
}
},
// "unwrap" <pre> elements around <code> blocks
pre: props => props.children
}
const components = {
h1: H1,
h2: H2,
h3: H3,
h4: H4,
h5: H5,
// render links with our component
a: Link,
// render code blocks with our wrapper around react-live
code: CodeExample,
// "unwrap" <pre> elements around <code> blocks
pre: props => props.children
}
export default components

8
package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "@primer/css",
"version": "12.4.0",
"version": "12.4.1",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@ -1381,9 +1381,9 @@
}
},
"@primer/blueprints": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/@primer/blueprints/-/blueprints-4.0.1.tgz",
"integrity": "sha512-fGhRGcKobByuuJlIviSpR4mq2KpYZ6zMJO08x0Xw+XPEd+KPKHbap8NKbcc0qlzTmWcTo1qOaqN1AGNBjr8gzg==",
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/@primer/blueprints/-/blueprints-4.0.2.tgz",
"integrity": "sha512-MgX/SztcMVE2ko4l092fNV0I5YXyv3QWTYjFCF5KLTxh6PgvkGFPg8FqTlKYzLf1YPbgkoEEMtl7IUvi78Q7ZQ==",
"dev": true,
"requires": {
"@githubprimer/octicons-react": "^8.1.3",

View File

@ -1,6 +1,6 @@
{
"name": "@primer/css",
"version": "12.4.0",
"version": "12.4.1",
"description": "Primer is the CSS framework that powers GitHub's front-end design. primer includes 23 packages that are grouped into 3 core meta-packages for easy install. Each package and meta-package is independently versioned and distributed via npm, so it's easy to include all or part of Primer within your own project.",
"homepage": "https://primer.style/css",
"author": "GitHub, Inc.",
@ -46,7 +46,7 @@
"@githubprimer/octicons-react": "^8.1.3",
"@mdx-js/mdx": "^0.16.6",
"@mdx-js/tag": "0.15.0",
"@primer/blueprints": "4.0.1",
"@primer/blueprints": "4.0.2",
"@primer/components": "12.0.1",
"@primer/next-pages": "0.0.3",
"@storybook/addon-viewport": "5.0.11",

View File

@ -7,7 +7,7 @@ import {BaseStyles, Link, Text, BorderBox, Box, Flex, theme} from '@primer/compo
import {PackageHeader} from '../docs/components'
import {Header, MarkdownHeading, JumpNav, SideNav} from '@primer/blueprints'
import {NavList} from '@primer/blueprints/next-components'
import getComponents from '../docs/markdown'
import components from '../docs/markdown'
import documents from '../searchIndex'
import {config, requirePage, rootPage} from '../docs/utils'
import {CONTENT_MAX_WIDTH} from '../docs/constants'
@ -36,8 +36,6 @@ export default class MyApp extends App {
const node = rootPage.first(node => node.path === pathname) || {}
const {file, meta = {}} = node || {}
const isIndex = file.includes('index')
const components = getComponents(node)
const Hero = file ? requirePage(file).Hero : null
return (
@ -101,12 +99,12 @@ export default class MyApp extends App {
>
<SideNav>
<NavList currentPath={pathname} path="/css/getting-started" />
<NavList currentPath={pathname} path="/css/tools" />
<NavList currentPath={pathname} path="/css/principles" />
<NavList currentPath={pathname} path="/css/support" />
<NavList currentPath={pathname} path="/css/utilities" />
<NavList currentPath={pathname} path="/css/objects" />
<NavList currentPath={pathname} path="/css/components" />
<NavList currentPath={pathname} path="/css/tools" />
<NavList currentPath={pathname} path="/css/principles" />
</SideNav>
</BorderBox>
</Flex>

View File

@ -9,7 +9,7 @@ bundle: avatars
Avatars are images that users can set as their profile picture. On GitHub, they're always going to be rounded squares. They can be custom photos, uploaded by users, or generated as Identicons as a placeholder.
{:toc}
## Table of Contents
## Basic example
@ -154,4 +154,3 @@ For specific cases where two badges or more need to be shown as related or conne
</ul>
</div>
```

View File

@ -10,7 +10,7 @@ bundle: box
The `.Box` component can be used for something as simple as a rounded corner box, or more complex lists and forms. It includes optional modifiers for padding density and color themes.
{:toc}
## Table of Contents
## Box

View File

@ -9,7 +9,7 @@ bundle: buttons
Buttons are used for **actions**, like in forms, while textual hyperlinks are used for **destinations**, or moving from one page to another.
{:toc}
## Table of Contents
## Default button

View File

@ -8,7 +8,7 @@ symbols: [active, anim-scale-in, btn-link, dropdown, dropdown-caret, dropdown-di
Dropdowns are lightweight, JavaScript-powered context menus for housing navigation and actions. They're great for instances where you don't need the full power (and code) of the select menu.
{:toc}
## Table of Contents
## Basic examples

View File

@ -9,7 +9,7 @@ bundle: forms
Style individual form controls and utilize common layouts.
{:toc}
## Table of Contents
Overview:
- We reset several elements' default styles for cross browser consistency and easier manipulation later. This includes `<fieldset>`s, WebKit validation bubbles, and most textual `<input>`s.

View File

@ -11,7 +11,7 @@ bundle: labels
Labels add metatdata or indicate status of items and navigational elements. Three different types of labels are available: [Labels](#default-label-styles) for adding metadata, [States](#states) for indicating status, and [Counters](#counters) for showing the count for a number of items.
{:toc}
## Table of Contents
## Labels

View File

@ -9,7 +9,7 @@ bundle: navigation
Primer CSS comes with several navigation components. Some were designed with singular purposes, while others were design to be more flexible and appear quite frequently.
{:toc}
## Table of Contents
## Menu

View File

@ -9,7 +9,7 @@ symbols: [account-switcher, active, admin, avatar, dropdown-menu-content, experi
Give a page a clear, separated title and optional top nav by adding a `.pagehead`.
{:toc}
## Table of Contents
## Basic pagehead

View File

@ -9,7 +9,7 @@ bundle: pagination
Use the pagination component to apply button styles to a connected set of links that go to related pages (for example, previous, next, or page numbers).
{:toc}
## Table of Contents
## Previous/next pagination

View File

@ -9,7 +9,7 @@ bundle: popover
Popovers are used to bring attention to specific user interface elements, typically to suggest an action or to guide users through a new experience.
{:toc}
## Table of Contents
A popover consist of:

View File

@ -8,7 +8,7 @@ symbols: [active, close-button, css-truncate-target, description, description-in
The select menu provides advanced support for navigation, filtering, and more. Any popover within a select menu can make use of JavaScript-enabled live filtering, selected states, tabbed lists, and keyboard navigation with a bit of markup.
{:toc}
## Table of Contents
## Basic example

View File

@ -9,7 +9,7 @@ bundle: tooltips
Add tooltips built entirely in CSS to nearly any element.
{:toc}
## Table of Contents
## Implementation and accessibility
@ -81,7 +81,7 @@ Align tooltips to the left or right of an element, combined with a directional c
<span class="tooltipped tooltipped-sw tooltipped-align-right-1 m-2 p-2 border" aria-label="Tooltipped SE and aligned right.">
.tooltipped-sw .tooltipped-align-right-1
</span>
<span class="tooltipped tooltipped-se tooltipped-align-left-1 m-2 p-2 border" aria-label="Tooltipped SW and aigned left.">
<span class="tooltipped tooltipped-se tooltipped-align-left-1 m-2 p-2 border" aria-label="Tooltipped SW and aligned left.">
.tooltipped-se .tooltipped-align-left-1
</span>
</div>
@ -89,7 +89,7 @@ Align tooltips to the left or right of an element, combined with a directional c
<span class="tooltipped tooltipped-sw tooltipped-align-right-2 m-2 p-2 border" aria-label="Tooltipped SE and aligned right.">
.tooltipped-sw .tooltipped-align-right-2
</span>
<span class="tooltipped tooltipped-se tooltipped-align-left-2 m-2 p-2 border" aria-label="Tooltipped SW and aigned left.">
<span class="tooltipped tooltipped-se tooltipped-align-left-2 m-2 p-2 border" aria-label="Tooltipped SW and aligned left.">
.tooltipped-se .tooltipped-align-left-2
</span>
</div>

View File

@ -9,7 +9,7 @@ bundle: layout
The grid is 12 columns and percentage-based. The number of columns a container spans can be adjusted across breakpoints for responsive layouts. The grid system works with a variety of layout utilities to achieve different results.
{:toc}
## Table of Contents
## Float based grid

View File

@ -5,7 +5,7 @@ path: principles/accessibility
Accessibility is everyones responsibility, and the purpose of this document is to provide general accessibility guidelines to developers and designers.
{:toc}
## Table of Contents
## Overview

View File

@ -3,7 +3,7 @@ title: HTML
path: principles/html
---
{:toc}
## Table of Contents
## General formatting

View File

@ -5,7 +5,7 @@ path: principles/index
The CSS styleguide enables us to create a consistent user experience across GitHub, manage CSS bloat, and make our CSS easier to maintain. These principles should serve as guidelines for how we write and use CSS.
{:toc}
## Table of Contents
## Styleguide driven design and development

View File

@ -3,7 +3,7 @@ title: SCSS
path: priniciples/scss
---
{:toc}
## Table of Contents
## Spacing

View File

@ -6,7 +6,7 @@ source: 'https://github.com/primer/css/blob/master/src/support/variables/layout.
bundle: support
---
{:toc}
## Table of Contents
Our breakpoints are based on screen widths where our content starts to break. Since most of GitHub is currently a fixed-width with we use pixel widths to make it easy for us to match page widths for responsive and non-responsive pages. **Our breakpoints may change as we move more of the product into responsive layouts.**

View File

@ -13,7 +13,7 @@ package:
import {BorderBox, Box, Flex, Heading, Text} from '@primer/components'
import {ColorPalette, ColorVariables} from '../../../docs/color-system'
{:toc}
## Table of Contents
## Color palette

View File

@ -6,7 +6,7 @@ source: 'https://github.com/primer/css/blob/master/src/support/variables/layout.
bundle: support
---
{:toc}
## Table of Contents
## Spacing scale
The spacing scale is a **base-8** scale. We chose a base-8 scale because eight is a highly composable number (it can be divided and multiplied many times and result in whole numbers), yet allows spacing dense enough for GitHub's UI. The scale's exception is that it begins at 4px to allow smaller padding and margin for denser parts of the site, from there on it steps up consistently in equal values of `8px`.

View File

@ -7,7 +7,7 @@ source: 'https://github.com/primer/css/blob/master/src/support/variables/typogra
bundle: support
---
{:toc}
## Table of Contents
## Type Scale

View File

@ -11,7 +11,7 @@ We keep a list of suggested packages in our [atom-packages repository](https://g
apm install $(curl -L https://raw.githubusercontent.com/primer/atom-packages/master/packages)
```
{:toc}
## Table of Contents
## Autocomplete Primer

View File

@ -9,7 +9,7 @@ For teams working on `github/github` this configuration is all setup for you. Wh
For everyone else we encourage you to adopt all or some of these tools in your workflow.
{:toc}
## Table of Contents
## CSS

View File

@ -1,21 +0,0 @@
---
title: Sketch templates
internal: true
path: tools/sketch-templates
---
We often use Sketch for mocking up designs before coding them. To make this process faster and to keep our designs consistent, we have created UI kits that contain many of our commonly used styles.
## Product UI Kits
[The Product UI Kit](https://github.com/github/design/blob/master/resources/sketch/github-ui-kit.sketch) is a collection of our core GitHub UI styles and components suitable for building mockups. It also includes a starter page template with a site and repo header.
Don't waste time manually updating the Octicons artboard when icons are added, removed, or changed. See the [Octicons Sketch plugin](https://github.com/github/design/tree/master/resources/sketch/octicons-plugin) directory for a way to automate those updates.
![thumbnail of sketch UI kit](https://cloud.githubusercontent.com/assets/98681/9478261/7b4bd916-4b2b-11e5-991f-3bbef3f4c9a6.png)
## Email templates
[This email templates](https://github.com/github/design/blob/master/resources/sketch/email-templates.sketch) are a collection of current GitHub email templates which serve as a reference for new email designs.
![thumbnail of sketch email templates](https://cloud.githubusercontent.com/assets/1319791/22992477/cb5fcb5e-f38d-11e6-9549-449018f31153.png)

View File

@ -9,7 +9,7 @@ bundle: utilities
Animations are reusable animation classes that you can use to emphasize an element. All of these animations will animate if you toggle their visibility using the "Toggle" button.
{:toc}
## Table of Contents
## Fade In

View File

@ -9,7 +9,7 @@ bundle: utilities
Utilities for borders, border radius, and box shadows.
{:toc}
## Table of Contents
## Default border

View File

@ -9,7 +9,7 @@ bundle: utilities
Box shadows are used to make content appear elevated. They are typically applied to containers of content that users need to pay attention to or content that appears on top of (overlapping) other elements on the page (like a pop-over or modal).
{:toc}
## Table of Contents
## Default

View File

@ -8,7 +8,7 @@ bundle: utilities
Details classes are created to enhance the native behaviors of `<details>`.
{:toc}
## Table of Contents
## Fullscreen click area

View File

@ -9,7 +9,7 @@ bundle: utilities
Flex utilities can be used to apply `flexbox` behaviors to elements by using utility classes.
{:toc}
## Table of Contents
## Required reading

View File

@ -8,7 +8,7 @@ bundle: utilities
Change the document layout with display, float, alignment, and other utilities.
{:toc}
## Table of Contents
## Display
Adjust the display of an element with `.d-block`, `.d-none`, `.d-inline`, `.d-inline-block`, `.d-table`, `.d-table-cell` utilities.

View File

@ -8,7 +8,7 @@ bundle: utilities
Margin utilities are based on a global [spacing scale](/css/support/spacing) which helps keep horizontal and vertical spacing consistent. These utilities help us reduce the amount of custom CSS that share the same properties, and allows to achieve many different page layouts using the same styles.
{:toc}
## Table of Contents
## Naming convention

View File

@ -9,7 +9,7 @@ bundle: marketing-utilities
Marketing layout utilities build on top of [primer-core utilities](/css/utilities/layout#position), adding the option of responsive positioning.
{:toc}
## Table of Contents
## Position elements with spacing utilities

View File

@ -8,7 +8,7 @@ bundle: utilities
Padding utilities are based on a global [spacing scale](/css/support/spacing) which helps keep horizontal and vertical spacing consistent. These utilities help us reduce the amount of custom CSS that could share the same properties, and allows to achieve many different page layouts using the same styles.
{:toc}
## Table of Contents
## Shorthand

View File

@ -8,7 +8,7 @@ bundle: utilities
Type utilities are designed to work in combination with line-height utilities so as to result in more sensible numbers wherever possible. These also exist as [variables](/css/support/typography#typography-variables) that you can use in components or custom CSS.
{:toc}
## Table of Contents
Font sizes are smaller on mobile and scale up at the `md` [breakpoint](/css/support/breakpoints) to be larger on desktop.

View File

@ -60,6 +60,7 @@
.btn { @include btn-solid($text-gray-dark, $gray-000, darken($gray-100, 2%)); }
.btn-primary { @include btn-solid($text-white, $green-400, $green-500); }
@warn ".btn-purple will be removed in 13.0.0. Please don't make buttons purple.";
.btn-purple { @include btn-solid($text-white, lighten($purple-500, 5%), darken($purple-500, 5%)); }
.btn-blue { @include btn-solid($text-white, lighten($blue-500, 8%), darken($blue-500, 2%)); }
.btn-danger { @include btn-inverse($red-600, $gray-000, darken($gray-100, 2%)); }