Skip to content

Commit

Permalink
Merge branch 'master' of github.com:alexpdraper/reading-list
Browse files Browse the repository at this point in the history
  • Loading branch information
alexpdraper committed Aug 6, 2017
2 parents 3bfc013 + e32fe32 commit 799c254
Show file tree
Hide file tree
Showing 6 changed files with 119 additions and 3 deletions.
Binary file added fonts/FiraSans-Regular.ttf
Binary file not shown.
Binary file added fonts/FiraSans-SemiBold.ttf
Binary file not shown.
2 changes: 1 addition & 1 deletion js/readinglist.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ function createReadingItemEl(info) {
}

var delBtn = document.createElement('a');
delBtn.innerHTML = '×';
delBtn.textContent = '×';
delBtn.id = url;
delBtn.className = 'button delete-button';
item.appendChild(link);
Expand Down
6 changes: 5 additions & 1 deletion manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@
"128": "icons/icon128.png"
},
"browser_action": {
"default_popup": "html/popup.html"
"default_popup": "html/popup.html",
"default_icon": {
"16": "icons/icon16.png",
"32": "icons/icon32.png"
}
},
"background": {
"scripts": [
Expand Down
112 changes: 112 additions & 0 deletions style/font.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
/* cyrillic-ext */
@font-face {
font-family: 'Fira Sans';
font-style: normal;
font-weight: 400;
src: local('Fira Sans Regular'), local('FiraSans-Regular'), url(../fonts/FiraSans-Regular.ttf);
unicode-range: U+0460-052F, U+20B4, U+2DE0-2DFF, U+A640-A69F;
}
/* cyrillic */
@font-face {
font-family: 'Fira Sans';
font-style: normal;
font-weight: 400;
src: local('Fira Sans Regular'), local('FiraSans-Regular'), url(../fonts/FiraSans-Regular.ttf);
unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
}
/* greek-ext */
@font-face {
font-family: 'Fira Sans';
font-style: normal;
font-weight: 400;
src: local('Fira Sans Regular'), local('FiraSans-Regular'), url(../fonts/FiraSans-Regular.ttf);
unicode-range: U+1F00-1FFF;
}
/* greek */
@font-face {
font-family: 'Fira Sans';
font-style: normal;
font-weight: 400;
src: local('Fira Sans Regular'), local('FiraSans-Regular'), url(../fonts/FiraSans-Regular.ttf);
unicode-range: U+0370-03FF;
}
/* vietnamese */
@font-face {
font-family: 'Fira Sans';
font-style: normal;
font-weight: 400;
src: local('Fira Sans Regular'), local('FiraSans-Regular'), url(../fonts/FiraSans-Regular.ttf);
unicode-range: U+0102-0103, U+1EA0-1EF9, U+20AB;
}
/* latin-ext */
@font-face {
font-family: 'Fira Sans';
font-style: normal;
font-weight: 400;
src: local('Fira Sans Regular'), local('FiraSans-Regular'), url(../fonts/FiraSans-Regular.ttf);
unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
}
/* latin */
@font-face {
font-family: 'Fira Sans';
font-style: normal;
font-weight: 400;
src: local('Fira Sans Regular'), local('FiraSans-Regular'), url(../fonts/FiraSans-Regular.ttf);
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215;
}
/* cyrillic-ext */
@font-face {
font-family: 'Fira Sans';
font-style: normal;
font-weight: 600;
src: local('Fira Sans SemiBold'), local('FiraSans-SemiBold'), url(../fonts/FiraSans-SemiBold.ttf);
unicode-range: U+0460-052F, U+20B4, U+2DE0-2DFF, U+A640-A69F;
}
/* cyrillic */
@font-face {
font-family: 'Fira Sans';
font-style: normal;
font-weight: 600;
src: local('Fira Sans SemiBold'), local('FiraSans-SemiBold'), url(../fonts/FiraSans-SemiBold.ttf);
unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
}
/* greek-ext */
@font-face {
font-family: 'Fira Sans';
font-style: normal;
font-weight: 600;
src: local('Fira Sans SemiBold'), local('FiraSans-SemiBold'), url(../fonts/FiraSans-SemiBold.ttf);
unicode-range: U+1F00-1FFF;
}
/* greek */
@font-face {
font-family: 'Fira Sans';
font-style: normal;
font-weight: 600;
src: local('Fira Sans SemiBold'), local('FiraSans-SemiBold'), url(../fonts/FiraSans-SemiBold.ttf);
unicode-range: U+0370-03FF;
}
/* vietnamese */
@font-face {
font-family: 'Fira Sans';
font-style: normal;
font-weight: 600;
src: local('Fira Sans SemiBold'), local('FiraSans-SemiBold'), url(../fonts/FiraSans-SemiBold.ttf);
unicode-range: U+0102-0103, U+1EA0-1EF9, U+20AB;
}
/* latin-ext */
@font-face {
font-family: 'Fira Sans';
font-style: normal;
font-weight: 600;
src: local('Fira Sans SemiBold'), local('FiraSans-SemiBold'), url(../fonts/FiraSans-SemiBold.ttf);
unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
}
/* latin */
@font-face {
font-family: 'Fira Sans';
font-style: normal;
font-weight: 600;
src: local('Fira Sans SemiBold'), local('FiraSans-SemiBold'), url(../fonts/FiraSans-SemiBold.ttf);
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215;
}
2 changes: 1 addition & 1 deletion style/popup.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import url('https://fonts.googleapis.com/css?family=Fira+Sans:400,600');
@import url('font.css');

* {
-webkit-box-sizing: border-box;
Expand Down

0 comments on commit 799c254

Please sign in to comment.