primer/css
1
1
Fork 0
mirror of https://github.com/primer/css.git synced 2024-12-28 08:31:58 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into v3

Browse Source
This commit is contained in:
Mark Otto 2015-12-08 13:04:23 -08:00
commit e803f0e8c1
10 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.hound.yml
View File

@ -5,8 +5,8 @@ scss:
ruby:
enabled: false
coffee_script:
coffeescript:
enabled: false
java_script:
javascript:
enabled: false

2
_config.yml
View File

@ -8,7 +8,7 @@ permalink: pretty
source: docs
baseurl: ""
version: 2.3.3
version: 2.3.5
sass:
sass_dir: ../

3
bower.json
View File

@ -14,7 +14,6 @@
"scss/primer.scss"
],
"dependencies": {
"octicons": "*",
"primer-markdown": "https://github.com/primer/markdown.git#2.1.7"
"octicons": "*"
}
}

24
css/.primer-stats.md
View File

@ -1,6 +1,6 @@
# [primer-css]( http://primercss.io )
**Version:** `2.3.3`
**Version:** `3.0.0`
> Primer is the CSS toolkit that powers GitHub's front-end design. It's purposefully limited to common components to provide our developers with the most flexibility, and to keep GitHub uniquely *GitHubby*. It's built with SCSS and available via Bower, so it's easy to include all or part of it within your own project.
@ -11,17 +11,17 @@
### css/primer.css
- **Total Stylesheets:** 1
- **Total Stylesheet Size:** 28089
- **Total Stylesheet Size:** 28331
- **Total Media Queries:** 1
- **Total Rules:** 368
- **Selectors Per Rule:** 1.4320652173913044
- **Total Selectors:** 527
- **Identifiers Per Selector:** 2.2618595825426944
- **Specificity Per Selector:** 17.449715370018975
- **Top Selector Specificity:** 50
- **Top Selector Specificity Selector:** .fullscreen-overlay-enabled.dark-theme .tooltipped .tooltipped-s:before
- **Total Rules:** 388
- **Selectors Per Rule:** 1.3994845360824741
- **Total Selectors:** 543
- **Identifiers Per Selector:** 2.128913443830571
- **Specificity Per Selector:** 16.27255985267035
- **Top Selector Specificity:** 42
- **Top Selector Specificity Selector:** dl.form.warn dd.warning:after
- **Total Id Selectors:** 0
- **Total Identifiers:** 1192
- **Total Declarations:** 924
- **Total Identifiers:** 1156
- **Total Declarations:** 951
- **Total Unique Colors:** 81
- **Total Important Keywords:** 1
- **Total Important Keywords:** 39

2
css/primer.css
View File

File diff suppressed because one or more lines are too long

8
docs/avatars.md
View File

@ -17,7 +17,7 @@ Add `.avatar` to any `<img>` element to make it an avatar. This resets some key
Be sure to set `width` and `height` attributes for maximum browser performance.
{% example html %}
<img class="avatar" src="https://avatars3.githubusercontent.com/u/9919?v=3&s=72" width="72" height="72">
<img class="avatar" src="https://avatars3.githubusercontent.com/u/9919?v=3&s=144" width="72" height="72">
{% endexample %}
## Small avatars
@ -25,7 +25,7 @@ Be sure to set `width` and `height` attributes for maximum browser performance.
We occasionally use smaller avatars. Anything less than `48px` wide should include the `.avatar-small` modifier class to reset the `border-radius` to a more appropriate level.
{% example html %}
<img class="avatar avatar-small" src="https://avatars3.githubusercontent.com/u/9919?v=3&s=32" width="32" height="32">
<img class="avatar avatar-small" src="https://avatars3.githubusercontent.com/u/9919?v=3&s=64" width="32" height="32">
{% endexample %}
## Parent-child avatars
@ -34,7 +34,7 @@ When you need a larger parent avatar, and a smaller child one, overlaid slightly
{% example html %}
<div class="avatar-parent-child left">
<img class="avatar" src="https://avatars3.githubusercontent.com/u/9919?v=3&s=48" width="48" height="48">
<img class="avatar avatar-child" src="https://avatars3.githubusercontent.com/u/9919?v=3&s=20" width="20" height="20">
<img class="avatar" src="https://avatars3.githubusercontent.com/u/9919?v=3&s=96" width="48" height="48">
<img class="avatar avatar-child" src="https://avatars3.githubusercontent.com/u/9919?v=3&s=40" width="20" height="20">
</div>
{% endexample %}

4
package.json
View File

@ -15,7 +15,7 @@
"grunt-build-control": "~0.2.0",
"grunt-jekyll": "~0.4.2",
"grunt-parker": "~0.1.0",
"grunt-sass": "~0.18.0",
"grunt-sass": "~1.0.0",
"grunt-contrib-watch": "~0.6.1",
"grunt-postcss": "~0.5.1"
},
@ -31,7 +31,7 @@
"grunt-jekyll": "^0.4.2",
"grunt-autoprefixer": "^2.2.0",
"grunt-contrib-watch": "^0.6.1",
"grunt-sass": "^0.18.1",
"grunt-sass": "^1.0.0",
"grunt-parker": "^0.1.3",
"grunt": "^0.4.5",
"grunt-build-control": "^0.2.2"

4
scss/_tooltips.scss
View File

@ -248,7 +248,3 @@ $tooltip-text-color: #fff;
border-left-color: $background-color;
}
}
.fullscreen-overlay-enabled.dark-theme .tooltipped {
@include colorizeTooltip(#000, rgba(255, 255, 255, 0.8));
}

3
scss/_type.scss
View File

@ -53,6 +53,9 @@ blockquote {
color: #333;
}
.text-small {
font-size: 12px;
}
// Lists
// --------------------------------------------------

2
scss/_variables.scss
View File

@ -12,7 +12,7 @@ $brand-orange: #c9510c !default;
$brand-purple: #6e5494 !default;
// Font stack
$body-font: Helvetica, arial, nimbussansl, liberationsans, freesans, clean, sans-serif, "Segoe UI Emoji", "Segoe UI Symbol" !default;
$body-font: Helvetica, arial, nimbussansl, liberationsans, freesans, clean, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol" !default;
// The base body size
$body-font-size: 13px !default;