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

Commit

Permalink
Merge branch '1.0.0-wip'
Browse files Browse the repository at this point in the history
Conflicts:
	.gitignore
	Gruntfile.js
	README.md
	bower.json
	img/src/spriteTemplate.psd
	index.html
	package.json
  • Loading branch information
kevinparkerson committed Sep 15, 2014
2 parents 867873b + 4ab4f75 commit d622c6c
Show file tree
Hide file tree
Showing 78 changed files with 15,759 additions and 60 deletions.
11 changes: 1 addition & 10 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,9 @@
node_modules
bower_components

# gh-pages
_site/*

# logs
*.log
validation-status.json

# Sauce Labs. because it's classified...
SAUCE_API_KEY.yml

# Editors / IDEs
.idea

# node_module cache for TravisCI, etc.
node_modules.tar.gz
.idea
6 changes: 6 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
source 'https://rubygems.org'
ruby '2.0.0'
gem 'bundler'
gem 'jekyll'
gem 'rack-jekyll'
gem 'rouge'
59 changes: 59 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
GEM
remote: https://rubygems.org/
specs:
blankslate (2.1.2.4)
classifier (1.3.4)
fast-stemmer (>= 1.0.0)
colorator (0.1)
commander (4.1.6)
highline (~> 1.6.11)
fast-stemmer (1.0.2)
ffi (1.9.3)
highline (1.6.21)
jekyll (1.5.1)
classifier (~> 1.3)
colorator (~> 0.1)
commander (~> 4.1.3)
liquid (~> 2.5.5)
listen (~> 1.3)
maruku (= 0.7.0)
pygments.rb (~> 0.5.0)
redcarpet (~> 2.3.0)
safe_yaml (~> 1.0)
toml (~> 0.1.0)
liquid (2.5.5)
listen (1.3.1)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
rb-kqueue (>= 0.2)
maruku (0.7.0)
parslet (1.5.0)
blankslate (~> 2.0)
posix-spawn (0.3.9)
pygments.rb (0.5.4)
posix-spawn (~> 0.3.6)
yajl-ruby (~> 1.1.0)
rack (1.5.2)
rack-jekyll (0.4.1)
jekyll (>= 0.12.0, < 2.0)
rack (~> 1.5.0)
rb-fsevent (0.9.4)
rb-inotify (0.9.5)
ffi (>= 0.5.0)
rb-kqueue (0.2.3)
ffi (>= 0.5.0)
redcarpet (2.3.0)
rouge (1.6.2)
safe_yaml (1.0.3)
toml (0.1.1)
parslet (~> 1.5.0)
yajl-ruby (1.1.0)

PLATFORMS
ruby

DEPENDENCIES
bundler
jekyll
rack-jekyll
rouge
158 changes: 158 additions & 0 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,158 @@
/*jshint expr:true*/
/*global module:false*/
module.exports = function (grunt) {

// Project configuration.
grunt.initConfig({
// Metadata
banner: '/*!\n' +
' * Marketing Cloud Theme v<%= pkg.version %> \n' +
' * Copyright <%= grunt.template.today("yyyy") %> <%= pkg.author.name %>\n' +
' * Licensed under <%= pkg.license.type %> (<%= pkg.license.url %>)\n' +
' */\n',
pkg: grunt.file.readJSON('package.json'),

// Tasks configuration
clean: {
dist: ['dist/**'],
zipsrc: ['dist/fuelux-mctheme']
},
compress: {
zip: {
files: [
{
cwd: 'dist/',
expand: true,
src: ['fuelux-mctheme/**']
}
],
options: {
archive: 'dist/fuelux-mctheme.zip',
mode: 'zip'
}
}
},
copy: {
img: {
cwd: 'img/',
dest: 'dist/img/',
expand: true,
filter: 'isFile',
src: ['*']
},
zipsrc: {
cwd: 'dist/',
dest: 'dist/fuelux-mctheme/',
expand: true,
src: ['**']
}
},
unzip: {
'docs': 'docs.zip'
},
connect: {
server: {
options: {
hostname: '*',
port: 8000
}
},
testServer: {
options: {
hostname: '*',
port: 9000 // allows main server to be run simultaneously
}
}
},
curl: {
// Micro libraries via http://microjs.com/
'docs.zip': 'https://github.com/twbs/bootstrap/archive/master.zip'
},
less: {
'fuelux-mctheme': {
options: {
strictMath: true,
sourceMap: true,
outputSourceFiles: true,
sourceMapURL: '<%= pkg.name %>.css.map',
sourceMapFilename: 'dist/css/<%= pkg.name %>.css.map'
},
files: {
'dist/css/fuelux-mctheme.css': 'less/fuelux-mctheme.less'
}
},
minify: {
options: {
cleancss: true,
report: 'min'
},
files: {
'dist/css/fuelux-mctheme.min.css': 'dist/css/fuelux-mctheme.css'
}
}
},
replace: {
imgpaths: {
overwrite: true,
replacements:[
{
from: "'../../img",
to: "'../img"
}
],
src: [
'dist/css/fuelux-mctheme.css',
'dist/css/fuelux-mctheme.css.map'
]
}
},
usebanner: {
dist: {
options: {
position: 'top',
banner: '<%= banner %>'
},
files: {
src: [
'dist/css/fuelux-mctheme.css',
'dist/css/fuelux-mctheme.min.css'
]
}
}
},
watch: {
full: {
files: ['less/**'],
options: {
livereload: true,
},
tasks: ['distcss']
}
}
});

// Look ma! Load all grunt plugins in one line from package.json
require('load-grunt-tasks')(grunt, {scope: 'devDependencies'});

/* -------------
BUILD
------------- */

// CSS distribution task
grunt.registerTask('distcss', ['less:fuelux-mctheme', 'replace:imgpaths', 'less:minify', 'usebanner']);

// ZIP distribution task
grunt.registerTask('distzip', ['copy:zipsrc', 'compress', 'clean:zipsrc']);

// Full distribution task
grunt.registerTask('dist', ['clean:dist', 'copy:img', 'distcss', 'distzip']);

//The default build task
grunt.registerTask('default', ['dist']);

/* -------------
SERVE
------------- */
grunt.registerTask('serve', ['dist', 'connect:server', 'watch:full']);

};
24 changes: 24 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
Copyright (c) 2012-2014 ExactTarget, Inc.
All rights reserved.

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
following conditions are met:

