From 16058fbd1d5cc8a74cba97d01bcc848e93fcd5e4 Mon Sep 17 00:00:00 2001 From: exodus4d Date: Tue, 11 Aug 2015 19:05:19 +0200 Subject: [PATCH] bigfixing --- .idea/dictionaries/exodus4d.xml | 1 + .idea/pathfinder.iml | 2 +- .idea/workspace.xml | 1730 +++++++++-------- js/app.js | 7 +- js/app/counter.js | 2 +- js/app/init.js | 27 +- js/app/landingpage.js | 5 + js/app/main.js | 11 +- js/app/map/contextmenu.js | 23 +- js/app/map/map.js | 364 ++-- js/app/map/overlay.js | 44 +- js/app/module_map.js | 13 +- js/app/page.js | 41 +- js/app/ui/dialog/account_settings.js | 1 - js/app/ui/dialog/map_info.js | 82 +- js/app/ui/dialog/map_settings.js | 23 +- js/app/ui/dialog/sharing_settings.js | 25 +- js/app/ui/form_element.js | 2 +- js/app/ui/system_info.js | 52 +- js/app/ui/system_killboard.js | 8 +- js/app/ui/system_signature.js | 124 +- js/app/util.js | 123 +- js/lib/bootstrap2-toggle.min.js | 9 + js/lib/bootstrap2-toggle.min.js.map | 1 + js/lib/jquery.mCustomScrollbar.concat.min.js | 10 +- .../bootstrap-toggle/bootstrap2-toggle.css | 7 + public/css/pathfinder.css | 12 +- public/templates/dialog/map.html | 24 +- public/templates/dialog/map_manual.html | 18 +- public/templates/dialog/settings.html | 6 +- public/templates/dialog/sharing_settings.html | 89 +- public/templates/form/character_panel.html | 5 +- public/templates/form/map_settings.html | 20 +- public/templates/modules/header.html | 4 + public/templates/modules/system_info.html | 4 +- sass/_main.scss | 6 +- sass/bootstrap/_variables.scss | 4 - sass/layout/_dialogs.scss | 4 +- sass/layout/_forms.scss | 12 +- sass/layout/_main.scss | 2 +- sass/layout/_map.scss | 22 +- sass/layout/_system-info.scss | 48 +- .../bootstrap-toggle/_bootstrap2-toggle.scss | 85 + .../select2/theme/pathfinder/_layout.scss | 2 +- sass/pathfinder.scss | 3 +- 45 files changed, 1843 insertions(+), 1264 deletions(-) create mode 100644 js/lib/bootstrap2-toggle.min.js create mode 100644 js/lib/bootstrap2-toggle.min.js.map create mode 100644 public/css/library/bootstrap-toggle/bootstrap2-toggle.css create mode 100644 sass/library/bootstrap-toggle/_bootstrap2-toggle.scss diff --git a/.idea/dictionaries/exodus4d.xml b/.idea/dictionaries/exodus4d.xml index d41eb6ec..e814a623 100644 --- a/.idea/dictionaries/exodus4d.xml +++ b/.idea/dictionaries/exodus4d.xml @@ -24,6 +24,7 @@ jumpbridge killboard killmail + loopback malihu minify mouseover diff --git a/.idea/pathfinder.iml b/.idea/pathfinder.iml index 9caffe92..a64c7145 100644 --- a/.idea/pathfinder.iml +++ b/.idea/pathfinder.iml @@ -29,7 +29,7 @@ - + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 5715d006..822d1508 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -4,248 +4,246 @@