kaui 0.11.0 → 0.12.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +3 -0
- data/Gemfile +1 -1
- data/README.md +10 -15
- data/app/assets/images/kaui/duck.png +0 -0
- data/app/assets/images/kaui/logo.png +0 -0
- data/app/assets/images/kaui/search.png +0 -0
- data/app/assets/images/kaui/search_white.png +0 -0
- data/app/assets/javascripts/application.js +3 -0
- data/app/assets/javascripts/kaui/bootstrap-tweaks.js +3 -0
- data/app/assets/javascripts/kaui/kaui.js +99 -0
- data/app/assets/stylesheets/application.css +3 -1
- data/app/assets/stylesheets/bootstrap_and_overrides.less +39 -0
- data/app/assets/stylesheets/kaui/common.less +538 -0
- data/app/assets/stylesheets/kaui/datatable.less +75 -0
- data/app/assets/stylesheets/kaui/header.less +186 -0
- data/app/assets/stylesheets/kaui/home.less +82 -0
- data/app/assets/stylesheets/kaui/invoice.less +54 -0
- data/app/assets/stylesheets/kaui/kaui.less +16 -0
- data/app/assets/stylesheets/kaui/payment.less +29 -0
- data/app/assets/stylesheets/kaui/subscription.less +5 -0
- data/app/assets/stylesheets/kaui/tags.less +175 -0
- data/app/assets/stylesheets/kaui/timeline.less +4 -0
- data/app/controllers/kaui/account_emails_controller.rb +18 -18
- data/app/controllers/kaui/account_tags_controller.rb +8 -30
- data/app/controllers/kaui/account_timelines_controller.rb +13 -23
- data/app/controllers/kaui/accounts_controller.rb +65 -62
- data/app/controllers/kaui/admin_allowed_users_controller.rb +48 -32
- data/app/controllers/kaui/admin_tenants_controller.rb +147 -142
- data/app/controllers/kaui/bundle_tags_controller.rb +9 -33
- data/app/controllers/kaui/bundles_controller.rb +23 -62
- data/app/controllers/kaui/chargebacks_controller.rb +5 -11
- data/app/controllers/kaui/charges_controller.rb +11 -18
- data/app/controllers/kaui/credits_controller.rb +19 -22
- data/app/controllers/kaui/custom_fields_controller.rb +44 -16
- data/app/controllers/kaui/engine_controller.rb +56 -3
- data/app/controllers/kaui/engine_controller_util.rb +75 -1
- data/app/controllers/kaui/home_controller.rb +19 -0
- data/app/controllers/kaui/invoice_items_controller.rb +16 -21
- data/app/controllers/kaui/invoices_controller.rb +31 -53
- data/app/controllers/kaui/payment_methods_controller.rb +14 -46
- data/app/controllers/kaui/payments_controller.rb +60 -69
- data/app/controllers/kaui/refunds_controller.rb +11 -25
- data/app/controllers/kaui/registrations_controller.rb +38 -0
- data/app/controllers/kaui/subscriptions_controller.rb +82 -95
- data/app/controllers/kaui/tag_definitions_controller.rb +1 -5
- data/app/controllers/kaui/tags_controller.rb +17 -17
- data/app/controllers/kaui/tenants_controller.rb +38 -55
- data/app/controllers/kaui/transactions_controller.rb +8 -15
- data/app/helpers/kaui/application_helper.rb +4 -0
- data/app/helpers/kaui/object_helper.rb +24 -0
- data/app/helpers/kaui/payment_method_helper.rb +9 -0
- data/app/helpers/kaui/subscription_helper.rb +1 -1
- data/app/helpers/kaui/uuid_helper.rb +1 -0
- data/app/models/kaui/ability.rb +7 -1
- data/app/models/kaui/account.rb +6 -2
- data/app/models/kaui/account_email.rb +10 -0
- data/app/models/kaui/allowed_user.rb +16 -4
- data/app/models/kaui/audit_log.rb +5 -3
- data/app/models/kaui/bundle.rb +6 -11
- data/app/models/kaui/credit.rb +3 -0
- data/app/models/kaui/invoice.rb +10 -15
- data/app/models/kaui/invoice_payment.rb +10 -13
- data/app/models/kaui/killbill_registerable.rb +7 -0
- data/app/models/kaui/payment.rb +19 -12
- data/app/models/kaui/payment_method.rb +9 -0
- data/app/models/kaui/payment_state.rb +52 -0
- data/app/models/kaui/tag.rb +14 -0
- data/app/models/kaui/tag_definition.rb +8 -2
- data/app/models/kaui/user.rb +5 -4
- data/app/views/kaui/account_emails/_account_emails_table.html.erb +12 -9
- data/app/views/kaui/account_emails/_form.html.erb +9 -9
- data/app/views/kaui/account_emails/new.html.erb +9 -2
- data/app/views/kaui/account_tags/_form.html.erb +20 -29
- data/app/views/kaui/account_tags/_form_bar.html.erb +21 -0
- data/app/views/kaui/account_tags/edit.html.erb +9 -4
- data/app/views/kaui/account_timelines/show.html.erb +204 -287
- data/app/views/kaui/accounts/_account_info.html.erb +108 -0
- data/app/views/kaui/accounts/_billing_info.html.erb +129 -0
- data/app/views/kaui/accounts/_form.html.erb +127 -115
- data/app/views/kaui/accounts/_payment_methods.html.erb +28 -0
- data/app/views/kaui/accounts/edit.html.erb +10 -0
- data/app/views/kaui/accounts/index.html.erb +38 -23
- data/app/views/kaui/accounts/new.html.erb +9 -4
- data/app/views/kaui/accounts/show.html.erb +4 -106
- data/app/views/kaui/admin_allowed_users/_form.html.erb +19 -0
- data/app/views/kaui/admin_allowed_users/index.html.erb +35 -18
- data/app/views/kaui/admin_allowed_users/new.html.erb +9 -21
- data/app/views/kaui/admin_allowed_users/show.html.erb +42 -50
- data/app/views/kaui/admin_tenants/_form.html.erb +25 -0
- data/app/views/kaui/admin_tenants/_tenants_table.html.erb +27 -0
- data/app/views/kaui/admin_tenants/index.html.erb +14 -23
- data/app/views/kaui/admin_tenants/new.html.erb +8 -37
- data/app/views/kaui/admin_tenants/show.html.erb +128 -113
- data/app/views/kaui/bundle_tags/_form.html.erb +20 -28
- data/app/views/kaui/bundle_tags/_form_bar.html.erb +21 -0
- data/app/views/kaui/bundle_tags/edit.html.erb +9 -4
- data/app/views/kaui/bundles/index.html.erb +76 -29
- data/app/views/kaui/bundles/transfer.html.erb +28 -28
- data/app/views/kaui/chargebacks/_form.html.erb +31 -29
- data/app/views/kaui/chargebacks/new.html.erb +9 -4
- data/app/views/kaui/charges/_form.html.erb +35 -59
- data/app/views/kaui/charges/new.html.erb +9 -4
- data/app/views/kaui/credits/_form.html.erb +32 -59
- data/app/views/kaui/credits/new.html.erb +9 -4
- data/app/views/kaui/custom_fields/_form.html.erb +31 -0
- data/app/views/kaui/custom_fields/index.html.erb +33 -20
- data/app/views/kaui/custom_fields/new.html.erb +10 -0
- data/app/views/kaui/home/index.html.erb +12 -9
- data/app/views/kaui/invoice_items/_edit_form.html.erb +30 -0
- data/app/views/kaui/invoice_items/edit.html.erb +10 -91
- data/app/views/kaui/invoices/_invoice_table.html.erb +113 -0
- data/app/views/kaui/invoices/index.html.erb +31 -22
- data/app/views/kaui/invoices/show.html.erb +77 -91
- data/app/views/kaui/layouts/kaui_account_navbar.html.erb +11 -0
- data/app/views/kaui/layouts/kaui_application.html.erb +14 -53
- data/app/views/kaui/layouts/kaui_flash.html.erb +17 -0
- data/app/views/kaui/layouts/kaui_footer.html.erb +2 -0
- data/app/views/kaui/layouts/kaui_header.html.erb +17 -0
- data/app/views/kaui/layouts/kaui_navbar.html.erb +75 -0
- data/app/views/kaui/payment_methods/_form.html.erb +26 -23
- data/app/views/kaui/payment_methods/_new_creditcard_payment_method.html.erb +46 -41
- data/app/views/kaui/payment_methods/_payment_methods_details_table.html.erb +25 -0
- data/app/views/kaui/payment_methods/_payment_methods_table.html.erb +50 -52
- data/app/views/kaui/payment_methods/new.html.erb +9 -4
- data/app/views/kaui/payments/_form.html.erb +55 -0
- data/app/views/kaui/payments/_payment_table.html.erb +117 -0
- data/app/views/kaui/payments/index.html.erb +31 -22
- data/app/views/kaui/payments/new.html.erb +9 -92
- data/app/views/kaui/payments/show.html.erb +38 -2
- data/app/views/kaui/refunds/_form.html.erb +240 -0
- data/app/views/kaui/refunds/new.html.erb +8 -280
- data/app/views/kaui/registrations/_form.html.erb +19 -0
- data/app/views/kaui/registrations/new.html.erb +10 -0
- data/app/views/kaui/sessions/_form.html.erb +19 -0
- data/app/views/kaui/sessions/new.html.erb +7 -18
- data/app/views/kaui/subscriptions/_edit_form.html.erb +26 -0
- data/app/views/kaui/subscriptions/_form.html.erb +34 -31
- data/app/views/kaui/subscriptions/_subscriptions_table.html.erb +37 -24
- data/app/views/kaui/subscriptions/edit.html.erb +10 -30
- data/app/views/kaui/subscriptions/new.html.erb +14 -11
- data/app/views/kaui/tag_definitions/_form.html.erb +14 -11
- data/app/views/kaui/tag_definitions/index.html.erb +56 -30
- data/app/views/kaui/tag_definitions/new.html.erb +9 -2
- data/app/views/kaui/tags/_tags_table.html.erb +7 -10
- data/app/views/kaui/tags/index.html.erb +29 -20
- data/app/views/kaui/tenants/_form.html.erb +13 -0
- data/app/views/kaui/tenants/index.html.erb +9 -16
- data/app/views/kaui/transactions/_form.html.erb +47 -67
- data/app/views/kaui/transactions/new.html.erb +9 -2
- data/config/initializers/killbill_registerable.rb +4 -0
- data/config/routes.rb +88 -93
- data/kaui.gemspec +11 -2
- data/lib/kaui/engine.rb +6 -4
- data/lib/kaui/version.rb +1 -1
- data/lib/kaui.rb +24 -1
- data/test/dummy/config/application.rb +2 -0
- data/test/dummy/config/database.yml +6 -3
- data/test/dummy/config/initializers/killbill_client.rb +0 -2
- data/test/fixtures/catalog-v1.xml +74 -0
- data/test/fixtures/catalog_translation_fr-v1.properties +1 -0
- data/test/fixtures/invoice_template-v1.html +100 -0
- data/test/fixtures/invoice_translation_fr-v1.properties +23 -0
- data/test/fixtures/overdue-v1.xml +49 -0
- data/test/fixtures/stripe.yml +2 -0
- data/test/functional/kaui/account_emails_controller_test.rb +35 -8
- data/test/functional/kaui/account_tags_controller_test.rb +8 -8
- data/test/functional/kaui/account_timelines_controller_test.rb +6 -7
- data/test/functional/kaui/accounts_controller_test.rb +72 -10
- data/test/functional/kaui/admin_allowed_users_controller_test.rb +6 -5
- data/test/functional/kaui/admin_tenants_controller_test.rb +104 -48
- data/test/functional/kaui/bundle_tags_controller_test.rb +14 -9
- data/test/functional/kaui/bundles_controller_test.rb +59 -23
- data/test/functional/kaui/chargebacks_controller_test.rb +29 -7
- data/test/functional/kaui/charges_controller_test.rb +31 -10
- data/test/functional/kaui/credits_controller_test.rb +25 -6
- data/test/functional/kaui/custom_fields_controller_test.rb +25 -1
- data/test/functional/kaui/functional_test_helper_nosetup.rb +6 -4
- data/test/functional/kaui/home_controller_test.rb +24 -0
- data/test/functional/kaui/invoice_items_controller_test.rb +56 -8
- data/test/functional/kaui/invoices_controller_test.rb +27 -18
- data/test/functional/kaui/payment_methods_controller_test.rb +2 -22
- data/test/functional/kaui/payments_controller_test.rb +8 -3
- data/test/functional/kaui/refunds_controller_test.rb +40 -21
- data/test/functional/kaui/subscriptions_controller_test.rb +77 -24
- data/test/functional/kaui/tag_definitions_controller_test.rb +1 -7
- data/test/functional/kaui/tags_controller_test.rb +1 -1
- data/test/functional/kaui/tenants_controller_test.rb +9 -9
- data/test/functional/kaui/transactions_controller_test.rb +41 -16
- data/test/integration/kaui/integration_test_helper.rb +0 -1
- data/test/integration/kaui/navigation_test.rb +4 -6
- data/test/test_helper.rb +2 -0
- metadata +155 -28
- data/Gemfile.lock +0 -210
- data/app/assets/stylesheets/bootstrap_and_overrides.css +0 -7
- data/app/assets/stylesheets/datatables.scss +0 -14
- data/app/assets/stylesheets/layout.scss +0 -19
- data/app/views/kaui/account_emails/show.html.erb +0 -25
- data/app/views/kaui/account_tags/_account_tags_table.html.erb +0 -32
- data/app/views/kaui/account_tags/show.html.erb +0 -6
- data/app/views/kaui/account_timelines/index.html.erb +0 -14
- data/app/views/kaui/bundle_tags/_bundle_tags_table.html.erb +0 -31
- data/app/views/kaui/bundle_tags/show.html.erb +0 -6
- data/app/views/kaui/bundles/show.html.erb +0 -18
- data/app/views/kaui/payment_methods/index.html.erb +0 -30
- data/app/views/kaui/payment_methods/show.html.erb +0 -3
- data/app/views/kaui/payments/_payments_table.html.erb +0 -41
- data/app/views/kaui/subscriptions/index.html.erb +0 -15
- data/app/views/kaui/subscriptions/show.html.erb +0 -33
- data/app/views/kaui/tag_definitions/show.html.erb +0 -15
- data/vendor/assets/images/img/glyphicons-halflings-white.png +0 -0
- data/vendor/assets/images/img/glyphicons-halflings.png +0 -0
- data/vendor/assets/stylesheets/css/bootstrap-datepicker.cd46d38.css +0 -274
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 6a37acffa332bbb9f6bb76e0919ce03c206b16aa
|
4
|
+
data.tar.gz: bfb2d2517cc20765a1864f0bb326ab194c9dda7d
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 89d8b652c89976fb303c0b328d3f8deadcbf93f5aa98703a80a85d577cb8bcb46fc64dbd0766e2b04ac472daf9c49a432e05ed26dc15992fcb8e693cbd11670e
|
7
|
+
data.tar.gz: 30f5789a4bf0bfab98bbbabfb9d251829e67d1cd42387306eb0d54afeccd349953dcda78561caa6d03eb10321f2e8cc3c01cf16b9e4eff61e61c13ab2ab23d8e
|
data/.gitignore
CHANGED
data/Gemfile
CHANGED
data/README.md
CHANGED
@@ -1,6 +1,3 @@
|
|
1
|
-
[![Build Status](https://travis-ci.org/killbill/killbill-admin-ui.png)](https://travis-ci.org/killbill/killbill-admin-ui)
|
2
|
-
[![Code Climate](https://codeclimate.com/github/killbill/killbill-admin-ui.png)](https://codeclimate.com/github/killbill/killbill-admin-ui)
|
3
|
-
|
4
1
|
Getting started
|
5
2
|
===============
|
6
3
|
|
@@ -9,13 +6,13 @@ Running Kaui locally
|
|
9
6
|
|
10
7
|
You can run Kaui locally by using the test/dummy app provided:
|
11
8
|
```
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
9
|
+
bundle install
|
10
|
+
cd test/dummy
|
11
|
+
export RAILS_ENV=development
|
12
|
+
bundle install
|
13
|
+
rake kaui:install:migrations
|
14
|
+
rake db:migrate
|
15
|
+
rails server
|
19
16
|
```
|
20
17
|
|
21
18
|
|
@@ -40,8 +37,6 @@ Specify your Kill Bill server url, api key and secret in ```config/initializers/
|
|
40
37
|
|
41
38
|
```
|
42
39
|
KillBillClient.url = 'http://127.0.0.1:8080/'
|
43
|
-
KillBillClient.api_key = 'bob'
|
44
|
-
KillBillClient.api_secret = 'lazar'
|
45
40
|
```
|
46
41
|
|
47
42
|
Sharing a Kaui instance across multiple tenants is not supported yet (you need to spawn one instance per tenant).
|
@@ -90,12 +85,12 @@ Alternatively, you can run the `kaui` script under `bin` by setting your loadpat
|
|
90
85
|
|
91
86
|
|
92
87
|
Multi-Tenancy
|
93
|
-
|
88
|
+
=============
|
94
89
|
|
95
90
|
KAUI has been enhanced to support multi-tenancy. In order to benefit from that mode, remove the properties `KillBillClient.api_key` and `KillBillClient.api_secret` from the config/initializers directory.
|
96
91
|
|
97
92
|
Admin User Roles
|
98
|
-
|
93
|
+
----------------
|
99
94
|
|
100
95
|
In multi-tenancy mode, there are two kinds of users:
|
101
96
|
|
@@ -112,7 +107,7 @@ Those roles and permissions are defined the same way other permissions are defin
|
|
112
107
|
The [enforcement in KAUI](https://github.com/killbill/killbill-admin-ui/blob/master/app/models/kaui/ability.rb) is based on the CanCan gem.
|
113
108
|
|
114
109
|
Multi-tenancy screens
|
115
|
-
|
110
|
+
---------------------
|
116
111
|
|
117
112
|
KAUI has been enriched with new models and new screens to manage the multi-tenancy, and those are available for the multi-tenant admin user:
|
118
113
|
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
@@ -4,11 +4,14 @@
|
|
4
4
|
// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
|
5
5
|
// the compiled file.
|
6
6
|
//
|
7
|
+
//= require js-routes
|
7
8
|
//= require jquery
|
8
9
|
//= require jquery_ujs
|
9
10
|
//= require dataTables/jquery.dataTables
|
10
11
|
//= require dataTables/bootstrap/3/jquery.dataTables.bootstrap
|
11
12
|
//= require d3
|
12
13
|
//= require twitter/bootstrap
|
14
|
+
//= require bootstrap-datepicker
|
13
15
|
//= require kaui/bootstrap-tweaks
|
14
16
|
//= require kaui/validation
|
17
|
+
//= require kaui/kaui
|
@@ -0,0 +1,99 @@
|
|
1
|
+
jQuery(document).ready(function ($) {
|
2
|
+
|
3
|
+
/*
|
4
|
+
* Mobile Data Adjustment
|
5
|
+
*/
|
6
|
+
var running = false;
|
7
|
+
$('table.mobile-data').each(function () {
|
8
|
+
var count = $(this).find($('table.mobile-data tr')).length - 1;
|
9
|
+
$(this).append('<span class="left"><i class="fa fa-arrow-circle-left"></i></span>');
|
10
|
+
$(this).append('<span class="right"><i class="fa fa-arrow-circle-right"></i></span>');
|
11
|
+
$(this).append('<span class="center"><span class="current">1</span>/' + count + '</span>');
|
12
|
+
});
|
13
|
+
$('table.mobile-data > span.left').click(function () {
|
14
|
+
|
15
|
+
if (running === true)
|
16
|
+
return;
|
17
|
+
|
18
|
+
running = true;
|
19
|
+
|
20
|
+
var table = $(this).parent('table').children('tbody'),
|
21
|
+
current = table.find('tr:first-of-type'),
|
22
|
+
next = table.find('tr:last-of-type'),
|
23
|
+
page = table.children('span.center').children('span.current'),
|
24
|
+
number = parseInt(page.html()),
|
25
|
+
count = table.find($('table.mobile-data tr')).length - 1;
|
26
|
+
|
27
|
+
next.insertBefore(current);
|
28
|
+
number--;
|
29
|
+
if (number <= 0) {
|
30
|
+
number = count;
|
31
|
+
}
|
32
|
+
page.html(number);
|
33
|
+
|
34
|
+
fixCellHeight(table);
|
35
|
+
|
36
|
+
running = false;
|
37
|
+
|
38
|
+
});
|
39
|
+
$('table.mobile-data > span.right').click(function () {
|
40
|
+
|
41
|
+
if (running === true)
|
42
|
+
return;
|
43
|
+
|
44
|
+
running = true;
|
45
|
+
|
46
|
+
var table = $(this).parent('table').children('tbody'),
|
47
|
+
current = table.find('tr:first-of-type'),
|
48
|
+
last = table.find('tr:last-of-type'),
|
49
|
+
page = table.children('span.center').children('span.current'),
|
50
|
+
number = parseInt(page.html()),
|
51
|
+
count = table.find($('table.mobile-data tr')).length - 1;
|
52
|
+
|
53
|
+
current.insertAfter(last);
|
54
|
+
number++;
|
55
|
+
if (number > count) {
|
56
|
+
number = 1;
|
57
|
+
}
|
58
|
+
page.html(number);
|
59
|
+
|
60
|
+
fixCellHeight(table);
|
61
|
+
|
62
|
+
running = false;
|
63
|
+
|
64
|
+
});
|
65
|
+
|
66
|
+
function fixCellHeight(table) {
|
67
|
+
|
68
|
+
table.find('tr:first-of-type').children('th').each(function (i) {
|
69
|
+
i++;
|
70
|
+
var brother = table.find('tr:nth-of-type(2)').children('td:nth-of-type(' + i + ')');
|
71
|
+
|
72
|
+
if ($(this).height() > brother.height()) {
|
73
|
+
brother.css('height', $(this).outerHeight() + 'px');
|
74
|
+
} else {
|
75
|
+
$(this).css('height', brother.outerHeight() + 'px');
|
76
|
+
}
|
77
|
+
|
78
|
+
});
|
79
|
+
|
80
|
+
}
|
81
|
+
|
82
|
+
if ($(window).width() <= 768) {
|
83
|
+
$('table.mobile-data').each(function () {
|
84
|
+
fixCellHeight($(this));
|
85
|
+
});
|
86
|
+
}
|
87
|
+
|
88
|
+
|
89
|
+
/*
|
90
|
+
* Toggler activation
|
91
|
+
*/
|
92
|
+
$('.toggler .first-line').click( function(e){
|
93
|
+
if (! ($(e.target).is('a') || $(e.target).parent().is('a'))) {
|
94
|
+
e.preventDefault();
|
95
|
+
$(this).parent('.toggler').toggleClass('toggled');
|
96
|
+
}
|
97
|
+
});
|
98
|
+
|
99
|
+
})
|
@@ -3,7 +3,9 @@
|
|
3
3
|
* and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
|
4
4
|
* the top of the compiled file, but it's generally better to create a new file per style scope.
|
5
5
|
*= require_self
|
6
|
-
*=
|
6
|
+
*= require bootstrap-datepicker3
|
7
7
|
*= require dataTables/jquery.dataTables
|
8
8
|
*= require dataTables/bootstrap/3/jquery.dataTables.bootstrap
|
9
|
+
*= require bootstrap_and_overrides
|
10
|
+
*= require kaui/kaui
|
9
11
|
*/
|
@@ -0,0 +1,39 @@
|
|
1
|
+
@import "twitter/bootstrap/bootstrap";
|
2
|
+
|
3
|
+
// Set the correct sprite paths
|
4
|
+
@iconSpritePath: image-url("twitter/bootstrap/glyphicons-halflings.png");
|
5
|
+
@iconWhiteSpritePath: image-url("twitter/bootstrap/glyphicons-halflings-white.png");
|
6
|
+
|
7
|
+
// Set the Font Awesome (Font Awesome is default. You can disable by commenting below lines)
|
8
|
+
@fontAwesomeEotPath: font-url("fontawesome-webfont.eot");
|
9
|
+
@fontAwesomeEotPath_iefix: font-url("fontawesome-webfont.eot?#iefix");
|
10
|
+
@fontAwesomeWoffPath: font-url("fontawesome-webfont.woff");
|
11
|
+
@fontAwesomeTtfPath: font-url("fontawesome-webfont.ttf");
|
12
|
+
@fontAwesomeSvgPath: font-url("fontawesome-webfont.svg#fontawesomeregular");
|
13
|
+
|
14
|
+
// Font Awesome
|
15
|
+
@import "fontawesome/font-awesome";
|
16
|
+
|
17
|
+
/* Override Bootstrap 3 font locations */
|
18
|
+
@font-face {
|
19
|
+
font-family: 'Glyphicons Halflings';
|
20
|
+
src: url('../assets/glyphicons-halflings-regular.eot');
|
21
|
+
src: url('../assets/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'),
|
22
|
+
url('../assets/glyphicons-halflings-regular.woff') format('woff'),
|
23
|
+
url('../assets/glyphicons-halflings-regular.ttf') format('truetype'),
|
24
|
+
url('../assets/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
|
25
|
+
}
|
26
|
+
|
27
|
+
// Glyphicons
|
28
|
+
//@import "twitter/bootstrap/glyphicons.less";
|
29
|
+
|
30
|
+
// Your custom LESS stylesheets goes here
|
31
|
+
//
|
32
|
+
// Since bootstrap was imported above you have access to its mixins which
|
33
|
+
// you may use and inherit here
|
34
|
+
//
|
35
|
+
// If you'd like to override bootstrap's own variables, you can do so here as well
|
36
|
+
// See http://twitter.github.com/bootstrap/customize.html#variables for their names and documentation
|
37
|
+
//
|
38
|
+
// Example:
|
39
|
+
// @link-color: #ff0000;
|