[go: nahoru, domu]

Skip to content

Commit

Permalink
Merge branch 'font-regular'
Browse files Browse the repository at this point in the history
  • Loading branch information
web-padawan committed Jul 28, 2017
2 parents a35e8af + fb55619 commit bbd76b0
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 5 deletions.
4 changes: 3 additions & 1 deletion brainy-td.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@
<template>
<style include="brainy-table-cell-shared-styles">
:host {
font: 300 13px/1.1 Roboto, sans-serif;
font: 400 13px/1.1 Roboto, sans-serif;
color: rgba(0, 0, 0, 0.87);
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
</style>
<content></content>
Expand Down
2 changes: 2 additions & 0 deletions brainy-th.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
overflow: hidden;
font: 600 12px/1.1 Roboto, sans-serif;
color: rgba(0, 0, 0, 0.54);
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}

:host([sort-by]) {
Expand Down
3 changes: 2 additions & 1 deletion brainy-tr-detail.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@
display: flex;
align-items: center;
padding: 24px;
font: 300 13px/1.1 Roboto, sans-serif;
font: 400 13px/1.1 Roboto, sans-serif;
background: #fff;
color: rgba(0, 0, 0, 0.87);
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
cursor: default;
box-shadow:
inset 1px 0 0 #e2e2e2,
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
},
"license": "MIT",
"devDependencies": {
"eslint": "^4.0.0",
"eslint": "^4.2.0",
"eslint-config-google": "^0.6.0",
"eslint-plugin-html": "^3.0.0",
"npm-run-all": "^4.0.2",
"stylelint": "^7.11.1",
"stylelint-config-standard": "^16.0.0",
"stylelint": "~8.0.0",
"stylelint-config-standard": "^17.0.0",
"stylelint-processor-html": "^1.0.0",
"web-component-tester": "^5.0.0"
},
Expand Down

0 comments on commit bbd76b0

Please sign in to comment.