Skip to content

Commit

Permalink
Merge pull request #5 in FFE/ffe-dropdown-react from master_docs-bug …
Browse files Browse the repository at this point in the history
…to master

* commit '86c91d982284b735f610e933485907b10e93f2ff':
  v1.4.1 - documentation bug fix
  Revert "removed generated docs from source control"
  • Loading branch information
Erik Wendel committed May 31, 2016
2 parents 4f54bd6 + d48401c commit be9b772
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,3 @@ node_modules

# intelliJ
.idea

docs/documentation.html
6 changes: 6 additions & 0 deletions docs/documentation.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<div><div class="component-intro"><h2 class="component-intro__header">Dropdown</h2><div class="lozenge lozenge--success">I PRODUKSJON</div><p class="ffe-micro-text" style="position:relative;bottom:22px;">HENTET FRA <a href="***REMOVED***">STASH</a></p><p>Select box bør brukes hvis man har et sett med predefinerte valg å velge fra. Radioknapper er et godt alternativ hvis det er få valg. Vi bruker native elementet slik at mobil/nettbrett får riktig GUI. </p></div><h3 class="ffe-h4">Eksempler</h3><div class="example-container"><p class="example-container__header">Default</p><div class="ffe-input-group" aria-live="polite"><label class="ffe-form-label" for="month">Velg måned</label><select class="ffe-select-box" id="month"><option value="0">Januar</option><option value="1">Februar</option><option value="2">Mars</option><option value="3">April</option></select></div></div><div class="expanding-field"><button class="expanding-field__toggle">Vis kode</button><span class="expanding-field__icon"></span><div class="expanding-field__content"><pre><code class="html hljs xml">&lt;div class=&quot;ffe-input-group&quot; aria-live=&quot;polite&quot;&gt;&lt;label class=&quot;ffe-form-label&quot; for=&quot;month&quot;&gt;Velg måned&lt;/label&gt;&lt;select class=&quot;ffe-select-box&quot; id=&quot;month&quot;&gt;&lt;option value=&quot;0&quot;&gt;Januar&lt;/option&gt;&lt;option value=&quot;1&quot;&gt;Februar&lt;/option&gt;&lt;option value=&quot;2&quot;&gt;Mars&lt;/option&gt;&lt;option value=&quot;3&quot;&gt;April&lt;/option&gt;&lt;/select&gt;&lt;/div&gt;</code></pre></div></div><div class="expanding-field"><button class="expanding-field__toggle">Vis API for React-komponent</button><span class="expanding-field__icon"></span><div class="expanding-field__content"><pre><code class="html hljs js">&lt;Dropdown label=&quot;Velg måned&quot; id=&quot;month&quot;&gt;
&lt;option value=&quot;0&quot;&gt;Januar&lt;/option&gt;
&lt;option value=&quot;1&quot;&gt;Februar&lt;/option&gt;
&lt;option value=&quot;2&quot;&gt;Mars&lt;/option&gt;
&lt;option value=&quot;3&quot;&gt;April&lt;/option&gt;
&lt;/Dropdown&gt;</code></pre></div></div></div>
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ffe-dropdown-react",
"version": "1.4.0",
"version": "1.4.1",
"main": "lib/dropdown.js",
"scripts": {
"build": "babel -d lib/. --ignore=*.test.js src/. && npm run docs",
Expand Down

0 comments on commit be9b772

Please sign in to comment.