-
Notifications
You must be signed in to change notification settings - Fork 6
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Jstefaniuk/hybridize #30
Changes from 17 commits
0a27079
867a478
df75f4b
813a0a6
e12a899
244bea3
d4b3257
a04e22b
25f1ff7
42dfac4
4ebe161
e89989a
6b8627f
d0c97ce
a2dabf9
12b7a29
233f229
419f88c
21dca0a
4d7042a
2791bde
26f34eb
e5f49c6
ecb2edd
fc8d527
0c75c68
a2fd6e2
8b79ad7
d423b9d
3a01b0a
1d34198
34ec7c6
bd938f9
1f85e74
37065d9
0b775ef
7f8ad1c
84b8bea
92dbb16
48a50dd
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,13 @@ | ||
root = true | ||
[*] | ||
charset = utf8 | ||
end_of_line = lf | ||
trim_trailing_whitespace = true | ||
insert_final_newline = true | ||
indent_style = tab | ||
indent_size = 4 | ||
[{package.json,.travis.yml}] | ||
indent_style = space | ||
indent_size = 2 | ||
root = true | ||
|
||
[*] | ||
charset = utf8 | ||
end_of_line = lf | ||
trim_trailing_whitespace = true | ||
insert_final_newline = true | ||
indent_style = tab | ||
indent_size = 4 | ||
|
||
[{*.json,*.yml}] | ||
indent_style = space | ||
indent_size = 2 |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,4 @@ | ||
bower_components | ||
bower_components-1.x | ||
bower-1.x.json | ||
node_modules |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,9 @@ | ||
language: node_js | ||
node_js: node | ||
before_script: | ||
- npm install -g polymer-cli | ||
- polymer install --variants | ||
node_js: 9 | ||
script: | ||
- npm run test:lint | ||
- npm run lint | ||
- polymer test --skip-plugin local | ||
env: | ||
global: | ||
- SAUCE_USERNAME: Desire2Learn | ||
- secure: R9nrpeyuMcZTHnBcVAuMn+q/Fp9ti9K31tYlkBFhXtJc+rM/TYERiN195SRgbk2Gy6fK4exUXIWZtJW+cxuRwDoBIcSGWRwHWmkDc5k13kLaW/BcdWAfI/yFEkAwzrO1AfQOsB1qdbfYle9pP724BebfQHlqAxH9zNWlQdek+Gr02WKKXMWWhl2bH4P2QbNQItD5X6+xQTbnbmZnUECap9mQXbCzPVNU2MwvPRLuYuJmjcNBdC39iGfZNBY/+N1Ix3y6yFa41VD773KiqTZhVOM1TvVJz/lb+Dm25qSZdKixC0987eDY5zHiCigHIjJxo1bDwJz4xJ/DsnIo+hk0LvrOPvoxBp6tFNhGQgIUkwk0Lz6FsNQcH5l5QLh1ROq4isNx9BVEOHb+W1PdFzFlvoKf9+WS/ysSw19B/GFhtLJGTmGkaxnEBxhJ+DyiVnV5APV+cE4AEA4yB/Vz7cKOrBlLbZdZFb8x9DtHamKvyoZh7RVun6BHSmMNAlPD83oxF9HZ7GjhKeC1EpvIdSrZAh6NKgklt0slwSumWU6VfJeoT4STNfiP39DzHHtWqscwTTAG9Rp4UFxDRsz6jCWaPf7AfYe85fXp+EwBRC0RYikQz43IFnKoGpz69qNh4vap6HNPQmM2uctZeWbhtDSq2FzN5fbheSV5QlFeq88O4S8= |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
* @alogan519 @d2l-pbrown |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,26 +2,59 @@ | |
"name": "d2l-date-picker", | ||
"description": "A Date Picker for D2L Brightspace", | ||
"main": "d2l-date-picker.html", | ||
"license": "Apache-2.0", | ||
"ignore": [ | ||
"demo", | ||
"test", | ||
".editorconfig", | ||
".eslintrc.json", | ||
".gitignore", | ||
".travis.yml", | ||
"package.json", | ||
"polymer.json", | ||
"wct.conf.json" | ||
], | ||
"dependencies": { | ||
"polymer": "Polymer/polymer#^1.9.0", | ||
"d2l-time-picker": "BrightspaceUI/time-picker#^0.3.0", | ||
"vaadin-date-picker": "~1.2.3", | ||
"d2l-colors": "^2.4.0", | ||
"d2l-intl": "^0.4.1", | ||
"iron-a11y-keys": "^1.0.9", | ||
"app-localize-behavior": "~1.0.2", | ||
"app-localize-behavior": "PolymerElements/app-localize-behavior#1 - 2", | ||
"d2l-colors": "^3.1.2", | ||
"d2l-intl-import": "^1.0.0", | ||
"d2l-offscreen": "^3.0.1", | ||
"d2l-polymer-behaviors": "^1.0.0" | ||
"d2l-polymer-behaviors": "^1.0.0", | ||
"d2l-time-picker": "BrightspaceUI/time-picker#^1.0.0", | ||
"iron-a11y-keys": "^2.0.0", | ||
"iron-input": "^2.0.0", | ||
"polymer": "1.9 - 2", | ||
"vaadin-date-picker": "^2.0.0" | ||
}, | ||
"devDependencies": { | ||
"iron-component-page": "PolymerElements/iron-component-page#^1.0.0", | ||
"iron-demo-helpers": "PolymerElements/iron-demo-helpers#^1.0.0", | ||
"web-component-tester": "Polymer/web-component-tester#^6.0.0", | ||
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0", | ||
"iron-test-helpers": "^1.0.0" | ||
"iron-component-page": "PolymerElements/iron-component-page#^2.0.0", | ||
"iron-demo-helpers": "PolymerElements/iron-demo-helpers#^2.0.0", | ||
"iron-test-helpers": "^2.0.0", | ||
"web-component-tester": "Polymer/web-component-tester#^6.0.0" | ||
}, | ||
"variants": { | ||
"1.x": { | ||
"dependencies": { | ||
"polymer": "^1.9.1", | ||
"vaadin-date-picker": "Brightspace/vaadin-date-picker#^1.2.5" | ||
}, | ||
"resolutions": { | ||
"iron-a11y-announcer": "^2.0.0", | ||
"iron-a11y-keys-behavior": "^2.0.0", | ||
"iron-dropdown": "^2.0.0", | ||
"iron-iconset-svg": "^2.0.0", | ||
"iron-input": "^2.0.0", | ||
"iron-media-query": "^2.0.0", | ||
"iron-overlay-behavior": "^2.2.0", | ||
"iron-resizable-behavior": "^2.0.0", | ||
"iron-selector": "^2.0.0", | ||
"webcomponentsjs": "^0.7.24" | ||
} | ||
} | ||
}, | ||
"resolutions": { | ||
"d2l-offscreen": "^3.0.1", | ||
"d2l-polymer-behaviors": "^1.0.0" | ||
"d2l-polymer-behaviors": "^1.0.0", | ||
"vaadin-date-picker": "^2.0.0", | ||
"webcomponentsjs": "^v1.0.0" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'm surprised you need resolutions behind just There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think I added that in earlier on, since now it seems like it's no longer used 👍 |
||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,101 @@ | ||
<link rel="import" href="../polymer/polymer.html"> | ||
<link rel="import" href="../vaadin-date-picker/vaadin-date-picker-styles.html"> | ||
|
||
<dom-module id="d2l-vaadin-overlay-styles" theme-for="vaadin-date-picker-overlay"> | ||
<template> | ||
<style include="vaadin-date-picker-overlay-default-theme"> | ||
:host { | ||
font-family: inherit; | ||
max-height: 355px; | ||
} | ||
|
||
[part~="overlay-header"] { | ||
background-color: var(--d2l-color-celestine); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. If you're referencing the colors CSS variables, you should import |
||
color: white; | ||
} | ||
|
||
[part~="toolbar"] { | ||
background: white; | ||
box-shadow: 0 -1px 4px 0 rgba(0, 0, 0, 0.5); | ||
} | ||
|
||
[part~="years"] { | ||
color: white; | ||
background-color: var(--d2l-color-ferrite); | ||
} | ||
|
||
[part~="year-separator"] { | ||
color: var(--d2l-color-tungsten); | ||
} | ||
|
||
[part~="year-separator"]::after { | ||
font-size: 5px; | ||
} | ||
|
||
[part~="years-toggle-button"] { | ||
background-color: var(--d2l-color-celestine); | ||
cursor: pointer; | ||
} | ||
</style> | ||
</template> | ||
</dom-module> | ||
|
||
<dom-module id="d2l-vaadin-month-calendar-styles" theme-for="vaadin-month-calendar"> | ||
<template> | ||
<style include="vaadin-month-calendar-default-theme"> | ||
:host { | ||
font-family: inherit; | ||
color: var(--d2l-color-tungsten); | ||
} | ||
|
||
[part~="date"][today] { | ||
background-color: transparent; | ||
color: var(--d2l-color-celestine-plus-1); | ||
} | ||
|
||
:host([focused]) [part~="date"][focused], | ||
[part~="date"][focused] { | ||
background: var(--d2l-color-celestine); | ||
color: white; | ||
font-weight: 700; | ||
} | ||
|
||
[part~="month-header"] { | ||
color: var(--d2l-color-ferrite); | ||
font-size: 16px; | ||
font-weight: 400; | ||
line-height: 24px; | ||
font-family: inherit; | ||
} | ||
|
||
[part~="weekday"] { | ||
opacity: 1; | ||
color: var(--d2l-color-ferrite); | ||
font-size: 12px; | ||
text-transform: uppercase; | ||
opacity: 0.8; | ||
} | ||
</style> | ||
</template> | ||
</dom-module> | ||
|
||
<dom-module id="d2l-vaadin-button-styles" theme-for="vaadin-button"> | ||
<template> | ||
<style> | ||
:host { | ||
font-family: inherit; | ||
} | ||
|
||
[part~="button"] { | ||
background: none; | ||
font-family: inherit; | ||
color: var(--d2l-color-celestine); | ||
font-size: 14px; | ||
text-transform: uppercase; | ||
border: none; | ||
cursor: pointer; | ||
font-weight: 500; | ||
} | ||
</style> | ||
</template> | ||
</dom-module> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not needed as part of the hybridization, but I'd recommend getting this switched over to
d2l-localize-behavior
-- it should let you remove some of your resolution code and will ensure dates are formatted and parsed according to a user's preferences within Brightspace.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
See #22.