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

Commit

Permalink
Utilizing less to make file more readable
Browse files Browse the repository at this point in the history
  • Loading branch information
cmcculloh authored and BenjaminNeilDavis committed Dec 5, 2014
1 parent 25b28a0 commit 14216cb
Show file tree
Hide file tree
Showing 25 changed files with 681 additions and 68 deletions.
6 changes: 3 additions & 3 deletions 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.3.0/)
* Request files from [the Fuel UX CDN](http://www.fuelcdn.com/fuelux/3.3.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.3.0/fuelux.zip).
* Download a .zip archive of the [latest release](http://www.fuelcdn.com/fuelux/3.3.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.3.0/'
'fuelux': 'http://www.fuelcdn.com/fuelux/3.3.1/'
//...
}
});
Expand Down
2 changes: 1 addition & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ module.exports = function(grunt) {
SERVE
------------- */
grunt.registerTask('serve', 'serve files without compilation', ['test', 'connect:server', 'watch:contrib']);
grunt.registerTask('servefast', 'serve files without compilation or watch (tests take time...)', ['connect:server']);
grunt.registerTask('servefast', 'serve files without compilation or testing (tests take time...)', ['connect:server', 'watch:contrib']);
grunt.registerTask('servedist', 'build dist directory and serve files with compilation', ['test', 'dist', 'connect:server', 'watch:full']);


Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,19 @@ 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.3.0/css/fuelux.min.css" rel="stylesheet">
<link href="//www.fuelcdn.com/fuelux/3.3.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.3.0/js/fuelux.min.js"></script>
<script src="//www.fuelcdn.com/fuelux/3.3.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.3.0/)
- [Download the latest release](https://github.com/exacttarget/fuelux/archive/3.3.0.zip).
- Request files from [the Fuel UX CDN](http://www.fuelcdn.com/fuelux/3.3.1/)
- [Download the latest release](https://github.com/exacttarget/fuelux/archive/3.3.1.zip).
- Clone the repo: `git clone https://github.com/exacttarget/fuelux.git`.
- Install with [Bower](http://bower.io): `bower install fuelux`.
- Install with [Volo](https://github.com/volojs/volo): `volo add fuelux`.
Expand Down
2 changes: 1 addition & 1 deletion 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.3.0",
"version": "3.3.1",
"keywords": [
"application",
"bootstrap",
Expand Down
58 changes: 57 additions & 1 deletion data.js
Original file line number Diff line number Diff line change
Expand Up @@ -704,7 +704,63 @@
sound: '???'
}
]
}
},
tree: [
{
"name": "Aquire",
"type": "folder",
"dataAttributes": { "id": "aquire-folder" },
"children": [
{
"name": "POS Receipt",
"type": "item"
},
{
"name": "Confirm Subscription",
"type": "item"
},
{
"name": "Thanks for Signing Up",
"type": "item"
}
]
},
{
"name": "Onboard",
"type": "folder"
},
{
"name": "Engage",
"type": "folder",
"dataAttributes": { "id": "engage-folder" },
"children":[
{
"name": "Abandoned Cart",
"type": "folder",
"children": [
{
"name": "Archive",
"type": "folder"
}
]
},
{
"name": "Transactional",
"type": "folder",
"children": [
{
"name": "Archive",
"type": "folder"
}
]
}
]
},
{
"name": "Retain",
"type": "folder"
}
]
};

window.data = data;
Expand Down
15 changes: 15 additions & 0 deletions dev/dev.html
Original file line number Diff line number Diff line change
Expand Up @@ -168,13 +168,28 @@
list_highlightSortedColumn: true
},
'thumbnail.view3': {
thumbnail_alignment: 'center',
dataSource: function(options, callback){
thumbnail(options, callback);
},
thumbnail_selectable: 'multi'
}
}
});

// setTimeout(function(){
// $('#myRepeater').repeater('render', {
// dataSourceOptions: {
// pageIndex: 1,
// pageSize: 20,
// filter: { text: 'Some', value: 'some' }
// //sortProperty: 'name',
// //sortDirection: 'asc',
// //search: 'term'
// },
// preserveDataSourceOptions: true
// });
// }, 5000);
});
</script>
</head>
Expand Down
98 changes: 88 additions & 10 deletions dist/css/fuelux.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/css/fuelux.css.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/css/fuelux.min.css

Large diffs are not rendered by default.

Binary file modified dist/fuelux.zip
Binary file not shown.
Loading

0 comments on commit 14216cb

Please sign in to comment.