Skip to content

Commit

Permalink
Merge pull request #10 from jwplayer/wip.DES-791.new-assets
Browse files Browse the repository at this point in the history
New Assets for Icons and Fonts
  • Loading branch information
monibons authored Jan 3, 2019
2 parents 0170deb + 76479d7 commit a098b25
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 4 deletions.
Binary file removed .DS_Store
Binary file not shown.
1 change: 1 addition & 0 deletions icons/dashboard/more.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions icons/dashboard/publish.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion icons/sprites/icons-dashboard.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 7 additions & 1 deletion styles/fonts.less
Original file line number Diff line number Diff line change
@@ -1,15 +1,21 @@
@import (css) url('https://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700');
@import (css) url('https://fonts.googleapis.com/css?family=Lato:400,700,900');

/* Typefaces */
@ds-font-custom: 'Open Sans', sans-serif;
@ds-font-system: Arial, sans-serif;
@ds-font-code: Monaco, 'Lucida Sans Typewriter', Consolas, 'Lucida Console', 'Courier New', monospace;
@ds-font-data: 'Lato', sans-serif;

/* Sizes */
@ds-font-size-base: 15px;

/* Weights */
/* Weights - Custom */
@ds-font-custom-light: 300;
@ds-font-custom-regular: 400;
@ds-font-custom-semibold: 600;
@ds-font-custom-bold: 700;
/* Weights - Data */
@ds-font-data-regular: 400;
@ds-font-data-bold: 700;
@ds-font-data-black: 900;
4 changes: 3 additions & 1 deletion styles/hook.css
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,11 @@
/* Color Scale - B */
/* Color Scale - C */
@import url('https://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700');
@import url('https://fonts.googleapis.com/css?family=Lato:400,700,900');
/* Typefaces */
/* Sizes */
/* Weights */
/* Weights - Custom */
/* Weights - Data */
.ds-icon {
width: 16px;
height: 16px;
Expand Down
2 changes: 1 addition & 1 deletion styles/hook.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit a098b25

Please sign in to comment.