1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following
disclaimer.

2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the
following disclaimer in the documentation and/or other materials provided with the distribution.

3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote
products derived from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

====================================================================
102 changes: 100 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,101 @@
# Fuel UX Marketing Cloud Theme
# Marketing Cloud Theme

(work in progress)
This theme enables a first-class user experience for your applications that seamlessly fits into the [Salesforce ExactTarget Marketing Cloud](http://www.exacttarget.com/) platform and strives to offer visual parity with the previously released, [Internet Marketing Hub Theme](https://github.com/ExactTarget/fuelux-imhtheme) with support for [Fuel UX 3](http://exacttarget.github.io/fuelux/) and [Bootstrap 3](http://getbootstrap.com/).

## Table of contents

* [Demos](#demos)
* [Quick start](#quick-start)
* [Bugs and feature requests](#bugs-and-feature-requests)
* [Philosophy and authors](#philosophy-and-authors)
* [Copyright and license](#copyright-and-license)

## Demos

View [demos of the Marketing Cloud Theme](http://exacttarget.github.com/fuelux-mctheme).

## Quick start
1. Install with [Bower](https://github.com/bower/bower). This will also install compatible versions of Bootstrap and Fuel UX:

```
bower install fuelux-mctheme
```
2. Link to the [complete Bootstrap CSS](http://www.bootstrapcdn.com/) and the complete [Fuel UX CSS](https://github.com/ExactTarget/fuelux#quick-start). Then, use a single css tag ***after Bootstrap and Fuel UX styles*** from your bower components folder.

```
<!-- <link href="BOOTSTRAP-CSS" rel="stylesheet" type="text/css"/> -->
<!-- <link href="FUELUX-CSS" rel="stylesheet" type="text/css"/> -->
<link href="http://www.fuelcdn.com/fuelux-mctheme/1.0.0/css/fuelux-mctheme.min.css" rel="stylesheet" type="text/css"/>
```
3. Add markup from the [Bootstrap documentation](http://getbootstrap.com/) or the [Fuel UX documentation](http://exacttarget.github.io/fuelux/).

### Download
The Marketing Cloud Theme can be obtained one of three ways:

1. **Best way:** Install with a dependency manager:

Using [Bower](https://github.com/bower/bower):

```
bower install mctheme
```
Update with `bower update fuelux-mctheme`.

This ensures you get all the [dependencies](#dependencies).

2. **Another good way:** Clone the Git repository:
```
git clone https://github.com/ExactTarget/fuelux-mctheme/
```

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

3. **Also an option:** Download a .zip archive of the [latest release](http://www.fuelcdn.com/fuelux-mctheme/1.0.0/fuelux.zip) or request files from [the Fuel CDN](http://www.fuelcdn.com/fuelux-mctheme/1.0.0/).

*Note: Using the Marketing Cloud Theme in this way can make updating to future releases difficult. This approach is not recommended.*


### Dependencies
The Marketing Cloud Theme is dependent upon [Fuel UX 3](http://github.com/ExactTarget/fuelux/), [Bootstrap 3](https://github.com/twbs/bootstrap) and [jQuery](https://github.com/jquery/jquery). If you installed by cloning the repo or by downloading a .zip archive, you'll also want to grab these things, as it just won't work without them.
- [jQuery](http://github.com/jquery/jquery)
- [Bootstrap 3](http://github.com/twbs/bootstrap)
- [Fuel UX 3](http://github.com/ExactTarget/fuelux/)

### What's included

A download of FuelUX provides the following directories and files, which are grouped according to file type:
```
fuelux-mctheme/
├── css/
│ ├── fuelux-mctheme.css
│ ├── fuelux-mctheme.min.css
└── img/
├── spritesheet.png
└── spritesheet-2x.png
```

## Bugs and feature requests

Have a bug or a feature request? Please first review the [open issues](https://github.com/ExactTarget/fuelux-mctheme/issues), then search for existing and closed issues. If your problem or idea is not addressed yet, [please open a new issue](https://github.com/ExactTarget/fuelux-mctheme/issues/new). The issue may be a bug in Bootstrap or Fuel UX. If you think it is, please post in the respective repository.

##Philosophy and authors

### The Fuel UX Philosophy
Our aim is to provide a suite of related but independent projects that help web developers integrate, manage, and customize quality libraries and utilities to more efficiently develop, maintain, test, and distribute their projects. Any improvements or fixes we make to the open source projects, we use will be contributed upstream if they are useful to the rest of the community.

|Project Maintainers (a-z)&nbsp;&nbsp;&nbsp;&nbsp; | |
|:----|----:|
|Stephen James | [![tweetllama on Twitter](https://raw.githubusercontent.com/ExactTarget/fuelux/gh-pages/invertobird-sm.png)](http://twitter.com/tweetllama) [![interactivellama on Github](https://raw.githubusercontent.com/ExactTarget/fuelux/gh-pages/invertocat-sm.png)](http://github.com/interactivellama)|
|Kevin Parkerson | [![kevinparkerson on Twitter](https://raw.githubusercontent.com/ExactTarget/fuelux/gh-pages/invertobird-sm.png)](http://twitter.com/kevinparkerson) [![kevinparkerson on Github](https://raw.githubusercontent.com/ExactTarget/fuelux/gh-pages/invertocat-sm.png)](http://github.com/kevinparkerson)|

|Major Contributors&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | |
|:----|----:|
|Dave Woodward |[![@futuremint on Twitter](https://raw.githubusercontent.com/ExactTarget/fuelux/gh-pages/invertobird-sm.png)](http://twitter.com/futuremint) [![futuremint on Github](https://raw.githubusercontent.com/ExactTarget/fuelux/gh-pages/invertocat-sm.png)](http://github.com/futuremint) |
|Christopher McCulloh | [![@cmcculloh on Twitter](https://raw.githubusercontent.com/ExactTarget/fuelux/gh-pages/invertobird-sm.png)](http://twitter.com/cmcculloh) [![cmcculloh on Github](https://raw.githubusercontent.com/ExactTarget/fuelux/gh-pages/invertocat-sm.png)](http://github.com/cmcculloh)|

## Copyright and license

Copyright &copy; 2012-2014 ExactTarget, Inc.

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

0 comments on commit d622c6c

Please sign in to comment.