You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by pr...@apache.org on 2014/01/07 15:39:02 UTC
[4/4] git commit: changes by chanaka jayasena STRATOS-338
changes by chanaka jayasena STRATOS-338
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/73326f9a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/73326f9a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/73326f9a
Branch: refs/heads/master
Commit: 73326f9a1434cf5314d5f2db5c5fa2fcbe35d884
Parents: b0c11fd
Author: Pradeep Fernando <pr...@gmail.com>
Authored: Tue Jan 7 20:08:36 2014 +0530
Committer: Pradeep Fernando <pr...@gmail.com>
Committed: Tue Jan 7 20:08:36 2014 +0530
----------------------------------------------------------------------
.../cartridge_deployments.jag | 7 +
.../data/cartridge_deployments.json | 10 +
.../data/cartridges.json | 75 +-
.../data/config_status.json | 4 +
.../data/lbs.json | 10 +
.../data/mt_service_deployments.json | 10 +
.../data/partition_deployments.json | 10 +
.../data/policy_deployments.json | 10 +
.../org.apache.stratos.manager.console/lbs.jag | 7 +
.../mt_service_deployments.jag | 7 +
.../partition_deployments.jag | 9 +
.../policy_deployments.jag | 7 +
.../themes/theme1/pages/index.hbs | 2 +-
.../theme1/partials/cartridge_deployments.hbs | 0
.../theme1/partials/configure_stratos.hbs | 59 +-
.../themes/theme1/partials/header.hbs | 60 +-
.../themes/theme1/partials/lbs.hbs | 0
.../theme1/partials/mt_service_deployments.hbs | 0
.../theme1/partials/partition_deployments.hbs | 129 ++
.../theme1/partials/policy_deployments.hbs | 0
.../theme1/renderers/cartridge_deployments.js | 40 +
.../theme1/renderers/configure_stratos.js | 4 +-
.../themes/theme1/renderers/lbs.js | 40 +
.../theme1/renderers/mt_service_deployments.js | 40 +
.../theme1/renderers/partition_deployments.js | 47 +
.../theme1/renderers/policy_deployments.js | 40 +
.../themes/theme1/ui/css/main.css | 34 +-
.../theme1/ui/font-awesome/css/font-awesome.css | 1145 ++++++++----------
.../ui/font-awesome/css/font-awesome.min.css | 407 +------
.../ui/font-awesome/fonts/FontAwesome.otf | Bin 0 -> 62856 bytes
.../font-awesome/fonts/fontawesome-webfont.eot | Bin 0 -> 38205 bytes
.../font-awesome/fonts/fontawesome-webfont.svg | 414 +++++++
.../font-awesome/fonts/fontawesome-webfont.ttf | Bin 0 -> 80652 bytes
.../font-awesome/fonts/fontawesome-webfont.woff | Bin 0 -> 44432 bytes
.../themes/theme1/ui/js/configure_stratos.js | 38 +
.../themes/theme1/ui/js/utils.js | 21 +
36 files changed, 1525 insertions(+), 1161 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/73326f9a/components/org.apache.stratos.manager.console/cartridge_deployments.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/cartridge_deployments.jag b/components/org.apache.stratos.manager.console/cartridge_deployments.jag
new file mode 100644
index 0000000..02846a8
--- /dev/null
+++ b/components/org.apache.stratos.manager.console/cartridge_deployments.jag
@@ -0,0 +1,7 @@
+<%
+var caramel = require('caramel');
+var cartridge_deployments = require('/data/cartridge_deployments.json');
+caramel.render({
+ cartridge_deployments:cartridge_deployments
+});
+%>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/73326f9a/components/org.apache.stratos.manager.console/data/cartridge_deployments.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/data/cartridge_deployments.json b/components/org.apache.stratos.manager.console/data/cartridge_deployments.json
new file mode 100644
index 0000000..07555c0
--- /dev/null
+++ b/components/org.apache.stratos.manager.console/data/cartridge_deployments.json
@@ -0,0 +1,10 @@
+[
+ {
+ "name":"Cartridge - deployment1",
+ "policy":"{'partition':{'id': 'P1','provider': 'ec2','property': [{'name': 'region','value': 'ap-southeast-1'}],'partitionMin': '1','partitionMax': '3' }}"
+ },
+ {
+ "name":"Cartridge - deployment2",
+ "policy":"{'partition':{'id': 'P1','provider': 'ec2','property': [{'name': 'region','value': 'ap-southeast-1'}],'partitionMin': '1','partitionMax': '3' }}"
+ }
+]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/73326f9a/components/org.apache.stratos.manager.console/data/cartridges.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/data/cartridges.json b/components/org.apache.stratos.manager.console/data/cartridges.json
index 5189ec2..b49a04c 100644
--- a/components/org.apache.stratos.manager.console/data/cartridges.json
+++ b/components/org.apache.stratos.manager.console/data/cartridges.json
@@ -1,52 +1,35 @@
-[
+{"cartridge": [
{
- kind: "service",
- cartridges: [
- {
- type: "php",
- version: "PHP 5.4",
- description: "PHP is a popular general-purpose scripting language that is especially suited to web development. Fast, flexible and pragmatic, PHP powers everything from your blog to the most popular websites in the world."
- },
- {
- type: "python",
- version: "Python 2.6",
- description: "Python is a programming language that lets you work more quickly and integrate your systems more effectively. You can learn to use Python and see almost immediate gains in productivity and lower maintenance costs."
- },
- {
- type: "ruby",
- version: "Ruby 1.9",
- description:"Ruby is a dynamic, open source programming language with a focus on simplicity and productivity. It has an elegant syntax that is natural to read and easy to write."
- },
- {
- type: "cakephp",
- version: "CakePHP 1.9",
- description:"CakePHP makes building web applications simpler, faster and require less code."
- }
- ]
+ "activeInstances": 0,
+ "cartridgeAlias": "-",
+ "cartridgeType": "lb",
+ "description": "LB Cartridge",
+ "displayName": "load balancer",
+ "multiTenant": false,
+ "provider": "apache",
+ "status": "NOT-SUBSCRIBED",
+ "version": 4
},
{
- kind: "data",
- cartridges: [
- {
- type: "mysql",
- version: "MySQL 5.1",
- description: "MySQL is a popular choice of database for use in web applications, and is a central component of the widely used LAMP open source web application software stack (and other 'AMP' stacks). "
- }
- ]
+ "activeInstances": 0,
+ "cartridgeAlias": "-",
+ "cartridgeType": "php",
+ "description": "Apache Stratos PHP Cartridge",
+ "displayName": "Apache Stratos PHP Cartridge",
+ "multiTenant": false,
+ "provider": "Apache Stratos",
+ "status": "NOT-SUBSCRIBED",
+ "version": 1
},
{
- kind: "application",
- cartridges: [
- {
- type: "drupal",
- version: "Drupal 7",
- description: "Drupal is an open source content management platform powering millions of websites and applications. It’s built, used, and supported by an active and diverse community of people around the world."
- },
- {
- type: "Wordpress",
- version: "WordPress 3.7.1",
- description:"WordPress is a free and open source blogging tool and a content management system (CMS) based on PHP and MySQL, which runs on a web hosting service. Features include a plug-in architecture and a template system. WordPress is used by more than 18.9% of the top 10"
- }
- ]
+ "activeInstances": 0,
+ "cartridgeAlias": "-",
+ "cartridgeType": "stratos-lb",
+ "description": "Apache Stratos Load Balancer Cartridge",
+ "displayName": "Apache Stratos Load Balancer Cartridge",
+ "multiTenant": false,
+ "provider": "apache",
+ "status": "NOT-SUBSCRIBED",
+ "version": 4
}
-]
\ No newline at end of file
+]}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/73326f9a/components/org.apache.stratos.manager.console/data/config_status.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/data/config_status.json b/components/org.apache.stratos.manager.console/data/config_status.json
new file mode 100644
index 0000000..1c73caa
--- /dev/null
+++ b/components/org.apache.stratos.manager.console/data/config_status.json
@@ -0,0 +1,4 @@
+{
+ "first_use":false,
+ "not_complete":true
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/73326f9a/components/org.apache.stratos.manager.console/data/lbs.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/data/lbs.json b/components/org.apache.stratos.manager.console/data/lbs.json
new file mode 100644
index 0000000..0d135f9
--- /dev/null
+++ b/components/org.apache.stratos.manager.console/data/lbs.json
@@ -0,0 +1,10 @@
+[
+ {
+ "name":"LB1",
+ "policy":"{'partition':{'id': 'P1','provider': 'ec2','property': [{'name': 'region','value': 'ap-southeast-1'}],'partitionMin': '1','partitionMax': '3' }}"
+ },
+ {
+ "name":"LB2",
+ "policy":"{'partition':{'id': 'P1','provider': 'ec2','property': [{'name': 'region','value': 'ap-southeast-1'}],'partitionMin': '1','partitionMax': '3' }}"
+ }
+]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/73326f9a/components/org.apache.stratos.manager.console/data/mt_service_deployments.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/data/mt_service_deployments.json b/components/org.apache.stratos.manager.console/data/mt_service_deployments.json
new file mode 100644
index 0000000..087f1a5
--- /dev/null
+++ b/components/org.apache.stratos.manager.console/data/mt_service_deployments.json
@@ -0,0 +1,10 @@
+[
+ {
+ "name":"MT Service Deployment1",
+ "policy":"{'partition':{'id': 'P1','provider': 'ec2','property': [{'name': 'region','value': 'ap-southeast-1'}],'partitionMin': '1','partitionMax': '3' }}"
+ },
+ {
+ "name":"MT Service Deployment2",
+ "policy":"{'partition':{'id': 'P1','provider': 'ec2','property': [{'name': 'region','value': 'ap-southeast-1'}],'partitionMin': '1','partitionMax': '3' }}"
+ }
+]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/73326f9a/components/org.apache.stratos.manager.console/data/partition_deployments.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/data/partition_deployments.json b/components/org.apache.stratos.manager.console/data/partition_deployments.json
new file mode 100644
index 0000000..9629cdd
--- /dev/null
+++ b/components/org.apache.stratos.manager.console/data/partition_deployments.json
@@ -0,0 +1,10 @@
+[
+ {
+ "name":"Partition - deployment1",
+ "policy":"{'partition':{'id': 'P1','provider': 'ec2','property': [{'name': 'region','value': 'ap-southeast-1'}],'partitionMin': '1','partitionMax': '3' }}"
+ },
+ {
+ "name":"Partition - deployment2",
+ "policy":"{'partition':{'id': 'P1','provider': 'ec2','property': [{'name': 'region','value': 'ap-southeast-1'}],'partitionMin': '1','partitionMax': '3' }}"
+ }
+]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/73326f9a/components/org.apache.stratos.manager.console/data/policy_deployments.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/data/policy_deployments.json b/components/org.apache.stratos.manager.console/data/policy_deployments.json
new file mode 100644
index 0000000..db657be
--- /dev/null
+++ b/components/org.apache.stratos.manager.console/data/policy_deployments.json
@@ -0,0 +1,10 @@
+[
+ {
+ "name":"Policy Deployment1",
+ "policy":"{'partition':{'id': 'P1','provider': 'ec2','property': [{'name': 'region','value': 'ap-southeast-1'}],'partitionMin': '1','partitionMax': '3' }}"
+ },
+ {
+ "name":"Policy Deployment2",
+ "policy":"{'partition':{'id': 'P1','provider': 'ec2','property': [{'name': 'region','value': 'ap-southeast-1'}],'partitionMin': '1','partitionMax': '3' }}"
+ }
+]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/73326f9a/components/org.apache.stratos.manager.console/lbs.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/lbs.jag b/components/org.apache.stratos.manager.console/lbs.jag
new file mode 100644
index 0000000..6a05e93
--- /dev/null
+++ b/components/org.apache.stratos.manager.console/lbs.jag
@@ -0,0 +1,7 @@
+<%
+var caramel = require('caramel');
+var lbs = require('/data/lbs.json');
+caramel.render({
+ lbs:lbs
+});
+%>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/73326f9a/components/org.apache.stratos.manager.console/mt_service_deployments.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/mt_service_deployments.jag b/components/org.apache.stratos.manager.console/mt_service_deployments.jag
new file mode 100644
index 0000000..f771e70
--- /dev/null
+++ b/components/org.apache.stratos.manager.console/mt_service_deployments.jag
@@ -0,0 +1,7 @@
+<%
+var caramel = require('caramel');
+var mt_service_deployments = require('/data/mt_service_deployments.json');
+caramel.render({
+ mt_service_deployments:mt_service_deployments
+});
+%>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/73326f9a/components/org.apache.stratos.manager.console/partition_deployments.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/partition_deployments.jag b/components/org.apache.stratos.manager.console/partition_deployments.jag
new file mode 100644
index 0000000..9834048
--- /dev/null
+++ b/components/org.apache.stratos.manager.console/partition_deployments.jag
@@ -0,0 +1,9 @@
+<%
+var caramel = require('caramel');
+var partition_deployments = require('/data/partition_deployments.json');
+var config_status = require('/data/config_status.json');
+caramel.render({
+ partition_deployments:partition_deployments,
+ config_status:config_status
+});
+%>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/73326f9a/components/org.apache.stratos.manager.console/policy_deployments.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/policy_deployments.jag b/components/org.apache.stratos.manager.console/policy_deployments.jag
new file mode 100644
index 0000000..cd3d5cb
--- /dev/null
+++ b/components/org.apache.stratos.manager.console/policy_deployments.jag
@@ -0,0 +1,7 @@
+<%
+var caramel = require('caramel');
+var policy_deployments = require('/data/policy_deployments.json');
+caramel.render({
+ policy_deployments:policy_deployments
+});
+%>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/73326f9a/components/org.apache.stratos.manager.console/themes/theme1/pages/index.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/themes/theme1/pages/index.hbs b/components/org.apache.stratos.manager.console/themes/theme1/pages/index.hbs
index f0bd73c..a0dade2 100644
--- a/components/org.apache.stratos.manager.console/themes/theme1/pages/index.hbs
+++ b/components/org.apache.stratos.manager.console/themes/theme1/pages/index.hbs
@@ -23,7 +23,7 @@
<link rel="stylesheet" href="{{url "/themes/theme1/ui/css/smoothness/jqueryui-themeroller.css"}}">
<link rel="stylesheet" href="{{url "/themes/theme1/ui/css/dialog.css"}}">
<link rel="stylesheet" href="{{url "/themes/theme1/ui/custom-fonts/style.css"}}">
- <link rel="stylesheet" href="{{url "/themes/theme1/ui/font-awesome/css/font-awesome.min.css"}}">
+ <link rel="stylesheet" href="{{url "/themes/theme1/ui/font-awesome/css/font-awesome.css"}}">
<script src="{{url "/themes/theme1/ui/js/vendor/modernizr-2.6.2-respond-1.1.0.min.js"}}"></script>
<script src="{{url "/themes/theme1/ui/js/vendor/jquery-1.10.1.min.js"}}"></script>
<script src="{{url "/themes/theme1/ui/js/vendor/jquery-ui-1.10.3.custom.min.js"}}"></script>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/73326f9a/components/org.apache.stratos.manager.console/themes/theme1/partials/cartridge_deployments.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/themes/theme1/partials/cartridge_deployments.hbs b/components/org.apache.stratos.manager.console/themes/theme1/partials/cartridge_deployments.hbs
new file mode 100644
index 0000000..e69de29
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/73326f9a/components/org.apache.stratos.manager.console/themes/theme1/partials/configure_stratos.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/themes/theme1/partials/configure_stratos.hbs b/components/org.apache.stratos.manager.console/themes/theme1/partials/configure_stratos.hbs
index de28e72..7759df1 100644
--- a/components/org.apache.stratos.manager.console/themes/theme1/partials/configure_stratos.hbs
+++ b/components/org.apache.stratos.manager.console/themes/theme1/partials/configure_stratos.hbs
@@ -1,3 +1,4 @@
+<div>kkakaka</div>
<div class="container content-starter">
<div class="row">
<div class="col-lg-12">
@@ -43,59 +44,5 @@
</div>
</div>
</div>
-
- <script>
- $(function(){
- $('pre').each(function () {
- var jsonStr = $(this).html();
- jsonStr = jsonStr.replace(/\'/g,'\"');
- var obj = jQuery.parseJSON(jsonStr);
- jsonStr = JSON.stringify(obj, undefined, 2);
- $('textarea',$(this).parent()).val(jsonStr);
- $(this).html(syntaxHighlight(jsonStr));
- });
- $('.js_jsonEdit').click(function(){
- var $container = $(this).parent();
- $(this).hide();
- var preHeight = $('pre',$container).height();
- $('.js_jsonEdit',$container).hide();
- $('pre',$container).hide();
- $('textarea',$container).show().height(preHeight);
- $('.js_jsonCancel',$container).show();
- $('.js_jsonSave',$container).show();
- });
- $('.js_jsonSave').click(function(){
- alert('save - ' + $('textarea',$(this).parent()).val())
- });
- $('.js_jsonCancel').click(function(){
- var $container = $(this).parent();
- $('.js_jsonEdit', $container).show();
- $('pre', $container).show();
- $('textarea', $container).hide();
- $('.js_jsonCancel', $container).hide();
- $('.js_jsonSave', $container).hide();
- });
- });
-
- function syntaxHighlight(json) {
- if (typeof json != 'string') {
- json = JSON.stringify(json, undefined, 2);
- }
- json = json.replace(/&/g, '&').replace(/</g, '<').replace(/>/g, '>');
- return json.replace(/("(\\u[a-zA-Z0-9]{4}|\\[^u]|[^\\"])*"(\s*:)?|\b(true|false|null)\b|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?)/g, function (match) {
- var cls = 'number';
- if (/^"/.test(match)) {
- if (/:$/.test(match)) {
- cls = 'key';
- } else {
- cls = 'string';
- }
- } else if (/true|false/.test(match)) {
- cls = 'boolean';
- } else if (/null/.test(match)) {
- cls = 'null';
- }
- return '<span class="' + cls + '">' + match + '</span>';
- });
- }
- </script>
\ No newline at end of file
+<script src="{{url "/themes/theme1/ui/js/utils.js"}}"></script>
+<script src="{{url "/themes/theme1/ui/js/configure_stratos.js"}}"></script>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/73326f9a/components/org.apache.stratos.manager.console/themes/theme1/partials/header.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/themes/theme1/partials/header.hbs b/components/org.apache.stratos.manager.console/themes/theme1/partials/header.hbs
index a782926..673070f 100644
--- a/components/org.apache.stratos.manager.console/themes/theme1/partials/header.hbs
+++ b/components/org.apache.stratos.manager.console/themes/theme1/partials/header.hbs
@@ -19,9 +19,9 @@
</div>
<div class="col-lg-9 custom-nav">
<ul class="pull-left">
- <li {{#if dashboard}} class="active" {{/if}}><a href="{{url "/"}}"><i class="icon-dashboard"></i> <span><br>Dashboard</span></a></li>
- <li {{#if configure_stratos}} class="active" {{/if}}><a href="{{url "/configure_stratos.jag"}}"><i class="icon-cogs"></i> <span><br>Configure Stratos</span></a></li>
- <li {{#if tenant_mgt}} class="active" {{/if}}><a href="{{url "/"}}"><i class="icon-user"></i> <span><br>Tenant Mgt</span></a></li>
+ <li {{#if dashboard}} class="active" {{/if}}><a href="{{url "/"}}"><i class="fa fa-dashboard"></i> <span><br>Dashboard</span></a></li>
+ <li {{#if partition_deployments}} class="active" {{/if}}><a href="{{url "/partition_deployments.jag"}}"><i class="fa fa-cogs"></i> <span><br>Configure Stratos</span></a></li>
+ <li {{#if tenant_mgt}} class="active" {{/if}}><a href="{{url "/"}}"><i class="fa fa-user"></i> <span><br>Tenant Mgt</span></a></li>
<li {{#if my_cartridges}} class="active" {{/if}}><a href="{{url "/"}}"><i class="icons-cartridge"></i> <span><br>My Cartridges</span></a></li>
</ul>
<ul class="pull-right">
@@ -46,16 +46,60 @@
{{/if}}
{{#unless has_help}}
<ul class="sub-menu">
- <li {{#if pa_deploy}} class="active" {{/if}}><a href="{{url "/" }}">Partition Deployments</a></li>
- <li {{#if po_deploy}} class="active" {{/if}}><a href="{{url "/" }}">Policy Deployments</a></li>
- <li {{#if lbs}} class="active" {{/if}}><a href="{{url "/" }}">LBs</a></li>
- <li {{#if c_deploy}} class="active" {{/if}}><a href="{{url "/" }}">Cartridge Deployments</a></li>
- <li {{#if mt_deploy}} class="active" {{/if}}><a href="{{url "/" }}">Multi-Tenant Service Deployments</a></li>
+ <li {{#if partition_deployments}} class="active" {{/if}}>
+ {{#if config_status.first_use}}
+ <span>Partition Deployments</span>
+ {{else}}
+ <a href="{{url "/partition_deployments.jag" }}">Partition Deployments</a>
+ {{/if}}
+ </li>
+ <li {{#if policy_deployments}} class="active" {{/if}}>
+ {{#if config_status.first_use}}
+ <span>Policy Deployments</span>
+ {{else}}
+ <a href="{{url "/policy_deployments.jag" }}">Policy Deployments</a>
+ {{/if}}
+ </li>
+ <li {{#if lbs}} class="active" {{/if}}>
+ {{#if config_status.first_use}}
+ <span>LBs</span>
+ {{else}}
+ <a href="{{url "/lbs.jag" }}">LBs</a>
+ {{/if}}
+ </li>
+ <li {{#if cartridge_deployments}} class="active" {{/if}}>
+ {{#if config_status.first_use}}
+ <span>Cartridge Deployments</span>
+ {{else}}
+ <a href="{{url "/cartridge_deployments.jag" }}">Cartridge Deployments</a>
+ {{/if}}
+ </li>
+ <li {{#if mt_service_deployments}} class="active" {{/if}}>
+ {{#if config_status.first_use}}
+ <span>Multi-Tenant Service Deployments</span>
+ {{else}}
+ <a href="{{url "/mt_service_deployments.jag" }}">Multi-Tenant Service Deployments</a>
+ {{/if}}
+ </li>
</ul>
{{/unless}}
</div>
</div>
</div>
</div>
+ {{#if config_status.not_complete}}
+ <div class="info-bar">
+ <div class="container">
+ <div class="row">
+ <div class="col-lg-3">
+ </div>
+ <div class="col-lg-6">
+ <i class="icon-exclamation"></i> Configure Stratos is not completed. <a>Take the Wizard</a>
+ </div>
+ </div>
+ </div>
+ </div>
+ {{/if}}
</div>
+
{{/unless}}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/73326f9a/components/org.apache.stratos.manager.console/themes/theme1/partials/lbs.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/themes/theme1/partials/lbs.hbs b/components/org.apache.stratos.manager.console/themes/theme1/partials/lbs.hbs
new file mode 100644
index 0000000..e69de29
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/73326f9a/components/org.apache.stratos.manager.console/themes/theme1/partials/mt_service_deployments.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/themes/theme1/partials/mt_service_deployments.hbs b/components/org.apache.stratos.manager.console/themes/theme1/partials/mt_service_deployments.hbs
new file mode 100644
index 0000000..e69de29
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/73326f9a/components/org.apache.stratos.manager.console/themes/theme1/partials/partition_deployments.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/themes/theme1/partials/partition_deployments.hbs b/components/org.apache.stratos.manager.console/themes/theme1/partials/partition_deployments.hbs
new file mode 100644
index 0000000..87930b7
--- /dev/null
+++ b/components/org.apache.stratos.manager.console/themes/theme1/partials/partition_deployments.hbs
@@ -0,0 +1,129 @@
+{{#unless config_status.first_use}}
+<div class="container content-starter">
+ <div class="row">
+ <div class="col-lg-12">
+ <h1>{{title}}</h1>
+ </div>
+ </div>
+</div>
+<div class="container" style="display: none;" id="addItemSection">
+ <div class="row">
+ <div class="col-md-12">
+ <h2>Deploy New Partition</h2>
+ <form role="form">
+ <label for="policy" class="required">Partition Configuration</label>
+
+ <div class="container">
+ <div class="row">
+ <div class="col-md-6 padding-remover-left">
+ <textarea class="form-control" rows="11" id="policy"></textarea>
+ <button type="button" class="btn btn-primary" id="deployPolicy">Deploy Partition</button>
+ <a>Cancel</a>
+ </div>
+ <div class="col-md-6">
+ <i class="icons-help"></i>
+ Example configuration:
+ <pre>
+ {
+ "partition":{
+ "id": "P1",
+ "provider": "ec2",
+ "property": [
+ {
+ "name": "region",
+ "value": "ap-southeast-1"
+ }
+ ],
+ "partitionMin": "1",
+ "partitionMax": "3"
+ }
+ }
+ </pre>
+ </div>
+ </div>
+
+ </div>
+
+
+ </form>
+
+ </div>
+ </div>
+ </div>
+
+<div class="container">
+
+ <div class="row">
+ <div class="col-md-12">
+
+
+ <div class="panel-group" id="accordion">
+
+
+ {{#each partition_deployments}}
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h4 class="panel-title">
+ <a data-toggle="collapse" data-parent="#accordion" href="#collapse{{key}}">
+ {{name}}
+ </a>
+ </h4>
+ </div>
+ <div id="collapse{{key}}" class="panel-collapse collapse">
+ <div class="panel-body">
+ <pre>{{policy}}</pre>
+ <textarea style="display:none" class="jsonEditor">{{policy}}</textarea>
+ <button class="btn btn-primary js_jsonEdit">Edit</button>
+ <button class="btn btn-primary js_jsonSave" style="display:none">Save</button>
+ <a class="js_jsonCancel" style="display:none">Cancel</a>
+ </div>
+ </div>
+ </div>
+ {{/each}}
+
+
+
+ </div>
+ </div>
+ </div>
+</div>
+<script src="{{url "/themes/theme1/ui/js/utils.js"}}"></script>
+<script src="{{url "/themes/theme1/ui/js/configure_stratos.js"}}"></script>
+{{/unless}}
+{{#if config_status.first_use}}
+<div class="container content-starter">
+ <div class="row">
+ <div class="col-lg-12">
+ <h1>{{title}}</h1>
+ </div>
+ </div>
+</div>
+<div class="container">
+ <div class="row">
+ <div class="col-md-3">
+ <a href="/console/cartridges.jag" class="btn btn-important"><i class=""></i> Take the configuration Wizard</a>
+ </div>
+ <div class="col-md-1">
+ <i class="icons-help"></i>
+ </div>
+ <div class="col-md-8">
+ <p>Stratos is not configured yet. Each step needs to be done in the correct order.</p>
+ <i class="fa fa-arrow-circle-down color-a-full-icons"></i>
+ <p>Partition deployment</p>
+ <i class="fa fa-arrow-circle-down color-a-full-icons"></i>
+
+ <p>Policy deployment</p>
+ <i class="fa fa-arrow-circle-down color-a-full-icons"></i>
+
+ <p>LB Creation</p>
+ <i class="fa fa-arrow-circle-down color-a-full-icons"></i>
+
+ <p>Cartridge Deployment</p>
+ <i class="fa fa-arrow-circle-down color-a-full-icons"></i>
+
+ <p>Multi-Tenant Service Deployments</p>
+
+ </div>
+ </div>
+</div>
+{{/if}}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/73326f9a/components/org.apache.stratos.manager.console/themes/theme1/partials/policy_deployments.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/themes/theme1/partials/policy_deployments.hbs b/components/org.apache.stratos.manager.console/themes/theme1/partials/policy_deployments.hbs
new file mode 100644
index 0000000..e69de29
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/73326f9a/components/org.apache.stratos.manager.console/themes/theme1/renderers/cartridge_deployments.js
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/themes/theme1/renderers/cartridge_deployments.js b/components/org.apache.stratos.manager.console/themes/theme1/renderers/cartridge_deployments.js
new file mode 100644
index 0000000..8f8e3cb
--- /dev/null
+++ b/components/org.apache.stratos.manager.console/themes/theme1/renderers/cartridge_deployments.js
@@ -0,0 +1,40 @@
+var render = function (theme, data, meta, require) {
+ for(var i=0;i<data.partition_deployment.length;i++){
+ data.partition_deployment[i].key = data.partition_deployment[i].name.replace(/ /g,'');
+ }
+ theme('index', {
+ body: [
+ {
+ partial: 'cartridge_deployments',
+ context: {
+ title:'Configure Stratos - Cartridge Deployments',
+ partition_deployment:data.partition_deployment
+ }
+ }
+ ],
+ header: [
+ {
+ partial: 'header',
+ context:{
+ title:'Configure Stratos',
+ configure_stratos:true,
+ button:{
+ link:'/',
+ name:'Deploy New Partition',
+ class_name:"btn-important"
+ },
+ has_help:false,
+ cartridge_deployments:true
+ }
+ }
+ ],
+ title:[
+ {
+ partial:'title',
+ context:{
+ title:"My Cartridges"
+ }
+ }
+ ]
+ });
+};
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/73326f9a/components/org.apache.stratos.manager.console/themes/theme1/renderers/configure_stratos.js
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/themes/theme1/renderers/configure_stratos.js b/components/org.apache.stratos.manager.console/themes/theme1/renderers/configure_stratos.js
index cb203a5..0f585ee 100644
--- a/components/org.apache.stratos.manager.console/themes/theme1/renderers/configure_stratos.js
+++ b/components/org.apache.stratos.manager.console/themes/theme1/renderers/configure_stratos.js
@@ -2,13 +2,15 @@ var render = function (theme, data, meta, require) {
for(var i=0;i<data.partition_deployment.length;i++){
data.partition_deployment[i].key = data.partition_deployment[i].name.replace(/ /g,'');
}
+
theme('index', {
body: [
{
partial: 'configure_stratos',
context: {
title:'Configure Stratos',
- partition_deployment:data.partition_deployment
+ partition_deployment:data.partition_deployment,
+ config_status:data.config_status
}
}
],
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/73326f9a/components/org.apache.stratos.manager.console/themes/theme1/renderers/lbs.js
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/themes/theme1/renderers/lbs.js b/components/org.apache.stratos.manager.console/themes/theme1/renderers/lbs.js
new file mode 100644
index 0000000..eb388da
--- /dev/null
+++ b/components/org.apache.stratos.manager.console/themes/theme1/renderers/lbs.js
@@ -0,0 +1,40 @@
+var render = function (theme, data, meta, require) {
+ for(var i=0;i<data.partition_deployment.length;i++){
+ data.partition_deployment[i].key = data.partition_deployment[i].name.replace(/ /g,'');
+ }
+ theme('index', {
+ body: [
+ {
+ partial: 'lbs',
+ context: {
+ title:'Configure Stratos - Lbs',
+ partition_deployment:data.partition_deployment
+ }
+ }
+ ],
+ header: [
+ {
+ partial: 'header',
+ context:{
+ title:'Configure Stratos',
+ configure_stratos:true,
+ button:{
+ link:'/',
+ name:'Deploy New Partition',
+ class_name:"btn-important"
+ },
+ has_help:false,
+ lbs:true
+ }
+ }
+ ],
+ title:[
+ {
+ partial:'title',
+ context:{
+ title:"My Cartridges"
+ }
+ }
+ ]
+ });
+};
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/73326f9a/components/org.apache.stratos.manager.console/themes/theme1/renderers/mt_service_deployments.js
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/themes/theme1/renderers/mt_service_deployments.js b/components/org.apache.stratos.manager.console/themes/theme1/renderers/mt_service_deployments.js
new file mode 100644
index 0000000..ce2cd09
--- /dev/null
+++ b/components/org.apache.stratos.manager.console/themes/theme1/renderers/mt_service_deployments.js
@@ -0,0 +1,40 @@
+var render = function (theme, data, meta, require) {
+ for(var i=0;i<data.partition_deployment.length;i++){
+ data.partition_deployment[i].key = data.partition_deployment[i].name.replace(/ /g,'');
+ }
+ theme('index', {
+ body: [
+ {
+ partial: 'mt_service_deployments',
+ context: {
+ title:'Configure Stratos - MT Service Deployments',
+ partition_deployment:data.partition_deployment
+ }
+ }
+ ],
+ header: [
+ {
+ partial: 'header',
+ context:{
+ title:'Configure Stratos',
+ configure_stratos:true,
+ button:{
+ link:'/',
+ name:'Deploy New Partition',
+ class_name:"btn-important"
+ },
+ has_help:false,
+ mt_service_deployments:true
+ }
+ }
+ ],
+ title:[
+ {
+ partial:'title',
+ context:{
+ title:"My Cartridges"
+ }
+ }
+ ]
+ });
+};
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/73326f9a/components/org.apache.stratos.manager.console/themes/theme1/renderers/partition_deployments.js
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/themes/theme1/renderers/partition_deployments.js b/components/org.apache.stratos.manager.console/themes/theme1/renderers/partition_deployments.js
new file mode 100644
index 0000000..955e0e3
--- /dev/null
+++ b/components/org.apache.stratos.manager.console/themes/theme1/renderers/partition_deployments.js
@@ -0,0 +1,47 @@
+var render = function (theme, data, meta, require) {
+ for(var i=0;i<data.partition_deployments.length;i++){
+ data.partition_deployments[i].key = data.partition_deployments[i].name.replace(/ /g,'');
+ }
+ var create_btn_class = 'btn-important js_handle_click';
+ var title = 'Configure Stratos - Partition Deployments';
+ if(data.config_status.first_use){
+ create_btn_class = "btn-default js_handle_click";
+ title = 'Configure Stratos';
+ }
+ theme('index', {
+ body: [
+ {
+ partial: 'partition_deployments',
+ context: {
+ title:title,
+ partition_deployments:data.partition_deployments,
+ config_status:data.config_status
+ }
+ }
+ ],
+ header: [
+ {
+ partial: 'header',
+ context:{
+ title:'Configure Stratos',
+ button:{
+ link:'/',
+ name:'Deploy New Partition',
+ class_name:create_btn_class
+ },
+ has_help:false,
+ partition_deployments:true,
+ config_status:data.config_status
+ }
+ }
+ ],
+ title:[
+ {
+ partial:'title',
+ context:{
+ title:title
+ }
+ }
+ ]
+ });
+};
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/73326f9a/components/org.apache.stratos.manager.console/themes/theme1/renderers/policy_deployments.js
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/themes/theme1/renderers/policy_deployments.js b/components/org.apache.stratos.manager.console/themes/theme1/renderers/policy_deployments.js
new file mode 100644
index 0000000..5fcf81d
--- /dev/null
+++ b/components/org.apache.stratos.manager.console/themes/theme1/renderers/policy_deployments.js
@@ -0,0 +1,40 @@
+var render = function (theme, data, meta, require) {
+ for(var i=0;i<data.policy_deployments.length;i++){
+ data.policy_deployments[i].key = data.policy_deployments[i].name.replace(/ /g,'');
+ }
+ theme('index', {
+ body: [
+ {
+ partial: 'policy_deployments',
+ context: {
+ title:'Configure Stratos - Policy Deployments',
+ policy_deployments:data.policy_deployments
+ }
+ }
+ ],
+ header: [
+ {
+ partial: 'header',
+ context:{
+ title:'Configure Stratos',
+ configure_stratos:true,
+ button:{
+ link:'/',
+ name:'Deploy New Partition',
+ class_name:"btn-important"
+ },
+ has_help:false,
+ policy_deployments:true
+ }
+ }
+ ],
+ title:[
+ {
+ partial:'title',
+ context:{
+ title:"My Cartridges"
+ }
+ }
+ ]
+ });
+};
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/73326f9a/components/org.apache.stratos.manager.console/themes/theme1/ui/css/main.css
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/themes/theme1/ui/css/main.css b/components/org.apache.stratos.manager.console/themes/theme1/ui/css/main.css
index 0350589..aa1363d 100644
--- a/components/org.apache.stratos.manager.console/themes/theme1/ui/css/main.css
+++ b/components/org.apache.stratos.manager.console/themes/theme1/ui/css/main.css
@@ -199,7 +199,7 @@ body {
.help-section p {
font-size: 12px;
}
-.help-section i{
+.icons-help{
font-size: 34px;
color:#a4a6a6;
display: block;
@@ -207,7 +207,7 @@ body {
margin-right:10px;
}
.content-starter{
- margin-top: 130px;
+ margin-top: 125px;
}
h1{
color:#575757;
@@ -321,8 +321,16 @@ h4{
background: #ffae00;
color:#3d3d3d;
}
+.sub-menu li span{
+ display:block;
+ padding:15px 10px;
+ border-left: solid 1px #f2f5f5;
+ border-right: solid 1px #d1d3d3;
+ height: 55px;
+ color:#999;
+}
-
+/* syntax highlight styles */
pre {border:none;background: transparent }
.string { color: green; }
.number { color: darkorange; }
@@ -332,4 +340,24 @@ pre {border:none;background: transparent }
textarea{display: block;}
textarea.jsonEditor{
width:100%;
+}
+/*syntax highlight styles */
+.info-bar{
+ background: #ffe096;
+ position: absolute;
+ width:100%;
+ margin-top:-10px;
+}
+.color-a-full-icons{
+ color:#ff9000;
+ font-size:30px;
+}
+.panel-heading{
+ padding:5px 10px;
+}
+.padding-remover-left{
+ padding-left:0;
+}
+label.required{
+ font-weight: bold;
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/73326f9a/components/org.apache.stratos.manager.console/themes/theme1/ui/font-awesome/css/font-awesome.css
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/themes/theme1/ui/font-awesome/css/font-awesome.css b/components/org.apache.stratos.manager.console/themes/theme1/ui/font-awesome/css/font-awesome.css
index 7ede182..048cff9 100644
--- a/components/org.apache.stratos.manager.console/themes/theme1/ui/font-awesome/css/font-awesome.css
+++ b/components/org.apache.stratos.manager.console/themes/theme1/ui/font-awesome/css/font-awesome.css
@@ -1,145 +1,69 @@
/*!
- * Font Awesome 3.2.1
- * the iconic font designed for Bootstrap
- * ------------------------------------------------------------------------------
- * The full suite of pictographic icons, examples, and documentation can be
- * found at http://fontawesome.io. Stay up to date on Twitter at
- * http://twitter.com/fontawesome.
- *
- * License
- * ------------------------------------------------------------------------------
- * - The Font Awesome font is licensed under SIL OFL 1.1 -
- * http://scripts.sil.org/OFL
- * - Font Awesome CSS, LESS, and SASS files are licensed under MIT License -
- * http://opensource.org/licenses/mit-license.html
- * - Font Awesome documentation licensed under CC BY 3.0 -
- * http://creativecommons.org/licenses/by/3.0/
- * - Attribution is no longer required in Font Awesome 3.0, but much appreciated:
- * "Font Awesome by Dave Gandy - http://fontawesome.io"
- *
- * Author - Dave Gandy
- * ------------------------------------------------------------------------------
- * Email: dave@fontawesome.io
- * Twitter: http://twitter.com/davegandy
- * Work: Lead Product Designer @ Kyruus - http://kyruus.com
+ * Font Awesome 4.0.3 by @davegandy - http://fontawesome.io - @fontawesome
+ * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
*/
/* FONT PATH
* -------------------------- */
@font-face {
font-family: 'FontAwesome';
- src: url('../font/fontawesome-webfont.eot?v=3.2.1');
- src: url('../font/fontawesome-webfont.eot?#iefix&v=3.2.1') format('embedded-opentype'), url('../font/fontawesome-webfont.woff?v=3.2.1') format('woff'), url('../font/fontawesome-webfont.ttf?v=3.2.1') format('truetype'), url('../font/fontawesome-webfont.svg#fontawesomeregular?v=3.2.1') format('svg');
+ src: url('../fonts/fontawesome-webfont.eot?v=4.0.3');
+ src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.0.3') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff?v=4.0.3') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.0.3') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.0.3#fontawesomeregular') format('svg');
font-weight: normal;
font-style: normal;
}
-/* FONT AWESOME CORE
- * -------------------------- */
-[class^="icon-"],
-[class*=" icon-"] {
+.fa {
+ display: inline-block;
font-family: FontAwesome;
- font-weight: normal;
font-style: normal;
- text-decoration: inherit;
+ font-weight: normal;
+ line-height: 1;
-webkit-font-smoothing: antialiased;
- *margin-right: .3em;
-}
-[class^="icon-"]:before,
-[class*=" icon-"]:before {
- text-decoration: inherit;
- display: inline-block;
- speak: none;
+ -moz-osx-font-smoothing: grayscale;
}
/* makes the font 33% larger relative to the icon container */
-.icon-large:before {
- vertical-align: -10%;
+.fa-lg {
font-size: 1.3333333333333333em;
+ line-height: 0.75em;
+ vertical-align: -15%;
}
-/* makes sure icons active on rollover in links */
-a [class^="icon-"],
-a [class*=" icon-"] {
- display: inline;
+.fa-2x {
+ font-size: 2em;
}
-/* increased font size for icon-large */
-[class^="icon-"].icon-fixed-width,
-[class*=" icon-"].icon-fixed-width {
- display: inline-block;
- width: 1.1428571428571428em;
- text-align: right;
- padding-right: 0.2857142857142857em;
+.fa-3x {
+ font-size: 3em;
}
-[class^="icon-"].icon-fixed-width.icon-large,
-[class*=" icon-"].icon-fixed-width.icon-large {
- width: 1.4285714285714286em;
+.fa-4x {
+ font-size: 4em;
+}
+.fa-5x {
+ font-size: 5em;
}
-.icons-ul {
+.fa-fw {
+ width: 1.2857142857142858em;
+ text-align: center;
+}
+.fa-ul {
+ padding-left: 0;
margin-left: 2.142857142857143em;
list-style-type: none;
}
-.icons-ul > li {
+.fa-ul > li {
position: relative;
}
-.icons-ul .icon-li {
+.fa-li {
position: absolute;
left: -2.142857142857143em;
width: 2.142857142857143em;
+ top: 0.14285714285714285em;
text-align: center;
- line-height: inherit;
}
-[class^="icon-"].hide,
-[class*=" icon-"].hide {
- display: none;
-}
-.icon-muted {
- color: #eeeeee;
-}
-.icon-light {
- color: #ffffff;
+.fa-li.fa-lg {
+ left: -1.8571428571428572em;
}
-.icon-dark {
- color: #333333;
-}
-.icon-border {
- border: solid 1px #eeeeee;
+.fa-border {
padding: .2em .25em .15em;
- -webkit-border-radius: 3px;
- -moz-border-radius: 3px;
- border-radius: 3px;
-}
-.icon-2x {
- font-size: 2em;
-}
-.icon-2x.icon-border {
- border-width: 2px;
- -webkit-border-radius: 4px;
- -moz-border-radius: 4px;
- border-radius: 4px;
-}
-.icon-3x {
- font-size: 3em;
-}
-.icon-3x.icon-border {
- border-width: 3px;
- -webkit-border-radius: 5px;
- -moz-border-radius: 5px;
- border-radius: 5px;
-}
-.icon-4x {
- font-size: 4em;
-}
-.icon-4x.icon-border {
- border-width: 4px;
- -webkit-border-radius: 6px;
- -moz-border-radius: 6px;
- border-radius: 6px;
-}
-.icon-5x {
- font-size: 5em;
-}
-.icon-5x.icon-border {
- border-width: 5px;
- -webkit-border-radius: 7px;
- -moz-border-radius: 7px;
- border-radius: 7px;
+ border: solid 0.08em #eeeeee;
+ border-radius: .1em;
}
.pull-right {
float: right;
@@ -147,147 +71,18 @@ a [class*=" icon-"] {
.pull-left {
float: left;
}
-[class^="icon-"].pull-left,
-[class*=" icon-"].pull-left {
+.fa.pull-left {
margin-right: .3em;
}
-[class^="icon-"].pull-right,
-[class*=" icon-"].pull-right {
+.fa.pull-right {
margin-left: .3em;
}
-/* BOOTSTRAP SPECIFIC CLASSES
- * -------------------------- */
-/* Bootstrap 2.0 sprites.less reset */
-[class^="icon-"],
-[class*=" icon-"] {
- display: inline;
- width: auto;
- height: auto;
- line-height: normal;
- vertical-align: baseline;
- background-image: none;
- background-position: 0% 0%;
- background-repeat: repeat;
- margin-top: 0;
-}
-/* more sprites.less reset */
-.icon-white,
-.nav-pills > .active > a > [class^="icon-"],
-.nav-pills > .active > a > [class*=" icon-"],
-.nav-list > .active > a > [class^="icon-"],
-.nav-list > .active > a > [class*=" icon-"],
-.navbar-inverse .nav > .active > a > [class^="icon-"],
-.navbar-inverse .nav > .active > a > [class*=" icon-"],
-.dropdown-menu > li > a:hover > [class^="icon-"],
-.dropdown-menu > li > a:hover > [class*=" icon-"],
-.dropdown-menu > .active > a > [class^="icon-"],
-.dropdown-menu > .active > a > [class*=" icon-"],
-.dropdown-submenu:hover > a > [class^="icon-"],
-.dropdown-submenu:hover > a > [class*=" icon-"] {
- background-image: none;
-}
-/* keeps Bootstrap styles with and without icons the same */
-.btn [class^="icon-"].icon-large,
-.nav [class^="icon-"].icon-large,
-.btn [class*=" icon-"].icon-large,
-.nav [class*=" icon-"].icon-large {
- line-height: .9em;
-}
-.btn [class^="icon-"].icon-spin,
-.nav [class^="icon-"].icon-spin,
-.btn [class*=" icon-"].icon-spin,
-.nav [class*=" icon-"].icon-spin {
- display: inline-block;
-}
-.nav-tabs [class^="icon-"],
-.nav-pills [class^="icon-"],
-.nav-tabs [class*=" icon-"],
-.nav-pills [class*=" icon-"],
-.nav-tabs [class^="icon-"].icon-large,
-.nav-pills [class^="icon-"].icon-large,
-.nav-tabs [class*=" icon-"].icon-large,
-.nav-pills [class*=" icon-"].icon-large {
- line-height: .9em;
-}
-.btn [class^="icon-"].pull-left.icon-2x,
-.btn [class*=" icon-"].pull-left.icon-2x,
-.btn [class^="icon-"].pull-right.icon-2x,
-.btn [class*=" icon-"].pull-right.icon-2x {
- margin-top: .18em;
-}
-.btn [class^="icon-"].icon-spin.icon-large,
-.btn [class*=" icon-"].icon-spin.icon-large {
- line-height: .8em;
-}
-.btn.btn-small [class^="icon-"].pull-left.icon-2x,
-.btn.btn-small [class*=" icon-"].pull-left.icon-2x,
-.btn.btn-small [class^="icon-"].pull-right.icon-2x,
-.btn.btn-small [class*=" icon-"].pull-right.icon-2x {
- margin-top: .25em;
-}
-.btn.btn-large [class^="icon-"],
-.btn.btn-large [class*=" icon-"] {
- margin-top: 0;
-}
-.btn.btn-large [class^="icon-"].pull-left.icon-2x,
-.btn.btn-large [class*=" icon-"].pull-left.icon-2x,
-.btn.btn-large [class^="icon-"].pull-right.icon-2x,
-.btn.btn-large [class*=" icon-"].pull-right.icon-2x {
- margin-top: .05em;
-}
-.btn.btn-large [class^="icon-"].pull-left.icon-2x,
-.btn.btn-large [class*=" icon-"].pull-left.icon-2x {
- margin-right: .2em;
-}
-.btn.btn-large [class^="icon-"].pull-right.icon-2x,
-.btn.btn-large [class*=" icon-"].pull-right.icon-2x {
- margin-left: .2em;
-}
-/* Fixes alignment in nav lists */
-.nav-list [class^="icon-"],
-.nav-list [class*=" icon-"] {
- line-height: inherit;
-}
-/* EXTRAS
- * -------------------------- */
-/* Stacked and layered icon */
-.icon-stack {
- position: relative;
- display: inline-block;
- width: 2em;
- height: 2em;
- line-height: 2em;
- vertical-align: -35%;
-}
-.icon-stack [class^="icon-"],
-.icon-stack [class*=" icon-"] {
- display: block;
- text-align: center;
- position: absolute;
- width: 100%;
- height: 100%;
- font-size: 1em;
- line-height: inherit;
- *line-height: 2em;
-}
-.icon-stack .icon-stack-base {
- font-size: 2em;
- *line-height: 1em;
-}
-/* Animated rotating icon */
-.icon-spin {
- display: inline-block;
+.fa-spin {
+ -webkit-animation: spin 2s infinite linear;
-moz-animation: spin 2s infinite linear;
-o-animation: spin 2s infinite linear;
- -webkit-animation: spin 2s infinite linear;
animation: spin 2s infinite linear;
}
-/* Prevent stack and spinners from being taken inline when inside a link */
-a .icon-stack,
-a .icon-spin {
- display: inline-block;
- text-decoration: none;
-}
@-moz-keyframes spin {
0% {
-moz-transform: rotate(0deg);
@@ -328,1152 +123,1216 @@ a .icon-spin {
transform: rotate(359deg);
}
}
-/* Icon rotations and mirroring */
-.icon-rotate-90:before {
+.fa-rotate-90 {
+ filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1);
-webkit-transform: rotate(90deg);
-moz-transform: rotate(90deg);
-ms-transform: rotate(90deg);
-o-transform: rotate(90deg);
transform: rotate(90deg);
- filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1);
}
-.icon-rotate-180:before {
+.fa-rotate-180 {
+ filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2);
-webkit-transform: rotate(180deg);
-moz-transform: rotate(180deg);
-ms-transform: rotate(180deg);
-o-transform: rotate(180deg);
transform: rotate(180deg);
- filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2);
}
-.icon-rotate-270:before {
+.fa-rotate-270 {
+ filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3);
-webkit-transform: rotate(270deg);
-moz-transform: rotate(270deg);
-ms-transform: rotate(270deg);
-o-transform: rotate(270deg);
transform: rotate(270deg);
- filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3);
}
-.icon-flip-horizontal:before {
+.fa-flip-horizontal {
+ filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1);
-webkit-transform: scale(-1, 1);
-moz-transform: scale(-1, 1);
-ms-transform: scale(-1, 1);
-o-transform: scale(-1, 1);
transform: scale(-1, 1);
}
-.icon-flip-vertical:before {
+.fa-flip-vertical {
+ filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1);
-webkit-transform: scale(1, -1);
-moz-transform: scale(1, -1);
-ms-transform: scale(1, -1);
-o-transform: scale(1, -1);
transform: scale(1, -1);
}
-/* ensure rotation occurs inside anchor tags */
-a .icon-rotate-90:before,
-a .icon-rotate-180:before,
-a .icon-rotate-270:before,
-a .icon-flip-horizontal:before,
-a .icon-flip-vertical:before {
+.fa-stack {
+ position: relative;
display: inline-block;
+ width: 2em;
+ height: 2em;
+ line-height: 2em;
+ vertical-align: middle;
+}
+.fa-stack-1x,
+.fa-stack-2x {
+ position: absolute;
+ left: 0;
+ width: 100%;
+ text-align: center;
+}
+.fa-stack-1x {
+ line-height: inherit;
+}
+.fa-stack-2x {
+ font-size: 2em;
+}
+.fa-inverse {
+ color: #ffffff;
}
/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
readers do not read off random characters that represent icons */
-.icon-glass:before {
+.fa-glass:before {
content: "\f000";
}
-.icon-music:before {
+.fa-music:before {
content: "\f001";
}
-.icon-search:before {
+.fa-search:before {
content: "\f002";
}
-.icon-envelope-alt:before {
+.fa-envelope-o:before {
content: "\f003";
}
-.icon-heart:before {
+.fa-heart:before {
content: "\f004";
}
-.icon-star:before {
+.fa-star:before {
content: "\f005";
}
-.icon-star-empty:before {
+.fa-star-o:before {
content: "\f006";
}
-.icon-user:before {
+.fa-user:before {
content: "\f007";
}
-.icon-film:before {
+.fa-film:before {
content: "\f008";
}
-.icon-th-large:before {
+.fa-th-large:before {
content: "\f009";
}
-.icon-th:before {
+.fa-th:before {
content: "\f00a";
}
-.icon-th-list:before {
+.fa-th-list:before {
content: "\f00b";
}
-.icon-ok:before {
+.fa-check:before {
content: "\f00c";
}
-.icon-remove:before {
+.fa-times:before {
content: "\f00d";
}
-.icon-zoom-in:before {
+.fa-search-plus:before {
content: "\f00e";
}
-.icon-zoom-out:before {
+.fa-search-minus:before {
content: "\f010";
}
-.icon-power-off:before,
-.icon-off:before {
+.fa-power-off:before {
content: "\f011";
}
-.icon-signal:before {
+.fa-signal:before {
content: "\f012";
}
-.icon-gear:before,
-.icon-cog:before {
+.fa-gear:before,
+.fa-cog:before {
content: "\f013";
}
-.icon-trash:before {
+.fa-trash-o:before {
content: "\f014";
}
-.icon-home:before {
+.fa-home:before {
content: "\f015";
}
-.icon-file-alt:before {
+.fa-file-o:before {
content: "\f016";
}
-.icon-time:before {
+.fa-clock-o:before {
content: "\f017";
}
-.icon-road:before {
+.fa-road:before {
content: "\f018";
}
-.icon-download-alt:before {
+.fa-download:before {
content: "\f019";
}
-.icon-download:before {
+.fa-arrow-circle-o-down:before {
content: "\f01a";
}
-.icon-upload:before {
+.fa-arrow-circle-o-up:before {
content: "\f01b";
}
-.icon-inbox:before {
+.fa-inbox:before {
content: "\f01c";
}
-.icon-play-circle:before {
+.fa-play-circle-o:before {
content: "\f01d";
}
-.icon-rotate-right:before,
-.icon-repeat:before {
+.fa-rotate-right:before,
+.fa-repeat:before {
content: "\f01e";
}
-.icon-refresh:before {
+.fa-refresh:before {
content: "\f021";
}
-.icon-list-alt:before {
+.fa-list-alt:before {
content: "\f022";
}
-.icon-lock:before {
+.fa-lock:before {
content: "\f023";
}
-.icon-flag:before {
+.fa-flag:before {
content: "\f024";
}
-.icon-headphones:before {
+.fa-headphones:before {
content: "\f025";
}
-.icon-volume-off:before {
+.fa-volume-off:before {
content: "\f026";
}
-.icon-volume-down:before {
+.fa-volume-down:before {
content: "\f027";
}
-.icon-volume-up:before {
+.fa-volume-up:before {
content: "\f028";
}
-.icon-qrcode:before {
+.fa-qrcode:before {
content: "\f029";
}
-.icon-barcode:before {
+.fa-barcode:before {
content: "\f02a";
}
-.icon-tag:before {
+.fa-tag:before {
content: "\f02b";
}
-.icon-tags:before {
+.fa-tags:before {
content: "\f02c";
}
-.icon-book:before {
+.fa-book:before {
content: "\f02d";
}
-.icon-bookmark:before {
+.fa-bookmark:before {
content: "\f02e";
}
-.icon-print:before {
+.fa-print:before {
content: "\f02f";
}
-.icon-camera:before {
+.fa-camera:before {
content: "\f030";
}
-.icon-font:before {
+.fa-font:before {
content: "\f031";
}
-.icon-bold:before {
+.fa-bold:before {
content: "\f032";
}
-.icon-italic:before {
+.fa-italic:before {
content: "\f033";
}
-.icon-text-height:before {
+.fa-text-height:before {
content: "\f034";
}
-.icon-text-width:before {
+.fa-text-width:before {
content: "\f035";
}
-.icon-align-left:before {
+.fa-align-left:before {
content: "\f036";
}
-.icon-align-center:before {
+.fa-align-center:before {
content: "\f037";
}
-.icon-align-right:before {
+.fa-align-right:before {
content: "\f038";
}
-.icon-align-justify:before {
+.fa-align-justify:before {
content: "\f039";
}
-.icon-list:before {
+.fa-list:before {
content: "\f03a";
}
-.icon-indent-left:before {
+.fa-dedent:before,
+.fa-outdent:before {
content: "\f03b";
}
-.icon-indent-right:before {
+.fa-indent:before {
content: "\f03c";
}
-.icon-facetime-video:before {
+.fa-video-camera:before {
content: "\f03d";
}
-.icon-picture:before {
+.fa-picture-o:before {
content: "\f03e";
}
-.icon-pencil:before {
+.fa-pencil:before {
content: "\f040";
}
-.icon-map-marker:before {
+.fa-map-marker:before {
content: "\f041";
}
-.icon-adjust:before {
+.fa-adjust:before {
content: "\f042";
}
-.icon-tint:before {
+.fa-tint:before {
content: "\f043";
}
-.icon-edit:before {
+.fa-edit:before,
+.fa-pencil-square-o:before {
content: "\f044";
}
-.icon-share:before {
+.fa-share-square-o:before {
content: "\f045";
}
-.icon-check:before {
+.fa-check-square-o:before {
content: "\f046";
}
-.icon-move:before {
+.fa-arrows:before {
content: "\f047";
}
-.icon-step-backward:before {
+.fa-step-backward:before {
content: "\f048";
}
-.icon-fast-backward:before {
+.fa-fast-backward:before {
content: "\f049";
}
-.icon-backward:before {
+.fa-backward:before {
content: "\f04a";
}
-.icon-play:before {
+.fa-play:before {
content: "\f04b";
}
-.icon-pause:before {
+.fa-pause:before {
content: "\f04c";
}
-.icon-stop:before {
+.fa-stop:before {
content: "\f04d";
}
-.icon-forward:before {
+.fa-forward:before {
content: "\f04e";
}
-.icon-fast-forward:before {
+.fa-fast-forward:before {
content: "\f050";
}
-.icon-step-forward:before {
+.fa-step-forward:before {
content: "\f051";
}
-.icon-eject:before {
+.fa-eject:before {
content: "\f052";
}
-.icon-chevron-left:before {
+.fa-chevron-left:before {
content: "\f053";
}
-.icon-chevron-right:before {
+.fa-chevron-right:before {
content: "\f054";
}
-.icon-plus-sign:before {
+.fa-plus-circle:before {
content: "\f055";
}
-.icon-minus-sign:before {
+.fa-minus-circle:before {
content: "\f056";
}
-.icon-remove-sign:before {
+.fa-times-circle:before {
content: "\f057";
}
-.icon-ok-sign:before {
+.fa-check-circle:before {
content: "\f058";
}
-.icon-question-sign:before {
+.fa-question-circle:before {
content: "\f059";
}
-.icon-info-sign:before {
+.fa-info-circle:before {
content: "\f05a";
}
-.icon-screenshot:before {
+.fa-crosshairs:before {
content: "\f05b";
}
-.icon-remove-circle:before {
+.fa-times-circle-o:before {
content: "\f05c";
}
-.icon-ok-circle:before {
+.fa-check-circle-o:before {
content: "\f05d";
}
-.icon-ban-circle:before {
+.fa-ban:before {
content: "\f05e";
}
-.icon-arrow-left:before {
+.fa-arrow-left:before {
content: "\f060";
}
-.icon-arrow-right:before {
+.fa-arrow-right:before {
content: "\f061";
}
-.icon-arrow-up:before {
+.fa-arrow-up:before {
content: "\f062";
}
-.icon-arrow-down:before {
+.fa-arrow-down:before {
content: "\f063";
}
-.icon-mail-forward:before,
-.icon-share-alt:before {
+.fa-mail-forward:before,
+.fa-share:before {
content: "\f064";
}
-.icon-resize-full:before {
+.fa-expand:before {
content: "\f065";
}
-.icon-resize-small:before {
+.fa-compress:before {
content: "\f066";
}
-.icon-plus:before {
+.fa-plus:before {
content: "\f067";
}
-.icon-minus:before {
+.fa-minus:before {
content: "\f068";
}
-.icon-asterisk:before {
+.fa-asterisk:before {
content: "\f069";
}
-.icon-exclamation-sign:before {
+.fa-exclamation-circle:before {
content: "\f06a";
}
-.icon-gift:before {
+.fa-gift:before {
content: "\f06b";
}
-.icon-leaf:before {
+.fa-leaf:before {
content: "\f06c";
}
-.icon-fire:before {
+.fa-fire:before {
content: "\f06d";
}
-.icon-eye-open:before {
+.fa-eye:before {
content: "\f06e";
}
-.icon-eye-close:before {
+.fa-eye-slash:before {
content: "\f070";
}
-.icon-warning-sign:before {
+.fa-warning:before,
+.fa-exclamation-triangle:before {
content: "\f071";
}
-.icon-plane:before {
+.fa-plane:before {
content: "\f072";
}
-.icon-calendar:before {
+.fa-calendar:before {
content: "\f073";
}
-.icon-random:before {
+.fa-random:before {
content: "\f074";
}
-.icon-comment:before {
+.fa-comment:before {
content: "\f075";
}
-.icon-magnet:before {
+.fa-magnet:before {
content: "\f076";
}
-.icon-chevron-up:before {
+.fa-chevron-up:before {
content: "\f077";
}
-.icon-chevron-down:before {
+.fa-chevron-down:before {
content: "\f078";
}
-.icon-retweet:before {
+.fa-retweet:before {
content: "\f079";
}
-.icon-shopping-cart:before {
+.fa-shopping-cart:before {
content: "\f07a";
}
-.icon-folder-close:before {
+.fa-folder:before {
content: "\f07b";
}
-.icon-folder-open:before {
+.fa-folder-open:before {
content: "\f07c";
}
-.icon-resize-vertical:before {
+.fa-arrows-v:before {
content: "\f07d";
}
-.icon-resize-horizontal:before {
+.fa-arrows-h:before {
content: "\f07e";
}
-.icon-bar-chart:before {
+.fa-bar-chart-o:before {
content: "\f080";
}
-.icon-twitter-sign:before {
+.fa-twitter-square:before {
content: "\f081";
}
-.icon-facebook-sign:before {
+.fa-facebook-square:before {
content: "\f082";
}
-.icon-camera-retro:before {
+.fa-camera-retro:before {
content: "\f083";
}
-.icon-key:before {
+.fa-key:before {
content: "\f084";
}
-.icon-gears:before,
-.icon-cogs:before {
+.fa-gears:before,
+.fa-cogs:before {
content: "\f085";
}
-.icon-comments:before {
+.fa-comments:before {
content: "\f086";
}
-.icon-thumbs-up-alt:before {
+.fa-thumbs-o-up:before {
content: "\f087";
}
-.icon-thumbs-down-alt:before {
+.fa-thumbs-o-down:before {
content: "\f088";
}
-.icon-star-half:before {
+.fa-star-half:before {
content: "\f089";
}
-.icon-heart-empty:before {
+.fa-heart-o:before {
content: "\f08a";
}
-.icon-signout:before {
+.fa-sign-out:before {
content: "\f08b";
}
-.icon-linkedin-sign:before {
+.fa-linkedin-square:before {
content: "\f08c";
}
-.icon-pushpin:before {
+.fa-thumb-tack:before {
content: "\f08d";
}
-.icon-external-link:before {
+.fa-external-link:before {
content: "\f08e";
}
-.icon-signin:before {
+.fa-sign-in:before {
content: "\f090";
}
-.icon-trophy:before {
+.fa-trophy:before {
content: "\f091";
}
-.icon-github-sign:before {
+.fa-github-square:before {
content: "\f092";
}
-.icon-upload-alt:before {
+.fa-upload:before {
content: "\f093";
}
-.icon-lemon:before {
+.fa-lemon-o:before {
content: "\f094";
}
-.icon-phone:before {
+.fa-phone:before {
content: "\f095";
}
-.icon-unchecked:before,
-.icon-check-empty:before {
+.fa-square-o:before {
content: "\f096";
}
-.icon-bookmark-empty:before {
+.fa-bookmark-o:before {
content: "\f097";
}
-.icon-phone-sign:before {
+.fa-phone-square:before {
content: "\f098";
}
-.icon-twitter:before {
+.fa-twitter:before {
content: "\f099";
}
-.icon-facebook:before {
+.fa-facebook:before {
content: "\f09a";
}
-.icon-github:before {
+.fa-github:before {
content: "\f09b";
}
-.icon-unlock:before {
+.fa-unlock:before {
content: "\f09c";
}
-.icon-credit-card:before {
+.fa-credit-card:before {
content: "\f09d";
}
-.icon-rss:before {
+.fa-rss:before {
content: "\f09e";
}
-.icon-hdd:before {
+.fa-hdd-o:before {
content: "\f0a0";
}
-.icon-bullhorn:before {
+.fa-bullhorn:before {
content: "\f0a1";
}
-.icon-bell:before {
- content: "\f0a2";
+.fa-bell:before {
+ content: "\f0f3";
}
-.icon-certificate:before {
+.fa-certificate:before {
content: "\f0a3";
}
-.icon-hand-right:before {
+.fa-hand-o-right:before {
content: "\f0a4";
}
-.icon-hand-left:before {
+.fa-hand-o-left:before {
content: "\f0a5";
}
-.icon-hand-up:before {
+.fa-hand-o-up:before {
content: "\f0a6";
}
-.icon-hand-down:before {
+.fa-hand-o-down:before {
content: "\f0a7";
}
-.icon-circle-arrow-left:before {
+.fa-arrow-circle-left:before {
content: "\f0a8";
}
-.icon-circle-arrow-right:before {
+.fa-arrow-circle-right:before {
content: "\f0a9";
}
-.icon-circle-arrow-up:before {
+.fa-arrow-circle-up:before {
content: "\f0aa";
}
-.icon-circle-arrow-down:before {
+.fa-arrow-circle-down:before {
content: "\f0ab";
}
-.icon-globe:before {
+.fa-globe:before {
content: "\f0ac";
}
-.icon-wrench:before {
+.fa-wrench:before {
content: "\f0ad";
}
-.icon-tasks:before {
+.fa-tasks:before {
content: "\f0ae";
}
-.icon-filter:before {
+.fa-filter:before {
content: "\f0b0";
}
-.icon-briefcase:before {
+.fa-briefcase:before {
content: "\f0b1";
}
-.icon-fullscreen:before {
+.fa-arrows-alt:before {
content: "\f0b2";
}
-.icon-group:before {
+.fa-group:before,
+.fa-users:before {
content: "\f0c0";
}
-.icon-link:before {
+.fa-chain:before,
+.fa-link:before {
content: "\f0c1";
}
-.icon-cloud:before {
+.fa-cloud:before {
content: "\f0c2";
}
-.icon-beaker:before {
+.fa-flask:before {
content: "\f0c3";
}
-.icon-cut:before {
+.fa-cut:before,
+.fa-scissors:before {
content: "\f0c4";
}
-.icon-copy:before {
+.fa-copy:before,
+.fa-files-o:before {
content: "\f0c5";
}
-.icon-paperclip:before,
-.icon-paper-clip:before {
+.fa-paperclip:before {
content: "\f0c6";
}
-.icon-save:before {
+.fa-save:before,
+.fa-floppy-o:before {
content: "\f0c7";
}
-.icon-sign-blank:before {
+.fa-square:before {
content: "\f0c8";
}
-.icon-reorder:before {
+.fa-bars:before {
content: "\f0c9";
}
-.icon-list-ul:before {
+.fa-list-ul:before {
content: "\f0ca";
}
-.icon-list-ol:before {
+.fa-list-ol:before {
content: "\f0cb";
}
-.icon-strikethrough:before {
+.fa-strikethrough:before {
content: "\f0cc";
}
-.icon-underline:before {
+.fa-underline:before {
content: "\f0cd";
}
-.icon-table:before {
+.fa-table:before {
content: "\f0ce";
}
-.icon-magic:before {
+.fa-magic:before {
content: "\f0d0";
}
-.icon-truck:before {
+.fa-truck:before {
content: "\f0d1";
}
-.icon-pinterest:before {
+.fa-pinterest:before {
content: "\f0d2";
}
-.icon-pinterest-sign:before {
+.fa-pinterest-square:before {
content: "\f0d3";
}
-.icon-google-plus-sign:before {
+.fa-google-plus-square:before {
content: "\f0d4";
}
-.icon-google-plus:before {
+.fa-google-plus:before {
content: "\f0d5";
}
-.icon-money:before {
+.fa-money:before {
content: "\f0d6";
}
-.icon-caret-down:before {
+.fa-caret-down:before {
content: "\f0d7";
}
-.icon-caret-up:before {
+.fa-caret-up:before {
content: "\f0d8";
}
-.icon-caret-left:before {
+.fa-caret-left:before {
content: "\f0d9";
}
-.icon-caret-right:before {
+.fa-caret-right:before {
content: "\f0da";
}
-.icon-columns:before {
+.fa-columns:before {
content: "\f0db";
}
-.icon-sort:before {
+.fa-unsorted:before,
+.fa-sort:before {
content: "\f0dc";
}
-.icon-sort-down:before {
+.fa-sort-down:before,
+.fa-sort-asc:before {
content: "\f0dd";
}
-.icon-sort-up:before {
+.fa-sort-up:before,
+.fa-sort-desc:before {
content: "\f0de";
}
-.icon-envelope:before {
+.fa-envelope:before {
content: "\f0e0";
}
-.icon-linkedin:before {
+.fa-linkedin:before {
content: "\f0e1";
}
-.icon-rotate-left:before,
-.icon-undo:before {
+.fa-rotate-left:before,
+.fa-undo:before {
content: "\f0e2";
}
-.icon-legal:before {
+.fa-legal:before,
+.fa-gavel:before {
content: "\f0e3";
}
-.icon-dashboard:before {
+.fa-dashboard:before,
+.fa-tachometer:before {
content: "\f0e4";
}
-.icon-comment-alt:before {
+.fa-comment-o:before {
content: "\f0e5";
}
-.icon-comments-alt:before {
+.fa-comments-o:before {
content: "\f0e6";
}
-.icon-bolt:before {
+.fa-flash:before,
+.fa-bolt:before {
content: "\f0e7";
}
-.icon-sitemap:before {
+.fa-sitemap:before {
content: "\f0e8";
}
-.icon-umbrella:before {
+.fa-umbrella:before {
content: "\f0e9";
}
-.icon-paste:before {
+.fa-paste:before,
+.fa-clipboard:before {
content: "\f0ea";
}
-.icon-lightbulb:before {
+.fa-lightbulb-o:before {
content: "\f0eb";
}
-.icon-exchange:before {
+.fa-exchange:before {
content: "\f0ec";
}
-.icon-cloud-download:before {
+.fa-cloud-download:before {
content: "\f0ed";
}
-.icon-cloud-upload:before {
+.fa-cloud-upload:before {
content: "\f0ee";
}
-.icon-user-md:before {
+.fa-user-md:before {
content: "\f0f0";
}
-.icon-stethoscope:before {
+.fa-stethoscope:before {
content: "\f0f1";
}
-.icon-suitcase:before {
+.fa-suitcase:before {
content: "\f0f2";
}
-.icon-bell-alt:before {
- content: "\f0f3";
+.fa-bell-o:before {
+ content: "\f0a2";
}
-.icon-coffee:before {
+.fa-coffee:before {
content: "\f0f4";
}
-.icon-food:before {
+.fa-cutlery:before {
content: "\f0f5";
}
-.icon-file-text-alt:before {
+.fa-file-text-o:before {
content: "\f0f6";
}
-.icon-building:before {
+.fa-building-o:before {
content: "\f0f7";
}
-.icon-hospital:before {
+.fa-hospital-o:before {
content: "\f0f8";
}
-.icon-ambulance:before {
+.fa-ambulance:before {
content: "\f0f9";
}
-.icon-medkit:before {
+.fa-medkit:before {
content: "\f0fa";
}
-.icon-fighter-jet:before {
+.fa-fighter-jet:before {
content: "\f0fb";
}
-.icon-beer:before {
+.fa-beer:before {
content: "\f0fc";
}
-.icon-h-sign:before {
+.fa-h-square:before {
content: "\f0fd";
}
-.icon-plus-sign-alt:before {
+.fa-plus-square:before {
content: "\f0fe";
}
-.icon-double-angle-left:before {
+.fa-angle-double-left:before {
content: "\f100";
}
-.icon-double-angle-right:before {
+.fa-angle-double-right:before {
content: "\f101";
}
-.icon-double-angle-up:before {
+.fa-angle-double-up:before {
content: "\f102";
}
-.icon-double-angle-down:before {
+.fa-angle-double-down:before {
content: "\f103";
}
-.icon-angle-left:before {
+.fa-angle-left:before {
content: "\f104";
}
-.icon-angle-right:before {
+.fa-angle-right:before {
content: "\f105";
}
-.icon-angle-up:before {
+.fa-angle-up:before {
content: "\f106";
}
-.icon-angle-down:before {
+.fa-angle-down:before {
content: "\f107";
}
-.icon-desktop:before {
+.fa-desktop:before {
content: "\f108";
}
-.icon-laptop:before {
+.fa-laptop:before {
content: "\f109";
}
-.icon-tablet:before {
+.fa-tablet:before {
content: "\f10a";
}
-.icon-mobile-phone:before {
+.fa-mobile-phone:before,
+.fa-mobile:before {
content: "\f10b";
}
-.icon-circle-blank:before {
+.fa-circle-o:before {
content: "\f10c";
}
-.icon-quote-left:before {
+.fa-quote-left:before {
content: "\f10d";
}
-.icon-quote-right:before {
+.fa-quote-right:before {
content: "\f10e";
}
-.icon-spinner:before {
+.fa-spinner:before {
content: "\f110";
}
-.icon-circle:before {
+.fa-circle:before {
content: "\f111";
}
-.icon-mail-reply:before,
-.icon-reply:before {
+.fa-mail-reply:before,
+.fa-reply:before {
content: "\f112";
}
-.icon-github-alt:before {
+.fa-github-alt:before {
content: "\f113";
}
-.icon-folder-close-alt:before {
+.fa-folder-o:before {
content: "\f114";
}
-.icon-folder-open-alt:before {
+.fa-folder-open-o:before {
content: "\f115";
}
-.icon-expand-alt:before {
- content: "\f116";
-}
-.icon-collapse-alt:before {
- content: "\f117";
-}
-.icon-smile:before {
+.fa-smile-o:before {
content: "\f118";
}
-.icon-frown:before {
+.fa-frown-o:before {
content: "\f119";
}
-.icon-meh:before {
+.fa-meh-o:before {
content: "\f11a";
}
-.icon-gamepad:before {
+.fa-gamepad:before {
content: "\f11b";
}
-.icon-keyboard:before {
+.fa-keyboard-o:before {
content: "\f11c";
}
-.icon-flag-alt:before {
+.fa-flag-o:before {
content: "\f11d";
}
-.icon-flag-checkered:before {
+.fa-flag-checkered:before {
content: "\f11e";
}
-.icon-terminal:before {
+.fa-terminal:before {
content: "\f120";
}
-.icon-code:before {
+.fa-code:before {
content: "\f121";
}
-.icon-reply-all:before {
+.fa-reply-all:before {
content: "\f122";
}
-.icon-mail-reply-all:before {
+.fa-mail-reply-all:before {
content: "\f122";
}
-.icon-star-half-full:before,
-.icon-star-half-empty:before {
+.fa-star-half-empty:before,
+.fa-star-half-full:before,
+.fa-star-half-o:before {
content: "\f123";
}
-.icon-location-arrow:before {
+.fa-location-arrow:before {
content: "\f124";
}
-.icon-crop:before {
+.fa-crop:before {
content: "\f125";
}
-.icon-code-fork:before {
+.fa-code-fork:before {
content: "\f126";
}
-.icon-unlink:before {
+.fa-unlink:before,
+.fa-chain-broken:before {
content: "\f127";
}
-.icon-question:before {
+.fa-question:before {
content: "\f128";
}
-.icon-info:before {
+.fa-info:before {
content: "\f129";
}
-.icon-exclamation:before {
+.fa-exclamation:before {
content: "\f12a";
}
-.icon-superscript:before {
+.fa-superscript:before {
content: "\f12b";
}
-.icon-subscript:before {
+.fa-subscript:before {
content: "\f12c";
}
-.icon-eraser:before {
+.fa-eraser:before {
content: "\f12d";
}
-.icon-puzzle-piece:before {
+.fa-puzzle-piece:before {
content: "\f12e";
}
-.icon-microphone:before {
+.fa-microphone:before {
content: "\f130";
}
-.icon-microphone-off:before {
+.fa-microphone-slash:before {
content: "\f131";
}
-.icon-shield:before {
+.fa-shield:before {
content: "\f132";
}
-.icon-calendar-empty:before {
+.fa-calendar-o:before {
content: "\f133";
}
-.icon-fire-extinguisher:before {
+.fa-fire-extinguisher:before {
content: "\f134";
}
-.icon-rocket:before {
+.fa-rocket:before {
content: "\f135";
}
-.icon-maxcdn:before {
+.fa-maxcdn:before {
content: "\f136";
}
-.icon-chevron-sign-left:before {
+.fa-chevron-circle-left:before {
content: "\f137";
}
-.icon-chevron-sign-right:before {
+.fa-chevron-circle-right:before {
content: "\f138";
}
-.icon-chevron-sign-up:before {
+.fa-chevron-circle-up:before {
content: "\f139";
}
-.icon-chevron-sign-down:before {
+.fa-chevron-circle-down:before {
content: "\f13a";
}
-.icon-html5:before {
+.fa-html5:before {
content: "\f13b";
}
-.icon-css3:before {
+.fa-css3:before {
content: "\f13c";
}
-.icon-anchor:before {
+.fa-anchor:before {
content: "\f13d";
}
-.icon-unlock-alt:before {
+.fa-unlock-alt:before {
content: "\f13e";
}
-.icon-bullseye:before {
+.fa-bullseye:before {
content: "\f140";
}
-.icon-ellipsis-horizontal:before {
+.fa-ellipsis-h:before {
content: "\f141";
}
-.icon-ellipsis-vertical:before {
+.fa-ellipsis-v:before {
content: "\f142";
}
-.icon-rss-sign:before {
+.fa-rss-square:before {
content: "\f143";
}
-.icon-play-sign:before {
+.fa-play-circle:before {
content: "\f144";
}
-.icon-ticket:before {
+.fa-ticket:before {
content: "\f145";
}
-.icon-minus-sign-alt:before {
+.fa-minus-square:before {
content: "\f146";
}
-.icon-check-minus:before {
+.fa-minus-square-o:before {
content: "\f147";
}
-.icon-level-up:before {
+.fa-level-up:before {
content: "\f148";
}
-.icon-level-down:before {
+.fa-level-down:before {
content: "\f149";
}
-.icon-check-sign:before {
+.fa-check-square:before {
content: "\f14a";
}
-.icon-edit-sign:before {
+.fa-pencil-square:before {
content: "\f14b";
}
-.icon-external-link-sign:before {
+.fa-external-link-square:before {
content: "\f14c";
}
-.icon-share-sign:before {
+.fa-share-square:before {
content: "\f14d";
}
-.icon-compass:before {
+.fa-compass:before {
content: "\f14e";
}
-.icon-collapse:before {
+.fa-toggle-down:before,
+.fa-caret-square-o-down:before {
content: "\f150";
}
-.icon-collapse-top:before {
+.fa-toggle-up:before,
+.fa-caret-square-o-up:before {
content: "\f151";
}
-.icon-expand:before {
+.fa-toggle-right:before,
+.fa-caret-square-o-right:before {
content: "\f152";
}
-.icon-euro:before,
-.icon-eur:before {
+.fa-euro:before,
+.fa-eur:before {
content: "\f153";
}
-.icon-gbp:before {
+.fa-gbp:before {
content: "\f154";
}
-.icon-dollar:before,
-.icon-usd:before {
+.fa-dollar:before,
+.fa-usd:before {
content: "\f155";
}
-.icon-rupee:before,
-.icon-inr:before {
+.fa-rupee:before,
+.fa-inr:before {
content: "\f156";
}
-.icon-yen:before,
-.icon-jpy:before {
+.fa-cny:before,
+.fa-rmb:before,
+.fa-yen:before,
+.fa-jpy:before {
content: "\f157";
}
-.icon-renminbi:before,
-.icon-cny:before {
+.fa-ruble:before,
+.fa-rouble:before,
+.fa-rub:before {
content: "\f158";
}
-.icon-won:before,
-.icon-krw:before {
+.fa-won:before,
+.fa-krw:before {
content: "\f159";
}
-.icon-bitcoin:before,
-.icon-btc:before {
+.fa-bitcoin:before,
+.fa-btc:before {
content: "\f15a";
}
-.icon-file:before {
+.fa-file:before {
content: "\f15b";
}
-.icon-file-text:before {
+.fa-file-text:before {
content: "\f15c";
}
-.icon-sort-by-alphabet:before {
+.fa-sort-alpha-asc:before {
content: "\f15d";
}
-.icon-sort-by-alphabet-alt:before {
+.fa-sort-alpha-desc:before {
content: "\f15e";
}
-.icon-sort-by-attributes:before {
+.fa-sort-amount-asc:before {
content: "\f160";
}
-.icon-sort-by-attributes-alt:before {
+.fa-sort-amount-desc:before {
content: "\f161";
}
-.icon-sort-by-order:before {
+.fa-sort-numeric-asc:before {
content: "\f162";
}
-.icon-sort-by-order-alt:before {
+.fa-sort-numeric-desc:before {
content: "\f163";
}
-.icon-thumbs-up:before {
+.fa-thumbs-up:before {
content: "\f164";
}
-.icon-thumbs-down:before {
+.fa-thumbs-down:before {
content: "\f165";
}
-.icon-youtube-sign:before {
+.fa-youtube-square:before {
content: "\f166";
}
-.icon-youtube:before {
+.fa-youtube:before {
content: "\f167";
}
-.icon-xing:before {
+.fa-xing:before {
content: "\f168";
}
-.icon-xing-sign:before {
+.fa-xing-square:before {
content: "\f169";
}
-.icon-youtube-play:before {
+.fa-youtube-play:before {
content: "\f16a";
}
-.icon-dropbox:before {
+.fa-dropbox:before {
content: "\f16b";
}
-.icon-stackexchange:before {
+.fa-stack-overflow:before {
content: "\f16c";
}
-.icon-instagram:before {
+.fa-instagram:before {
content: "\f16d";
}
-.icon-flickr:before {
+.fa-flickr:before {
content: "\f16e";
}
-.icon-adn:before {
+.fa-adn:before {
content: "\f170";
}
-.icon-bitbucket:before {
+.fa-bitbucket:before {
content: "\f171";
}
-.icon-bitbucket-sign:before {
+.fa-bitbucket-square:before {
content: "\f172";
}
-.icon-tumblr:before {
+.fa-tumblr:before {
content: "\f173";
}
-.icon-tumblr-sign:before {
+.fa-tumblr-square:before {
content: "\f174";
}
-.icon-long-arrow-down:before {
+.fa-long-arrow-down:before {
content: "\f175";
}
-.icon-long-arrow-up:before {
+.fa-long-arrow-up:before {
content: "\f176";
}
-.icon-long-arrow-left:before {
+.fa-long-arrow-left:before {
content: "\f177";
}
-.icon-long-arrow-right:before {
+.fa-long-arrow-right:before {
content: "\f178";
}
-.icon-apple:before {
+.fa-apple:before {
content: "\f179";
}
-.icon-windows:before {
+.fa-windows:before {
content: "\f17a";
}
-.icon-android:before {
+.fa-android:before {
content: "\f17b";
}
-.icon-linux:before {
+.fa-linux:before {
content: "\f17c";
}
-.icon-dribbble:before {
+.fa-dribbble:before {
content: "\f17d";
}
-.icon-skype:before {
+.fa-skype:before {
content: "\f17e";
}
-.icon-foursquare:before {
+.fa-foursquare:before {
content: "\f180";
}
-.icon-trello:before {
+.fa-trello:before {
content: "\f181";
}
-.icon-female:before {
+.fa-female:before {
content: "\f182";
}
-.icon-male:before {
+.fa-male:before {
content: "\f183";
}
-.icon-gittip:before {
+.fa-gittip:before {
content: "\f184";
}
-.icon-sun:before {
+.fa-sun-o:before {
content: "\f185";
}
-.icon-moon:before {
+.fa-moon-o:before {
content: "\f186";
}
-.icon-archive:before {
+.fa-archive:before {
content: "\f187";
}
-.icon-bug:before {
+.fa-bug:before {
content: "\f188";
}
-.icon-vk:before {
+.fa-vk:before {
content: "\f189";
}
-.icon-weibo:before {
+.fa-weibo:before {
content: "\f18a";
}
-.icon-renren:before {
+.fa-renren:before {
content: "\f18b";
}
+.fa-pagelines:before {
+ content: "\f18c";
+}
+.fa-stack-exchange:before {
+ content: "\f18d";
+}
+.fa-arrow-circle-o-right:before {
+ content: "\f18e";
+}
+.fa-arrow-circle-o-left:before {
+ content: "\f190";
+}
+.fa-toggle-left:before,
+.fa-caret-square-o-left:before {
+ content: "\f191";
+}
+.fa-dot-circle-o:before {
+ content: "\f192";
+}
+.fa-wheelchair:before {
+ content: "\f193";
+}
+.fa-vimeo-square:before {
+ content: "\f194";
+}
+.fa-turkish-lira:before,
+.fa-try:before {
+ content: "\f195";
+}
+.fa-plus-square-o:before {
+ content: "\f196";
+}