Skip to content

Commit

Permalink
Merge pull request #4 from PredixDev/demo-update
Browse files Browse the repository at this point in the history
changes for repo demo and readme update
  • Loading branch information
runn-vermel authored Aug 1, 2016
2 parents 6e88095 + e1b18b7 commit 1acbec8
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 6 deletions.
6 changes: 5 additions & 1 deletion HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
v0.3.12
==================
* added readme image and link

v0.3.11
==================
* added github link
* added github link

v0.3.10
==================
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

Px-Calendar-picker [![Build Status](https://travis-ci.org/PredixDev/px-calendar-picker.svg?branch=master)](https://travis-ci.org/PredixDev/px-calendar-picker)
-----------------------------------------------
[![px-calendar-picker demo](px-calendar-picker.png?raw=true)](https://github.com/PredixDev/px-calendar-picker)

## Overview

Expand Down
7 changes: 4 additions & 3 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "px-calendar-picker",
"version": "0.3.11",
"version": "0.3.12",
"main": [
"px-calendar-picker.html"
],
Expand All @@ -14,7 +14,8 @@
"test",
"OSS_Notice.pdf",
".github",
"scripts"
"scripts",
"px-calendar-picker.png"
],
"dependencies": {
"polymer": "^1.5.0",
Expand All @@ -30,7 +31,7 @@
"px-forms-design": "#~0.3.15",
"px-tables-design": "#~0.3.12",
"iron-demo-helpers": "PolymerElements/iron-demo-helpers#~1.2.3",
"polymer-font-awesome": "px-polymer-font-awesome#^0.1.8",
"px-polymer-font-awesome":"^0.1.8",
"px-tabs": "~0.4.0",
"ace-widget": "LostInBrittany/ace-widget#~1.0.13",
"px-api-viewer": "~0.0.3",
Expand Down
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<link rel="icon" href="favicon.ico" type="image/x-icon"/>

<link rel="import" href="../px-demo-snippet/px-demo-snippet.html">
<link rel="import" href="../polymer-font-awesome/polymer-font-awesome.html">
<link rel="import" href="../px-polymer-font-awesome/polymer-font-awesome.html" />
<!-- Requires Webcomponents.js polyfill is provided by the page for browsers that don't support html imports -->

</head>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "px-calendar-picker",
"author": "General Electric",
"description": "A Px component allowing to pick a date from a calendar",
"version": "0.3.11",
"version": "0.3.12",
"private": true,
"extName" : null,
"repository" :
Expand Down
Binary file added px-calendar-picker.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 1acbec8

Please sign in to comment.