Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions css/.primer-stats.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
### css/primer.css

- **Total Stylesheets:** 1
- **Total Stylesheet Size:** 27568
- **Total Stylesheet Size:** 27574
- **Total Media Queries:** 1
- **Total Rules:** 360
- **Selectors Per Rule:** 1.4861111111111112
Expand All @@ -19,5 +19,5 @@
- **Total Id Selectors:** 0
- **Total Identifiers:** 1139
- **Total Declarations:** 904
- **Total Unique Colors:** 79
- **Total Unique Colors:** 80
- **Total Important Keywords:** 1
2 changes: 1 addition & 1 deletion css/primer.css

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions scss/_alerts.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,20 @@
position: relative;
font-size: 14px;
line-height: 1.6;
color: #246;
background-color: #e2eef9;
border: solid 1px #bac6d3;
color: desaturate(darken($alert-default, 23%), 2%);
background-color: saturate(lighten($alert-default, 43%), 38%);
border: solid 1px adjust_hue(desaturate(lighten($alert-default, 28%), 21%), 2%);

&.flash-warn {
color: #4c4a42;
background-color: #fff9ea;
border-color: #dfd8c2;
color: adjust_hue(desaturate(darken($alert-warn, 43%), 85%), 14%);
background-color: lighten($alert-warn, 26%);
border-color: desaturate(lighten($alert-warn, 14%), 78%);
}

&.flash-error {
color: #911;
background-color: #fcdede;
border-color: #d2b2b2;
color: $alert-error;
background-color: saturate(lighten($alert-error, 59%), 7%);
border-color: adjust_hue(desaturate(lighten($alert-error, 41%), 50%), 9%);
}

.flash-close {
Expand Down
18 changes: 9 additions & 9 deletions scss/_buttons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -128,32 +128,32 @@

// Red danger button
.btn-danger {
color: #900;
color: $brand-red;

&:hover {
color: #fff;
background-color: #b33630;
background-image: linear-gradient(#dc5f59, #b33630);
border-color: #cd504a;
background-color: $brand-red;
background-image: linear-gradient(lighten($brand-red, 2%), darken($brand-red, 2%));
border-color: darken($brand-red, 4%);
}

&:active,
&.selected {
color: #fff;
background-color: #b33630;
background-color: darken($brand-red, 4%);
background-image: none;
border-color: darken(#cd504a, 15%);
border-color: darken($brand-red, 6%);
}

&.selected:hover {
background-color: darken(#b33630, 5%);
background-color: darken($brand-red, 7%);
}

&:disabled,
&.disabled {
&,
&:hover {
color: #cb7f7f;
color: tint($brand-red, 40%);
background-color: #efefef;
background-image: linear-gradient(#fefefe, #efefef);
border-color: #e1e1e1;
Expand All @@ -164,7 +164,7 @@
&:active,
&.selected {
.counter {
color: #b33630;
color: $brand-red;
background-color: #fff;
}
}
Expand Down
10 changes: 10 additions & 0 deletions scss/_mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,13 @@
text-decoration: none;
-webkit-font-smoothing: antialiased;
}

// Add percentage of white to a color
@function tint($color, $percent) {
@return mix(#fff, $color, $percent);
}

// Add percentage of black to a color
@function shade($color, $percent) {
@return mix(#000, $color, $percent);
}
7 changes: 6 additions & 1 deletion scss/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ $body-font-size: 13px !default;
// Monospace font stack
$mono-font: Consolas, "Liberation Mono", Menlo, Courier, monospace !default;

// State indicators.
// State indicators
$status-open: $brand-green;
$status-closed: $brand-red;
$status-reverted: $status-closed;
Expand All @@ -32,3 +32,8 @@ $status-pending: #cea61b;
$repo-private-text: #a1882b;
$repo-private-bg: #fff9ea;
$repo-private-icon: #e9dba5;

// Alert colors
$alert-default: $brand-blue;
$alert-warn: #ffd062;
$alert-error: #911;