mirror of
https://github.com/primer/css.git
synced 2024-12-24 14:42:26 +03:00
Merge branch 'master' into scss-lint-settings-upgrade
This commit is contained in:
commit
0a6256126d
13
README.md
13
README.md
@ -28,15 +28,8 @@ Download the [latest release](https://github.com/primer/primer/releases/latest)
|
||||
|
||||
### Bower
|
||||
|
||||
Install Primer with Bower by adding `primer-css` to your app's `bower.json` (in `github/github`, this is `vendor/assets/bower.json`). Replace `x.x.x` with the latest version number.
|
||||
|
||||
``` json
|
||||
{
|
||||
"name": "myapp",
|
||||
"dependencies": {
|
||||
"primer-css": "0.x.x"
|
||||
}
|
||||
}
|
||||
```
|
||||
$ bower install primer-css --save
|
||||
```
|
||||
|
||||
### Things to know
|
||||
@ -116,7 +109,7 @@ Within `bower.json`, update to a new release by changing the version number that
|
||||
{
|
||||
"name": "myapp",
|
||||
"dependencies": {
|
||||
"primer-css": "0.x.x"
|
||||
"primer-css": "x.x.x"
|
||||
}
|
||||
}
|
||||
```
|
||||
|
@ -208,7 +208,7 @@
|
||||
&.disabled {
|
||||
&,
|
||||
&:hover {
|
||||
color: #777;
|
||||
color: $brand-gray;
|
||||
background-color: #fff;
|
||||
background-image: none;
|
||||
border-color: #e5e5e5;
|
||||
|
@ -4,7 +4,7 @@
|
||||
font-size: 11px;
|
||||
font-weight: bold;
|
||||
line-height: 1;
|
||||
color: #777;
|
||||
color: $brand-gray;
|
||||
background-color: #eee;
|
||||
border-radius: 20px;
|
||||
}
|
||||
|
@ -11,7 +11,7 @@
|
||||
}
|
||||
|
||||
&.pjax-active .filter-item {
|
||||
color: #777;
|
||||
color: $brand-gray;
|
||||
background-color: transparent;
|
||||
|
||||
&.pjax-active {
|
||||
@ -28,7 +28,7 @@
|
||||
margin-bottom: 5px;
|
||||
overflow: hidden;
|
||||
font-size: 14px;
|
||||
color: #777;
|
||||
color: $brand-gray;
|
||||
text-decoration: none;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
@ -65,4 +65,3 @@
|
||||
background-color: #f1f1f1;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -42,7 +42,7 @@ textarea {
|
||||
}
|
||||
|
||||
// Inputs with contrast for easy light gray backgrounds against white.
|
||||
// input.class is needed here to increase specificity over input[...]
|
||||
// input.class is needed here to increase specificity over input[…]
|
||||
input.input-contrast,
|
||||
.input-contrast {
|
||||
background-color: #fafafa;
|
||||
@ -55,25 +55,6 @@ input.input-contrast,
|
||||
color: #aaa;
|
||||
}
|
||||
|
||||
::-webkit-validation-bubble-message {
|
||||
font-size: 12px;
|
||||
color: #fff;
|
||||
background: #9c2400;
|
||||
border: 0;
|
||||
border-radius: 3px;
|
||||
box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.1);
|
||||
}
|
||||
|
||||
input::-webkit-validation-bubble-icon {
|
||||
display: none;
|
||||
}
|
||||
|
||||
::-webkit-validation-bubble-arrow {
|
||||
background-color: #9c2400;
|
||||
border: solid 1px #9c2400;
|
||||
box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.1);
|
||||
}
|
||||
|
||||
// Mini inputs, to match .minibutton
|
||||
input.input-mini {
|
||||
min-height: 26px;
|
||||
@ -295,7 +276,7 @@ dl.form {
|
||||
min-height: 17px;
|
||||
margin: 4px 0 2px;
|
||||
font-size: 12px;
|
||||
color: #777;
|
||||
color: $brand-gray;
|
||||
|
||||
.spinner {
|
||||
margin-right: 3px;
|
||||
@ -354,7 +335,6 @@ dl.form {
|
||||
margin: 0 30px 0 0;
|
||||
|
||||
> dt {
|
||||
|
||||
label {
|
||||
display: inline-block;
|
||||
margin: 5px 0 0;
|
||||
|
@ -56,7 +56,7 @@
|
||||
//
|
||||
// Have a link you need to be gray to start, and blue on hover? Use this.
|
||||
.muted-link {
|
||||
color: #777;
|
||||
color: $brand-gray;
|
||||
|
||||
&:hover {
|
||||
color: $brand-blue;
|
||||
|
Loading…
Reference in New Issue
Block a user