Skip to content
This repository has been archived by the owner on Feb 7, 2019. It is now read-only.

Commit

Permalink
[ci skip] Automated merge stage->master.
Browse files Browse the repository at this point in the history
  • Loading branch information
arcauto committed Jan 16, 2017
2 parents 50e6d68 + 474ab90 commit 247b9e8
Show file tree
Hide file tree
Showing 5 changed files with 55 additions and 26 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
<a name="0.1.8"></a>
## [0.1.8](https://github.com/advanced-rest-client/raml-docs-method-viewer/compare/0.1.7...v0.1.8) (2017-01-16)


### Update

* Updated styles for the element ([59c5b0e5305294c1c01d02f5f24280006e220524](https://github.com/advanced-rest-client/raml-docs-method-viewer/commit/59c5b0e5305294c1c01d02f5f24280006e220524))



<a name="0.1.7"></a>
## [0.1.7](https://github.com/advanced-rest-client/raml-docs-method-viewer/compare/0.1.6...v0.1.7) (2017-01-10)

Expand Down
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[![Build Status](https://travis-ci.org/advanced-rest-client/raml-docs-method-viewer.svg?branch=master)](https://travis-ci.org/advanced-rest-client/raml-docs-method-viewer)
[![Build Status](https://travis-ci.org/advanced-rest-client/raml-docs-method-viewer.svg?branch=stage)](https://travis-ci.org/advanced-rest-client/raml-docs-method-viewer)

# raml-docs-method-viewer

Expand Down Expand Up @@ -34,6 +34,9 @@ Custom property | Description | Default
`--raml-docs-method-viewer-url-font-style` | font-style of the URL value | `italic` |
`--raml-docs-method-viewer-url` | Mixin applied to the URL field | `{}` |
`--action-button` | Mixin applied to the main action button (Try it) | `{}`
`--arc-font-headline` | Mixin applied to the h1 element (API title) | `{}`
`--arc-font-title` | Mixin applied to the h2 elements (section title) | `{}`
`--arc-font-subhead` | Mixin applied to the h3 elements (section sub-titles) | `{}`



Expand Down
6 changes: 3 additions & 3 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
"polymer": "Polymer/polymer#^1.0.0",
"iron-flex-layout": "PolymerElements/iron-flex-layout#^1.3.1",
"raml-behaviors": "advanced-rest-client/raml-behaviors#^1.0.1",
"paper-styles": "PolymerElements/paper-styles#^1.1.5",
"paper-button": "PolymerElements/paper-button#^1.0.14",
"prism-element": "PolymerElements/prism-element#^1.1.1",
"docs-parameters-table": "advanced-rest-client/docs-parameters-table#^1.0.4",
Expand All @@ -31,7 +30,8 @@
"iron-behaviors": "PolymerElements/iron-behaviors#^1.0.17",
"marked-element": "PolymerElements/marked-element#^1.2.0",
"raml-docs-response-panel": "advanced-rest-client/raml-docs-response-panel#^1.0.1",
"iron-media-query": "PolymerElements/iron-media-query#^1.0.8"
"iron-media-query": "PolymerElements/iron-media-query#^1.0.8",
"markdown-styles": "advanced-rest-client/markdown-styles#^1.0.0"
},
"devDependencies": {
"iron-component-page": "polymerelements/iron-component-page#1.0.0",
Expand All @@ -55,5 +55,5 @@
"test",
"tasks"
],
"version": "0.1.7"
"version": "0.1.8"
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "raml-docs-method-viewer",
"version": "0.1.7",
"version": "0.1.8",
"license": "Apache-2.0 OR CC-BY-4.0",
"description": "Documentation view for the method defined in RAML file",
"devDependencies": {
Expand Down
58 changes: 37 additions & 21 deletions raml-docs-method-viewer.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,16 @@
-->
<link rel="import" href="../polymer/polymer.html">
<link rel="import" href="../raml-behaviors/raml-behavior.html">
<link rel="import" href="../paper-styles/paper-styles.html">
<link rel="import" href="../iron-flex-layout/iron-flex-layout.html">
<link rel="import" href="../paper-button/paper-button.html">
<link rel="import" href="../prism-element/prism-import.html">
<link rel="import" href="../prism-element/prism-theme-default.html">
<link rel="import" href="../docs-parameters-table/docs-parameters-table.html">
<link rel="import" href="../docs-parameters-table/docs-headers-table.html">
<link rel="import" href="../docs-parameters-table/docs-body-table.html">
<link rel="import" href="../docs-parameters-table/docs-body-parameters-table.html">
<link rel="import" href="../raml-docs-response-panel/raml-docs-response-panel.html">
<link rel="import" href="../iron-media-query/iron-media-query.html">
<link rel="import" href="../marked-element/marked-element.html">
<link rel="import" href="../markdown-styles/markdown-styles.html">
<!--
`<raml-docs-method-viewer>` Documentation view for the method defined in RAML file
Expand Down Expand Up @@ -57,43 +56,42 @@
`--raml-docs-method-viewer-url-font-style` | font-style of the URL value | `italic` |
`--raml-docs-method-viewer-url` | Mixin applied to the URL field | `{}` |
`--action-button` | Mixin applied to the main action button (Try it) | `{}`
`--arc-font-headline` | Mixin applied to the h1 element (API title) | `{}`
`--arc-font-title` | Mixin applied to the h2 elements (section title) | `{}`
`--arc-font-subhead` | Mixin applied to the h3 elements (section sub-titles) | `{}`
@group RAML Elements
@element raml-docs-method-viewer
@demo demo/index.html
-->
<dom-module id="raml-docs-method-viewer">
<template>
<style include="prism-theme-default"></style>
<style include="markdown-styles"></style>
<style>
:host {
display: block;
@apply(--raml-docs-method-viewer);

--content-section: {
padding: 8px 12px;
}
}

:host([hidden]) {
display: none !important;
}

h1 {
@apply(--paper-font-headline);
@apply(--content-section);
@apply(--arc-font-headline);
@apply(--raml-docs-method-viewer-content-section);
@apply(--raml-docs-h1);
}

h2 {
@apply(--paper-font-title);
@apply(--content-section);
@apply(--arc-font-title);
@apply(--raml-docs-method-viewer-content-section);
@apply(--raml-docs-h2);
}

h3 {
@apply(--paper-font-subhead);
@apply(--content-section);
@apply(--arc-font-subhead);
@apply(--raml-docs-method-viewer-content-section);
@apply(--raml-docs-h3);
}

Expand All @@ -113,22 +111,23 @@

.title {
@apply(--layout-flex);
/*@apply(--paper-font-title);*/
}

.method-desc {
@apply(--paper-font-body1);
@apply(--content-section);
margin-bottom: 28px;
color: rgba(0,0,0,0.74);
@apply(--arc-font-body1);
@apply(--raml-docs-method-viewer-content-section);
@apply(--raml-docs-item-description);
}

.url-area {
@apply(--layout-horizontal);
@apply(--paper-font-body1);
@apply(--arc-font-body1);
font-size: 16px;
margin-bottom: 40px;
color: var(--raml-docs-method-viewer-url-color, --accent-color);
@apply(--content-section);
@apply(--raml-docs-method-viewer-content-section);
}

.url-value {
Expand Down Expand Up @@ -170,8 +169,20 @@
}

:host([narrow]) .title-area {
@apply(--layout-vertical);
margin-bottom: 24px;
/*@apply(--layout-start);*/
}
:host([narrow]) h1 {
font-size: 20px;
margin: 0;
}

:host([narrow]) h2 {
font-size: 18px;
}

:host([narrow]) h3 {
font-size: 17px;
}
</style>
<iron-media-query query="(max-width: [[narrowWidth]])" query-matches="{{narrow}}"></iron-media-query>
Expand All @@ -186,7 +197,12 @@ <h1 class="title">
<paper-button class="action-button" on-tap="_tryIt">Try it</paper-button>
</div>
</div>
<div hidden$="[[_computeHideMethodDesc(raml.description)]]" class="method-desc">[[raml.description]]</div>

<div hidden$="[[_computeHideMethodDesc(raml.description)]]" class="method-desc">
<marked-element markdown="[[raml.description]]">
<div class="markdown-html markdown-body"></div>
</marked-element>
</div>

<section class="request-doc">
<h2>Request</h2>
Expand Down

0 comments on commit 247b9e8

Please sign in to comment.