Skip to content

Commit 8061416

Browse files
authored
Merge pull request #1072 from webpack/color-pallette-cleanup
Color palette cleanup
2 parents 6bcf693 + 0261d35 commit 8061416

File tree

2 files changed

+20
-14
lines changed

2 files changed

+20
-14
lines changed

content/branding.md

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,15 @@ contributors:
88

99
Here you can find **webpack** project brand guidelines, assets, and license. See our official [media repository](https://github.com/webpack/media) for more information and to find the [license](https://github.com/webpack/media/blob/master/LICENSE) that governs this work. Click any of the images to download them.
1010

11+
1112
## [Jump to All Original Media Files](https://github.com/webpack/media)
1213

14+
1315
## The webpack Name
1416

1517
webpack should **always** be written in lower-case letters, even at the beginning of a sentence.
1618

19+
1720
## Logo
1821

1922
The webpack logo should be placed on a white background with enough space around it like this:
@@ -34,6 +37,7 @@ For dark backgrounds, you can use the negative version of the logo:
3437

3538
T> Please use the **icon + text** whenever possible.
3639

40+
3741
## Icon only
3842

3943
**The icon is designed to be used in layout-constrained areas. As previously stated, please prefer icon + text.**
@@ -58,33 +62,36 @@ T> For those of you following our guidelines and have gotten this far, we've mad
5862

5963
<img src="/assets/icon-square-small-slack.png" width="50" alt="icon square small example">
6064

65+
6166
## Font
6267

6368
We use the beautiful [Geomanist Medium](http://geomanist.com/) font from the extremely talented folks at the [Atipo Foundry](http://atipofoundry.com/) who provide the entire font family at a 'pay what you want' model.
6469

70+
6571
## Color Palette
6672

6773
The following colors are used throughout the site in various combinations and on our fancy clothing line launched with the help of [Open Collective](http://opencollective.com) and [Threadless](https://medium.com/u/840563ee2a56) over at the [official webpack store](https://webpack.threadless.com/collections/the-final-release-collection/)!
6874

69-
| Color Name | HEX Code | RGB Code | Sample |
70-
|--- |--- |--- |---
71-
| Malibu: | HEX `#8dd6f9` | `rgb: 141, 214, 249` <td style="background-color: #8dd6f9; height: 25px; width: 250px; margin: 0; padding: 0;"></td>
72-
| Denim: | HEX `#1d78c1` | `rgb: 29, 120, 193` <td style="background-color: #1d78c1; height: 25px; width: 250px; margin: 0; padding: 0;"></td>
73-
| Fiord: | HEX `#465E69` | `rgb: 70, 94, 105` <td style="background-color: #465E69; height: 25px; width: 250px; margin: 0; padding: 0;"></td>
74-
| Outer Space: | HEX `#2B3A42` | `rgb: 43, 58, 66` <td style="background-color: #2B3A42; height: 25px; width: 250px; margin: 0; padding: 0;"></td>
75-
| Emperor: | HEX `#535353` | `rgb: 83, 83, 83` <td style="background-color: #535353; height: 25px; width: 250px; margin: 0; padding: 0;"></td>
76-
| Mine Shaft: | HEX `#333333` | `rgb: 51, 51, 51` <td style="background-color: #333333; height: 25px; width: 250px; margin: 0; padding: 0;"></td>
77-
| Alto: | HEX `#dedede` | `rgb: 222, 222, 222` <td style="background-color: #dedede; height: 25px; width: 250px; margin: 0; padding: 0;"></td>
78-
| Dusty Gray: | HEX `#999999` | `rgb: 153, 153, 153` <td style="background-color: #999999; height: 25px; width: 250px; margin: 0; padding: 0;"></td>
79-
| Dove Gray: | HEX `#666666` | `rgb: 102, 102, 102` <td style="background-color: #666666; height: 25px; width: 250px; margin: 0; padding: 0;"></td>
80-
| White: | HEX `#ffffff` | `rgb: 255, 255, 255` <td style="background-color: #ffffff; height: 25px; width: 250px; margin: 0; padding: 0;"></td>
81-
| Concrete: | HEX `#f2f2f2` | `rgb: 242, 242, 242` <td style="background-color: #f2f2f2; height: 25px; width: 250px; margin: 0; padding: 0;"></td>
75+
| Color Name | HEX Code | RGB Code | Sample
76+
|---------------|---------------|-----------------------|-------------------------------
77+
| Malibu: | HEX `#8dd6f9` | `rgb: 141, 214, 249` | <div style="background-color: #8dd6f9;">&nbsp;</div>
78+
| Denim: | HEX `#1d78c1` | `rgb: 29, 120, 193` | <div style="background-color: #1d78c1;">&nbsp;</div>
79+
| Fiord: | HEX `#465E69` | `rgb: 70, 94, 105` | <div style="background-color: #465E69;">&nbsp;</div>
80+
| Outer Space: | HEX `#2B3A42` | `rgb: 43, 58, 66` | <div style="background-color: #2B3A42;">&nbsp;</div>
81+
| White: | HEX `#ffffff` | `rgb: 255, 255, 255` | <div style="background-color: #ffffff;">&nbsp;</div>
82+
| Concrete: | HEX `#f2f2f2` | `rgb: 242, 242, 242` | <div style="background-color: #f2f2f2;">&nbsp;</div>
83+
| Alto: | HEX `#dedede` | `rgb: 222, 222, 222` | <div style="background-color: #dedede;">&nbsp;</div>
84+
| Dusty Gray: | HEX `#999999` | `rgb: 153, 153, 153` | <div style="background-color: #999999;">&nbsp;</div>
85+
| Dove Gray: | HEX `#666666` | `rgb: 102, 102, 102` | <div style="background-color: #666666;">&nbsp;</div>
86+
| Emperor: | HEX `#535353` | `rgb: 83, 83, 83` | <div style="background-color: #535353;">&nbsp;</div>
87+
| Mine Shaft: | HEX `#333333` | `rgb: 51, 51, 51` | <div style="background-color: #333333;">&nbsp;</div>
8288

8389
In addition, you can grab the following file types directly from these links:
8490

8591
[psd](https://raw.githubusercontent.com/webpack/media/master/design/webpack-palette.psd) | [png](https://raw.githubusercontent.com/webpack/media/master/design/webpack-palette.png)
8692
| [ai](https://raw.githubusercontent.com/webpack/media/master/design/webpack-palette.ai) | [svg](https://raw.githubusercontent.com/webpack/media/master/design/webpack-palette.svg)
8793

94+
8895
## License
8996

9097
The logo and the brand name are **not MIT licensed**. Please check [our LICENSE](https://github.com/webpack/media/blob/master/LICENSE) for usage guidelines.

styles/markdown.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,6 @@
191191
&-content {
192192
display: block;
193193
width: 60%;
194-
padding-left: 10px;
195194

196195
code {
197196
white-space: normal;

0 commit comments

Comments
 (0)