diff --git a/app/assets/images/CO32.png b/app/assets/images/CO32.png new file mode 100755 index 00000000..be5e7ffe Binary files /dev/null and b/app/assets/images/CO32.png differ diff --git a/app/assets/images/CO32b.png b/app/assets/images/CO32b.png new file mode 100755 index 00000000..63394b5b Binary files /dev/null and b/app/assets/images/CO32b.png differ diff --git a/app/assets/images/CO36.png b/app/assets/images/CO36.png new file mode 100755 index 00000000..693f4d67 Binary files /dev/null and b/app/assets/images/CO36.png differ diff --git a/app/assets/images/CO36b.png b/app/assets/images/CO36b.png new file mode 100755 index 00000000..3d61f596 Binary files /dev/null and b/app/assets/images/CO36b.png differ diff --git a/app/assets/images/CO64.png b/app/assets/images/CO64.png new file mode 100755 index 00000000..33c34de5 Binary files /dev/null and b/app/assets/images/CO64.png differ diff --git a/app/assets/images/CO64b.png b/app/assets/images/CO64b.png new file mode 100755 index 00000000..bbb712c1 Binary files /dev/null and b/app/assets/images/CO64b.png differ diff --git a/app/assets/images/MMCCicon_add.png b/app/assets/images/MMCCicon_add.png deleted file mode 100644 index fdb4045f..00000000 Binary files a/app/assets/images/MMCCicon_add.png and /dev/null differ diff --git a/app/assets/images/MMCCicon_admin.png b/app/assets/images/MMCCicon_admin.png deleted file mode 100644 index a3b9a767..00000000 Binary files a/app/assets/images/MMCCicon_admin.png and /dev/null differ diff --git a/app/assets/images/MMCCicon_center.png b/app/assets/images/MMCCicon_center.png deleted file mode 100644 index c009d99d..00000000 Binary files a/app/assets/images/MMCCicon_center.png and /dev/null differ diff --git a/app/assets/images/MMCCicon_commons.png b/app/assets/images/MMCCicon_commons.png deleted file mode 100644 index 1eed3c5b..00000000 Binary files a/app/assets/images/MMCCicon_commons.png and /dev/null differ diff --git a/app/assets/images/MMCCicon_commons_black.png b/app/assets/images/MMCCicon_commons_black.png deleted file mode 100644 index 4f06fed8..00000000 Binary files a/app/assets/images/MMCCicon_commons_black.png and /dev/null differ diff --git a/app/assets/images/MMCCicon_delete_black.png b/app/assets/images/MMCCicon_delete_black.png deleted file mode 100644 index 017a1adf..00000000 Binary files a/app/assets/images/MMCCicon_delete_black.png and /dev/null differ diff --git a/app/assets/images/MMCCicon_delete_grey.png b/app/assets/images/MMCCicon_delete_grey.png deleted file mode 100644 index 4ba2b136..00000000 Binary files a/app/assets/images/MMCCicon_delete_grey.png and /dev/null differ diff --git a/app/assets/images/MMCCicon_edit_permission_black.png b/app/assets/images/MMCCicon_edit_permission_black.png deleted file mode 100644 index e87d006e..00000000 Binary files a/app/assets/images/MMCCicon_edit_permission_black.png and /dev/null differ diff --git a/app/assets/images/MMCCicon_go.png b/app/assets/images/MMCCicon_go.png deleted file mode 100644 index e35a0f87..00000000 Binary files a/app/assets/images/MMCCicon_go.png and /dev/null differ diff --git a/app/assets/images/MMCCicon_help.png b/app/assets/images/MMCCicon_help.png deleted file mode 100644 index 16cd1894..00000000 Binary files a/app/assets/images/MMCCicon_help.png and /dev/null differ diff --git a/app/assets/images/MMCCicon_hide.png b/app/assets/images/MMCCicon_hide.png deleted file mode 100644 index 80ea7276..00000000 Binary files a/app/assets/images/MMCCicon_hide.png and /dev/null differ diff --git a/app/assets/images/MMCCicon_info.png b/app/assets/images/MMCCicon_info.png deleted file mode 100644 index 4594cba0..00000000 Binary files a/app/assets/images/MMCCicon_info.png and /dev/null differ diff --git a/app/assets/images/MMCCicon_invite.png b/app/assets/images/MMCCicon_invite.png deleted file mode 100644 index 347ddc02..00000000 Binary files a/app/assets/images/MMCCicon_invite.png and /dev/null differ diff --git a/app/assets/images/MMCCicon_left_arrow.png b/app/assets/images/MMCCicon_left_arrow.png deleted file mode 100644 index 23cd9559..00000000 Binary files a/app/assets/images/MMCCicon_left_arrow.png and /dev/null differ diff --git a/app/assets/images/MMCCicon_link.png b/app/assets/images/MMCCicon_link.png deleted file mode 100644 index 8bd1ee24..00000000 Binary files a/app/assets/images/MMCCicon_link.png and /dev/null differ diff --git a/app/assets/images/MMCCicon_logout.png b/app/assets/images/MMCCicon_logout.png deleted file mode 100644 index 5f22796f..00000000 Binary files a/app/assets/images/MMCCicon_logout.png and /dev/null differ diff --git a/app/assets/images/MMCCicon_map.png b/app/assets/images/MMCCicon_map.png deleted file mode 100644 index e1a61d89..00000000 Binary files a/app/assets/images/MMCCicon_map.png and /dev/null differ diff --git a/app/assets/images/MMCCicon_map_black.png b/app/assets/images/MMCCicon_map_black.png deleted file mode 100644 index abefa2a1..00000000 Binary files a/app/assets/images/MMCCicon_map_black.png and /dev/null differ diff --git a/app/assets/images/MMCCicon_mapper.png b/app/assets/images/MMCCicon_mapper.png deleted file mode 100644 index 0e9c3207..00000000 Binary files a/app/assets/images/MMCCicon_mapper.png and /dev/null differ diff --git a/app/assets/images/MMCCicon_mapper_black.png b/app/assets/images/MMCCicon_mapper_black.png deleted file mode 100644 index a324b3a9..00000000 Binary files a/app/assets/images/MMCCicon_mapper_black.png and /dev/null differ diff --git a/app/assets/images/MMCCicon_maximize_arrow.png b/app/assets/images/MMCCicon_maximize_arrow.png deleted file mode 100644 index 1fe42d26..00000000 Binary files a/app/assets/images/MMCCicon_maximize_arrow.png and /dev/null differ diff --git a/app/assets/images/MMCCicon_maximize_arrow_black.png b/app/assets/images/MMCCicon_maximize_arrow_black.png deleted file mode 100644 index 5196c38e..00000000 Binary files a/app/assets/images/MMCCicon_maximize_arrow_black.png and /dev/null differ diff --git a/app/assets/images/MMCCicon_metacode_set.png b/app/assets/images/MMCCicon_metacode_set.png deleted file mode 100644 index 98aea34a..00000000 Binary files a/app/assets/images/MMCCicon_metacode_set.png and /dev/null differ diff --git a/app/assets/images/MMCCicon_metacode_set_change.png b/app/assets/images/MMCCicon_metacode_set_change.png deleted file mode 100644 index 56279526..00000000 Binary files a/app/assets/images/MMCCicon_metacode_set_change.png and /dev/null differ diff --git a/app/assets/images/MMCCicon_minimize_arrow.png b/app/assets/images/MMCCicon_minimize_arrow.png deleted file mode 100644 index 2aad516c..00000000 Binary files a/app/assets/images/MMCCicon_minimize_arrow.png and /dev/null differ diff --git a/app/assets/images/MMCCicon_minimize_arrow_black.png b/app/assets/images/MMCCicon_minimize_arrow_black.png deleted file mode 100644 index cb1a83b7..00000000 Binary files a/app/assets/images/MMCCicon_minimize_arrow_black.png and /dev/null differ diff --git a/app/assets/images/MMCCicon_pop-out.png b/app/assets/images/MMCCicon_pop-out.png deleted file mode 100644 index ca3ecd45..00000000 Binary files a/app/assets/images/MMCCicon_pop-out.png and /dev/null differ diff --git a/app/assets/images/MMCCicon_pop-out_black.png b/app/assets/images/MMCCicon_pop-out_black.png deleted file mode 100644 index 7db39126..00000000 Binary files a/app/assets/images/MMCCicon_pop-out_black.png and /dev/null differ diff --git a/app/assets/images/MMCCicon_private.png b/app/assets/images/MMCCicon_private.png deleted file mode 100644 index 50e98e18..00000000 Binary files a/app/assets/images/MMCCicon_private.png and /dev/null differ diff --git a/app/assets/images/MMCCicon_private_black.png b/app/assets/images/MMCCicon_private_black.png deleted file mode 100644 index 076205f6..00000000 Binary files a/app/assets/images/MMCCicon_private_black.png and /dev/null differ diff --git a/app/assets/images/MMCCicon_public.png b/app/assets/images/MMCCicon_public.png deleted file mode 100644 index e8b51410..00000000 Binary files a/app/assets/images/MMCCicon_public.png and /dev/null differ diff --git a/app/assets/images/MMCCicon_public_black.png b/app/assets/images/MMCCicon_public_black.png deleted file mode 100644 index 950c49e4..00000000 Binary files a/app/assets/images/MMCCicon_public_black.png and /dev/null differ diff --git a/app/assets/images/MMCCicon_remove_from_map_black.png b/app/assets/images/MMCCicon_remove_from_map_black.png deleted file mode 100644 index 9ddc204f..00000000 Binary files a/app/assets/images/MMCCicon_remove_from_map_black.png and /dev/null differ diff --git a/app/assets/images/MMCCicon_remove_from_map_grey.png b/app/assets/images/MMCCicon_remove_from_map_grey.png deleted file mode 100644 index 0e863158..00000000 Binary files a/app/assets/images/MMCCicon_remove_from_map_grey.png and /dev/null differ diff --git a/app/assets/images/MMCCicon_right_arrow.png b/app/assets/images/MMCCicon_right_arrow.png deleted file mode 100644 index 5b57c191..00000000 Binary files a/app/assets/images/MMCCicon_right_arrow.png and /dev/null differ diff --git a/app/assets/images/MMCCicon_save_layout.png b/app/assets/images/MMCCicon_save_layout.png deleted file mode 100644 index d163dfb5..00000000 Binary files a/app/assets/images/MMCCicon_save_layout.png and /dev/null differ diff --git a/app/assets/images/MMCCicon_settings.png b/app/assets/images/MMCCicon_settings.png deleted file mode 100644 index ae56c5a9..00000000 Binary files a/app/assets/images/MMCCicon_settings.png and /dev/null differ diff --git a/app/assets/images/MMCCicon_synapse.png b/app/assets/images/MMCCicon_synapse.png deleted file mode 100644 index 9fea87f0..00000000 Binary files a/app/assets/images/MMCCicon_synapse.png and /dev/null differ diff --git a/app/assets/images/MMCCicon_synapse_black.png b/app/assets/images/MMCCicon_synapse_black.png deleted file mode 100644 index 1f96a7e9..00000000 Binary files a/app/assets/images/MMCCicon_synapse_black.png and /dev/null differ diff --git a/app/assets/images/MMCCicon_topic.png b/app/assets/images/MMCCicon_topic.png deleted file mode 100644 index 90457c0b..00000000 Binary files a/app/assets/images/MMCCicon_topic.png and /dev/null differ diff --git a/app/assets/images/MMSocial-51.png b/app/assets/images/MMSocial-51.png deleted file mode 100644 index d31ecc9f..00000000 Binary files a/app/assets/images/MMSocial-51.png and /dev/null differ diff --git a/app/assets/images/MMSocial-52.png b/app/assets/images/MMSocial-52.png deleted file mode 100644 index 2396356a..00000000 Binary files a/app/assets/images/MMSocial-52.png and /dev/null differ diff --git a/app/assets/images/MMSocial-53.png b/app/assets/images/MMSocial-53.png deleted file mode 100644 index e78ab067..00000000 Binary files a/app/assets/images/MMSocial-53.png and /dev/null differ diff --git a/app/assets/images/PR32.png b/app/assets/images/PR32.png new file mode 100755 index 00000000..b2b5d696 Binary files /dev/null and b/app/assets/images/PR32.png differ diff --git a/app/assets/images/PR32b.png b/app/assets/images/PR32b.png new file mode 100755 index 00000000..c839999a Binary files /dev/null and b/app/assets/images/PR32b.png differ diff --git a/app/assets/images/PR36.png b/app/assets/images/PR36.png new file mode 100755 index 00000000..d9e02367 Binary files /dev/null and b/app/assets/images/PR36.png differ diff --git a/app/assets/images/PR36b.png b/app/assets/images/PR36b.png new file mode 100755 index 00000000..60f4a0d1 Binary files /dev/null and b/app/assets/images/PR36b.png differ diff --git a/app/assets/images/PR64.png b/app/assets/images/PR64.png new file mode 100755 index 00000000..a9680255 Binary files /dev/null and b/app/assets/images/PR64.png differ diff --git a/app/assets/images/PR64b.png b/app/assets/images/PR64b.png new file mode 100755 index 00000000..b5fd6b94 Binary files /dev/null and b/app/assets/images/PR64b.png differ diff --git a/app/assets/images/PU32.png b/app/assets/images/PU32.png new file mode 100755 index 00000000..963fd339 Binary files /dev/null and b/app/assets/images/PU32.png differ diff --git a/app/assets/images/PU32b.png b/app/assets/images/PU32b.png new file mode 100755 index 00000000..5f2520e9 Binary files /dev/null and b/app/assets/images/PU32b.png differ diff --git a/app/assets/images/PU36.png b/app/assets/images/PU36.png new file mode 100755 index 00000000..243d2fd1 Binary files /dev/null and b/app/assets/images/PU36.png differ diff --git a/app/assets/images/PU36b.png b/app/assets/images/PU36b.png new file mode 100755 index 00000000..153603b6 Binary files /dev/null and b/app/assets/images/PU36b.png differ diff --git a/app/assets/images/PU64.png b/app/assets/images/PU64.png new file mode 100755 index 00000000..0dcf03af Binary files /dev/null and b/app/assets/images/PU64.png differ diff --git a/app/assets/images/PU64b.png b/app/assets/images/PU64b.png new file mode 100755 index 00000000..59275b14 Binary files /dev/null and b/app/assets/images/PU64b.png differ diff --git a/app/assets/images/__MACOSX/._CO32.png b/app/assets/images/__MACOSX/._CO32.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._CO32.png differ diff --git a/app/assets/images/__MACOSX/._CO32b.png b/app/assets/images/__MACOSX/._CO32b.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._CO32b.png differ diff --git a/app/assets/images/__MACOSX/._CO36.png b/app/assets/images/__MACOSX/._CO36.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._CO36.png differ diff --git a/app/assets/images/__MACOSX/._CO36b.png b/app/assets/images/__MACOSX/._CO36b.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._CO36b.png differ diff --git a/app/assets/images/__MACOSX/._CO64.png b/app/assets/images/__MACOSX/._CO64.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._CO64.png differ diff --git a/app/assets/images/__MACOSX/._CO64b.png b/app/assets/images/__MACOSX/._CO64b.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._CO64b.png differ diff --git a/app/assets/images/__MACOSX/._PR32.png b/app/assets/images/__MACOSX/._PR32.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._PR32.png differ diff --git a/app/assets/images/__MACOSX/._PR32b.png b/app/assets/images/__MACOSX/._PR32b.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._PR32b.png differ diff --git a/app/assets/images/__MACOSX/._PR36.png b/app/assets/images/__MACOSX/._PR36.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._PR36.png differ diff --git a/app/assets/images/__MACOSX/._PR36b.png b/app/assets/images/__MACOSX/._PR36b.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._PR36b.png differ diff --git a/app/assets/images/__MACOSX/._PR64.png b/app/assets/images/__MACOSX/._PR64.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._PR64.png differ diff --git a/app/assets/images/__MACOSX/._PR64b.png b/app/assets/images/__MACOSX/._PR64b.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._PR64b.png differ diff --git a/app/assets/images/__MACOSX/._PU32.png b/app/assets/images/__MACOSX/._PU32.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._PU32.png differ diff --git a/app/assets/images/__MACOSX/._PU32b.png b/app/assets/images/__MACOSX/._PU32b.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._PU32b.png differ diff --git a/app/assets/images/__MACOSX/._PU36.png b/app/assets/images/__MACOSX/._PU36.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._PU36.png differ diff --git a/app/assets/images/__MACOSX/._PU36b.png b/app/assets/images/__MACOSX/._PU36b.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._PU36b.png differ diff --git a/app/assets/images/__MACOSX/._PU64.png b/app/assets/images/__MACOSX/._PU64.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._PU64.png differ diff --git a/app/assets/images/__MACOSX/._PU64b.png b/app/assets/images/__MACOSX/._PU64b.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._PU64b.png differ diff --git a/app/assets/images/__MACOSX/._activity.png b/app/assets/images/__MACOSX/._activity.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._activity.png differ diff --git a/app/assets/images/__MACOSX/._addtomap.png b/app/assets/images/__MACOSX/._addtomap.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._addtomap.png differ diff --git a/app/assets/images/__MACOSX/._arrowcollapse.png b/app/assets/images/__MACOSX/._arrowcollapse.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._arrowcollapse.png differ diff --git a/app/assets/images/__MACOSX/._arrowdown.png b/app/assets/images/__MACOSX/._arrowdown.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._arrowdown.png differ diff --git a/app/assets/images/__MACOSX/._arrowexpand.png b/app/assets/images/__MACOSX/._arrowexpand.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._arrowexpand.png differ diff --git a/app/assets/images/__MACOSX/._arrowright.png b/app/assets/images/__MACOSX/._arrowright.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._arrowright.png differ diff --git a/app/assets/images/__MACOSX/._center.png b/app/assets/images/__MACOSX/._center.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._center.png differ diff --git a/app/assets/images/__MACOSX/._contextdelete.png b/app/assets/images/__MACOSX/._contextdelete.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._contextdelete.png differ diff --git a/app/assets/images/__MACOSX/._contextgear.png b/app/assets/images/__MACOSX/._contextgear.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._contextgear.png differ diff --git a/app/assets/images/__MACOSX/._contexthide.png b/app/assets/images/__MACOSX/._contexthide.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._contexthide.png differ diff --git a/app/assets/images/__MACOSX/._contextpermissions.png b/app/assets/images/__MACOSX/._contextpermissions.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._contextpermissions.png differ diff --git a/app/assets/images/__MACOSX/._contextpopout.png b/app/assets/images/__MACOSX/._contextpopout.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._contextpopout.png differ diff --git a/app/assets/images/__MACOSX/._contextremove.png b/app/assets/images/__MACOSX/._contextremove.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._contextremove.png differ diff --git a/app/assets/images/__MACOSX/._edit.png b/app/assets/images/__MACOSX/._edit.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._edit.png differ diff --git a/app/assets/images/__MACOSX/._featured.png b/app/assets/images/__MACOSX/._featured.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._featured.png differ diff --git a/app/assets/images/__MACOSX/._feedback.png b/app/assets/images/__MACOSX/._feedback.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._feedback.png differ diff --git a/app/assets/images/__MACOSX/._filter.png b/app/assets/images/__MACOSX/._filter.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._filter.png differ diff --git a/app/assets/images/__MACOSX/._fork.png b/app/assets/images/__MACOSX/._fork.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._fork.png differ diff --git a/app/assets/images/__MACOSX/._help.png b/app/assets/images/__MACOSX/._help.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._help.png differ diff --git a/app/assets/images/__MACOSX/._home.png b/app/assets/images/__MACOSX/._home.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._home.png differ diff --git a/app/assets/images/__MACOSX/._junto24.png b/app/assets/images/__MACOSX/._junto24.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._junto24.png differ diff --git a/app/assets/images/__MACOSX/._junto32.png b/app/assets/images/__MACOSX/._junto32.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._junto32.png differ diff --git a/app/assets/images/__MACOSX/._lbToS.png b/app/assets/images/__MACOSX/._lbToS.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._lbToS.png differ diff --git a/app/assets/images/__MACOSX/._lbgithub.png b/app/assets/images/__MACOSX/._lbgithub.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._lbgithub.png differ diff --git a/app/assets/images/__MACOSX/._lbgoogle.png b/app/assets/images/__MACOSX/._lbgoogle.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._lbgoogle.png differ diff --git a/app/assets/images/__MACOSX/._lbtwitter.png b/app/assets/images/__MACOSX/._lbtwitter.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._lbtwitter.png differ diff --git a/app/assets/images/__MACOSX/._lbwordpress.png b/app/assets/images/__MACOSX/._lbwordpress.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._lbwordpress.png differ diff --git a/app/assets/images/__MACOSX/._link.png b/app/assets/images/__MACOSX/._link.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._link.png differ diff --git a/app/assets/images/__MACOSX/._linkedmedia.png b/app/assets/images/__MACOSX/._linkedmedia.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._linkedmedia.png differ diff --git a/app/assets/images/__MACOSX/._mapinfo.png b/app/assets/images/__MACOSX/._mapinfo.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._mapinfo.png differ diff --git a/app/assets/images/__MACOSX/._metamap.png b/app/assets/images/__MACOSX/._metamap.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._metamap.png differ diff --git a/app/assets/images/__MACOSX/._metamap16.png b/app/assets/images/__MACOSX/._metamap16.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._metamap16.png differ diff --git a/app/assets/images/__MACOSX/._metamap32.png b/app/assets/images/__MACOSX/._metamap32.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._metamap32.png differ diff --git a/app/assets/images/__MACOSX/._metamap32c.png b/app/assets/images/__MACOSX/._metamap32c.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._metamap32c.png differ diff --git a/app/assets/images/__MACOSX/._metamap36c.png b/app/assets/images/__MACOSX/._metamap36c.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._metamap36c.png differ diff --git a/app/assets/images/__MACOSX/._newmap.png b/app/assets/images/__MACOSX/._newmap.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._newmap.png differ diff --git a/app/assets/images/__MACOSX/._photo.png b/app/assets/images/__MACOSX/._photo.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._photo.png differ diff --git a/app/assets/images/__MACOSX/._remove.png b/app/assets/images/__MACOSX/._remove.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._remove.png differ diff --git a/app/assets/images/__MACOSX/._search.png b/app/assets/images/__MACOSX/._search.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._search.png differ diff --git a/app/assets/images/__MACOSX/._settings32.png b/app/assets/images/__MACOSX/._settings32.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._settings32.png differ diff --git a/app/assets/images/__MACOSX/._share.png b/app/assets/images/__MACOSX/._share.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._share.png differ diff --git a/app/assets/images/__MACOSX/._synapse16.png b/app/assets/images/__MACOSX/._synapse16.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._synapse16.png differ diff --git a/app/assets/images/__MACOSX/._synapse32scard.png b/app/assets/images/__MACOSX/._synapse32scard.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._synapse32scard.png differ diff --git a/app/assets/images/__MACOSX/._synapse32tmcard.png b/app/assets/images/__MACOSX/._synapse32tmcard.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._synapse32tmcard.png differ diff --git a/app/assets/images/__MACOSX/._synapsedirection.png b/app/assets/images/__MACOSX/._synapsedirection.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._synapsedirection.png differ diff --git a/app/assets/images/__MACOSX/._synapsedirectionright.png b/app/assets/images/__MACOSX/._synapsedirectionright.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._synapsedirectionright.png differ diff --git a/app/assets/images/__MACOSX/._synapsestar.png b/app/assets/images/__MACOSX/._synapsestar.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._synapsestar.png differ diff --git a/app/assets/images/__MACOSX/._topic16.png b/app/assets/images/__MACOSX/._topic16.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._topic16.png differ diff --git a/app/assets/images/__MACOSX/._topic32.png b/app/assets/images/__MACOSX/._topic32.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._topic32.png differ diff --git a/app/assets/images/__MACOSX/._upload.png b/app/assets/images/__MACOSX/._upload.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._upload.png differ diff --git a/app/assets/images/__MACOSX/._user.png b/app/assets/images/__MACOSX/._user.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._user.png differ diff --git a/app/assets/images/__MACOSX/._useradmin.png b/app/assets/images/__MACOSX/._useradmin.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._useradmin.png differ diff --git a/app/assets/images/__MACOSX/._userlogout.png b/app/assets/images/__MACOSX/._userlogout.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._userlogout.png differ diff --git a/app/assets/images/__MACOSX/._usersettings.png b/app/assets/images/__MACOSX/._usersettings.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._usersettings.png differ diff --git a/app/assets/images/__MACOSX/._usershareinvite.png b/app/assets/images/__MACOSX/._usershareinvite.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._usershareinvite.png differ diff --git a/app/assets/images/__MACOSX/._xlightbox.png b/app/assets/images/__MACOSX/._xlightbox.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._xlightbox.png differ diff --git a/app/assets/images/__MACOSX/._zoomin.png b/app/assets/images/__MACOSX/._zoomin.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._zoomin.png differ diff --git a/app/assets/images/__MACOSX/._zoomout.png b/app/assets/images/__MACOSX/._zoomout.png new file mode 100755 index 00000000..179046b5 Binary files /dev/null and b/app/assets/images/__MACOSX/._zoomout.png differ diff --git a/app/assets/images/activity.png b/app/assets/images/activity.png new file mode 100755 index 00000000..7202cf70 Binary files /dev/null and b/app/assets/images/activity.png differ diff --git a/app/assets/images/addtomap.png b/app/assets/images/addtomap.png new file mode 100755 index 00000000..36193642 Binary files /dev/null and b/app/assets/images/addtomap.png differ diff --git a/app/assets/images/arrowcollapse.png b/app/assets/images/arrowcollapse.png new file mode 100755 index 00000000..969c3b1d Binary files /dev/null and b/app/assets/images/arrowcollapse.png differ diff --git a/app/assets/images/arrowdown.png b/app/assets/images/arrowdown.png new file mode 100755 index 00000000..55f218c6 Binary files /dev/null and b/app/assets/images/arrowdown.png differ diff --git a/app/assets/images/arrowexpand.png b/app/assets/images/arrowexpand.png new file mode 100755 index 00000000..d51b6b96 Binary files /dev/null and b/app/assets/images/arrowexpand.png differ diff --git a/app/assets/images/arrowright.png b/app/assets/images/arrowright.png new file mode 100755 index 00000000..f59fd68f Binary files /dev/null and b/app/assets/images/arrowright.png differ diff --git a/app/assets/images/beta_gen002.png b/app/assets/images/beta_gen002.png deleted file mode 100644 index 550e9e4b..00000000 Binary files a/app/assets/images/beta_gen002.png and /dev/null differ diff --git a/app/assets/images/bg.png b/app/assets/images/bg.png deleted file mode 100644 index 681d441c..00000000 Binary files a/app/assets/images/bg.png and /dev/null differ diff --git a/app/assets/images/contextdelete.png b/app/assets/images/contextdelete.png new file mode 100755 index 00000000..faa61758 Binary files /dev/null and b/app/assets/images/contextdelete.png differ diff --git a/app/assets/images/contextgear.png b/app/assets/images/contextgear.png new file mode 100755 index 00000000..28fdeb14 Binary files /dev/null and b/app/assets/images/contextgear.png differ diff --git a/app/assets/images/contexthide.png b/app/assets/images/contexthide.png new file mode 100755 index 00000000..0709401c Binary files /dev/null and b/app/assets/images/contexthide.png differ diff --git a/app/assets/images/contextpermissions.png b/app/assets/images/contextpermissions.png new file mode 100755 index 00000000..c4d10531 Binary files /dev/null and b/app/assets/images/contextpermissions.png differ diff --git a/app/assets/images/contextpopout.png b/app/assets/images/contextpopout.png new file mode 100755 index 00000000..f67289cb Binary files /dev/null and b/app/assets/images/contextpopout.png differ diff --git a/app/assets/images/contextremove.png b/app/assets/images/contextremove.png new file mode 100755 index 00000000..96c0bc7f Binary files /dev/null and b/app/assets/images/contextremove.png differ diff --git a/app/assets/images/edit.png b/app/assets/images/edit.png new file mode 100755 index 00000000..d6e91233 Binary files /dev/null and b/app/assets/images/edit.png differ diff --git a/app/assets/images/featured.png b/app/assets/images/featured.png new file mode 100755 index 00000000..eecc93e1 Binary files /dev/null and b/app/assets/images/featured.png differ diff --git a/app/assets/images/feedback.png b/app/assets/images/feedback.png new file mode 100755 index 00000000..8df58729 Binary files /dev/null and b/app/assets/images/feedback.png differ diff --git a/app/assets/images/filter.png b/app/assets/images/filter.png old mode 100644 new mode 100755 index 645ad67a..9f53e56e Binary files a/app/assets/images/filter.png and b/app/assets/images/filter.png differ diff --git a/app/assets/images/fork.png b/app/assets/images/fork.png index 3ddc3b6e..8db7e011 100755 Binary files a/app/assets/images/fork.png and b/app/assets/images/fork.png differ diff --git a/app/assets/images/help.png b/app/assets/images/help.png new file mode 100755 index 00000000..43992f4c Binary files /dev/null and b/app/assets/images/help.png differ diff --git a/app/assets/images/home.png b/app/assets/images/home.png new file mode 100755 index 00000000..01577b91 Binary files /dev/null and b/app/assets/images/home.png differ diff --git a/app/assets/images/junto.png b/app/assets/images/junto.png deleted file mode 100755 index ea0e485b..00000000 Binary files a/app/assets/images/junto.png and /dev/null differ diff --git a/app/assets/images/junto24.png b/app/assets/images/junto24.png new file mode 100755 index 00000000..7dd13a98 Binary files /dev/null and b/app/assets/images/junto24.png differ diff --git a/app/assets/images/junto32.png b/app/assets/images/junto32.png new file mode 100755 index 00000000..5d2793bb Binary files /dev/null and b/app/assets/images/junto32.png differ diff --git a/app/assets/images/labelCheckbox.png b/app/assets/images/labelCheckbox.png deleted file mode 100644 index 8f6a6e5e..00000000 Binary files a/app/assets/images/labelCheckbox.png and /dev/null differ diff --git a/app/assets/images/lbToS.png b/app/assets/images/lbToS.png new file mode 100755 index 00000000..e6b8eb3a Binary files /dev/null and b/app/assets/images/lbToS.png differ diff --git a/app/assets/images/lbgithub.png b/app/assets/images/lbgithub.png new file mode 100755 index 00000000..9a556f2d Binary files /dev/null and b/app/assets/images/lbgithub.png differ diff --git a/app/assets/images/lbgoogle.png b/app/assets/images/lbgoogle.png new file mode 100755 index 00000000..f5de8936 Binary files /dev/null and b/app/assets/images/lbgoogle.png differ diff --git a/app/assets/images/lbtwitter.png b/app/assets/images/lbtwitter.png new file mode 100755 index 00000000..242b918e Binary files /dev/null and b/app/assets/images/lbtwitter.png differ diff --git a/app/assets/images/lbwordpress.png b/app/assets/images/lbwordpress.png new file mode 100755 index 00000000..d9474ada Binary files /dev/null and b/app/assets/images/lbwordpress.png differ diff --git a/app/assets/images/link.png b/app/assets/images/link.png new file mode 100755 index 00000000..2115f872 Binary files /dev/null and b/app/assets/images/link.png differ diff --git a/app/assets/images/linkedmedia.png b/app/assets/images/linkedmedia.png new file mode 100755 index 00000000..504d8882 Binary files /dev/null and b/app/assets/images/linkedmedia.png differ diff --git a/app/assets/images/map.png b/app/assets/images/map.png deleted file mode 100644 index 1137c4ad..00000000 Binary files a/app/assets/images/map.png and /dev/null differ diff --git a/app/assets/images/mapInfoLine.png b/app/assets/images/mapInfoLine.png deleted file mode 100644 index e73a2339..00000000 Binary files a/app/assets/images/mapInfoLine.png and /dev/null differ diff --git a/app/assets/images/mapinfo.png b/app/assets/images/mapinfo.png new file mode 100755 index 00000000..6ee30b20 Binary files /dev/null and b/app/assets/images/mapinfo.png differ diff --git a/app/assets/images/menu_icon_32.png b/app/assets/images/menu_icon_32.png deleted file mode 100644 index 811f4af3..00000000 Binary files a/app/assets/images/menu_icon_32.png and /dev/null differ diff --git a/app/assets/images/metamap.png b/app/assets/images/metamap.png new file mode 100755 index 00000000..67674677 Binary files /dev/null and b/app/assets/images/metamap.png differ diff --git a/app/assets/images/metamap16.png b/app/assets/images/metamap16.png new file mode 100755 index 00000000..bd94d326 Binary files /dev/null and b/app/assets/images/metamap16.png differ diff --git a/app/assets/images/metamap32.png b/app/assets/images/metamap32.png new file mode 100755 index 00000000..dbbb8444 Binary files /dev/null and b/app/assets/images/metamap32.png differ diff --git a/app/assets/images/metamap32c.png b/app/assets/images/metamap32c.png new file mode 100755 index 00000000..36c3282a Binary files /dev/null and b/app/assets/images/metamap32c.png differ diff --git a/app/assets/images/metamap36c.png b/app/assets/images/metamap36c.png new file mode 100755 index 00000000..a206a860 Binary files /dev/null and b/app/assets/images/metamap36c.png differ diff --git a/app/assets/images/new.png b/app/assets/images/new.png deleted file mode 100644 index 18b470a9..00000000 Binary files a/app/assets/images/new.png and /dev/null differ diff --git a/app/assets/images/newmap.png b/app/assets/images/newmap.png new file mode 100755 index 00000000..733107c6 Binary files /dev/null and b/app/assets/images/newmap.png differ diff --git a/app/assets/images/photo.png b/app/assets/images/photo.png new file mode 100755 index 00000000..397d343e Binary files /dev/null and b/app/assets/images/photo.png differ diff --git a/app/assets/images/remove.png b/app/assets/images/remove.png new file mode 100755 index 00000000..6f469cb8 Binary files /dev/null and b/app/assets/images/remove.png differ diff --git a/app/assets/images/search.png b/app/assets/images/search.png new file mode 100755 index 00000000..b7e53cb7 Binary files /dev/null and b/app/assets/images/search.png differ diff --git a/app/assets/images/search_icon_32x32.png b/app/assets/images/search_icon_32x32.png deleted file mode 100644 index 00a6dc34..00000000 Binary files a/app/assets/images/search_icon_32x32.png and /dev/null differ diff --git a/app/assets/images/settings.png b/app/assets/images/settings.png deleted file mode 100644 index d3348a38..00000000 Binary files a/app/assets/images/settings.png and /dev/null differ diff --git a/app/assets/images/settings32.png b/app/assets/images/settings32.png new file mode 100755 index 00000000..d1261782 Binary files /dev/null and b/app/assets/images/settings32.png differ diff --git a/app/assets/images/share.png b/app/assets/images/share.png new file mode 100755 index 00000000..667a1d86 Binary files /dev/null and b/app/assets/images/share.png differ diff --git a/app/assets/images/spinner.gif b/app/assets/images/spinner.gif deleted file mode 100644 index e17b93cd..00000000 Binary files a/app/assets/images/spinner.gif and /dev/null differ diff --git a/app/assets/images/synapse16.png b/app/assets/images/synapse16.png new file mode 100755 index 00000000..3e33e504 Binary files /dev/null and b/app/assets/images/synapse16.png differ diff --git a/app/assets/images/synapse32scard.png b/app/assets/images/synapse32scard.png new file mode 100755 index 00000000..4510a484 Binary files /dev/null and b/app/assets/images/synapse32scard.png differ diff --git a/app/assets/images/synapse32tmcard.png b/app/assets/images/synapse32tmcard.png new file mode 100755 index 00000000..cd51f59e Binary files /dev/null and b/app/assets/images/synapse32tmcard.png differ diff --git a/app/assets/images/synapsedirection.png b/app/assets/images/synapsedirection.png new file mode 100755 index 00000000..b483c46b Binary files /dev/null and b/app/assets/images/synapsedirection.png differ diff --git a/app/assets/images/synapsedirectionright.png b/app/assets/images/synapsedirectionright.png new file mode 100755 index 00000000..2906864d Binary files /dev/null and b/app/assets/images/synapsedirectionright.png differ diff --git a/app/assets/images/synapsestar.png b/app/assets/images/synapsestar.png new file mode 100755 index 00000000..08c9d142 Binary files /dev/null and b/app/assets/images/synapsestar.png differ diff --git a/app/assets/images/synapsevisualize.png b/app/assets/images/synapsevisualize.png deleted file mode 100644 index a3f85f59..00000000 Binary files a/app/assets/images/synapsevisualize.png and /dev/null differ diff --git a/app/assets/images/topbg.png b/app/assets/images/topbg.png deleted file mode 100644 index f56313e3..00000000 Binary files a/app/assets/images/topbg.png and /dev/null differ diff --git a/app/assets/images/topbg2.png b/app/assets/images/topbg2.png deleted file mode 100644 index a433e648..00000000 Binary files a/app/assets/images/topbg2.png and /dev/null differ diff --git a/app/assets/images/topic16.png b/app/assets/images/topic16.png new file mode 100755 index 00000000..18f6ee7a Binary files /dev/null and b/app/assets/images/topic16.png differ diff --git a/app/assets/images/topic32.png b/app/assets/images/topic32.png new file mode 100755 index 00000000..d6360c1a Binary files /dev/null and b/app/assets/images/topic32.png differ diff --git a/app/assets/images/upload.png b/app/assets/images/upload.png new file mode 100755 index 00000000..1f49f9f3 Binary files /dev/null and b/app/assets/images/upload.png differ diff --git a/app/assets/images/user.png b/app/assets/images/user.png new file mode 100755 index 00000000..f30804dc Binary files /dev/null and b/app/assets/images/user.png differ diff --git a/app/assets/images/useradmin.png b/app/assets/images/useradmin.png new file mode 100755 index 00000000..0fd2e03e Binary files /dev/null and b/app/assets/images/useradmin.png differ diff --git a/app/assets/images/userlogout.png b/app/assets/images/userlogout.png new file mode 100755 index 00000000..816083db Binary files /dev/null and b/app/assets/images/userlogout.png differ diff --git a/app/assets/images/usersettings.png b/app/assets/images/usersettings.png new file mode 100755 index 00000000..2ca328f9 Binary files /dev/null and b/app/assets/images/usersettings.png differ diff --git a/app/assets/images/usershareinvite.png b/app/assets/images/usershareinvite.png new file mode 100755 index 00000000..84b1a917 Binary files /dev/null and b/app/assets/images/usershareinvite.png differ diff --git a/app/assets/images/xlightbox.png b/app/assets/images/xlightbox.png new file mode 100755 index 00000000..04144909 Binary files /dev/null and b/app/assets/images/xlightbox.png differ diff --git a/app/assets/images/zoomextents.png b/app/assets/images/zoomextents.png new file mode 100755 index 00000000..256ed2da Binary files /dev/null and b/app/assets/images/zoomextents.png differ diff --git a/app/assets/images/zoomin.png b/app/assets/images/zoomin.png new file mode 100755 index 00000000..f02613ca Binary files /dev/null and b/app/assets/images/zoomin.png differ diff --git a/app/assets/images/zoomout.png b/app/assets/images/zoomout.png new file mode 100755 index 00000000..c54b4c4b Binary files /dev/null and b/app/assets/images/zoomout.png differ diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 03dbf2d4..e9f5ce8c 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -81,7 +81,7 @@ html { } body { - background: #d8d9da url(/assets/shattered_@2X.png); + background: #d8d9da url(shattered_@2X.png); font-family: 'din-medium', helvetica, sans-serif; color: #424242; } @@ -708,14 +708,14 @@ h3.filterBox { position: absolute; width: 32px; height: 32px; - background-image: url('junto.png'); + background-image: url('junto32.png'); background-size: 32px 32px; background-position: center center; background-repeat: no-repeat; cursor: pointer; } .sidebarCollaborateIcon.blue { - background-image: url('junto.png'); + background-image: url('junto32.png'); } .sidebarCollaborateBox { display: none; @@ -762,10 +762,10 @@ h3.realtimeBoxTitle { margin-bottom: 5px; } .realtimeMapperList .littleRtOff { - background-image: url('/assets/MMCCicon_realtime_junto.png'); + background-image: url('junto24.png'); } .realtimeMapperList .littleRtOn { - background-image: url('/assets/MMCCicon_realtime_blue.png'); + background-image: url('junto24.png'); } /* end collaborate */ @@ -1747,238 +1747,20 @@ div.mapInfoStat { display: block; width: 32px; height: 32px; - background: url('new.png') no-repeat center center; + background: url('newmap.png') no-repeat center center; background-size: 32px 32px; cursor: pointer; border-radius: 2px; margin-right: 10px; } -/* --- styling the logo button ---*/ + .home_bg { display: block; height: 100%; } -/* home page */ -div#preloaded-images { - position: absolute; - overflow: hidden; - left: -9999px; - top: -9999px; -} -.home_content { - width: 830px; - margin: 0 auto; -} -span.blue { - color: #36bbe8; -} -.home_desc { - font-family: 'LatoLight'; - font-size: 32px; - margin: 40px 20px 25px; - text-align: center; -} -.home_desc .welcomeTo { - text-transform: uppercase; - font-size: 50px; - font-family: 'Vinyl'; - font-style: italic; -} -.home_content .request { - margin-right: 17px !important; -} -.home_content .request, -.home_content .learnmore { - margin: 5px auto; - background: white; - height: 40px; - font-family: 'Vinyl'; - font-size: 18px; - font-style: italic; - width: 135px; - padding: 0 15px; - cursor: pointer; - color: black; - line-height: 44px; - font-weight: normal; - text-transform: uppercase; -} -.home_content .request:hover, -.home_content .learnmore:hover { - background: white; - -webkit-box-shadow: none; - box-shadow: none; -} -.metamapsIs {} .metamapsIs .swapWord { - display: block; -} -#homeMapImage { - margin: 5px auto; -} -.featuredMaps { - margin: 15px 0; - font-size: 20px; - line-height: 20px; - text-align: center; -} -#homeMap { - width: 738px; - margin: 0 auto; - height: 340px; - position: relative; - overflow: hidden; -} -#homeFigure { - height: 335px; - width: 738px; - margin: 0; -} -#homeFigure figure { - float: left; - margin: 10px !important; - overflow: hidden; - display: -webkit-box; - display: -moz-box; - display: -ms-flexbox; - display: -webkit-flex; - display: flex; - -webkit-box-orient: vertical; - -moz-box-orient: vertical; - -webkit-box-direction: normal; - -moz-box-direction: normal; - -ms-flex-direction: column; - -webkit-flex-direction: column; - flex-direction: column; -} -#homeMap .links { - font-size: 14px; - font-family: Lato; - flex: none; -} -#homeMap .title { - margin: 10px; - flex: none; -} -#homeMap .linkItem.contributor { - background-position: 5px center; - background-size: 20px 20px; - position: relative; - padding-left: 28px; - line-height: 40px; - margin-left: 0px; - padding-right: 2px; -} -#homeMap .mapPerm { - height: 40px; - background-repeat: no-repeat; - background-position: 5px center; - background-size: 20px 20px; - position: relative; - padding-left: 28px; - line-height: 40px; -} -#homeMap .mapPerm.co { - background-image: url(MMCCicon_commons.png); -} -#homeMap .mapPerm.pu { - background-image: url(MMCCicon_public.png); -} -#homeMap .mapPerm.pr { - background-image: url(MMCCicon_private.png); -} -#homeMap .desc { - color: #555555; - padding: 15px 5px 0 15px; - overflow: hidden; - -webkit-box-flex: 1; - -moz-box-flex: 1; - -webkit-flex: 1; - -ms-flex: 1; - flex: 1; -} -.mapContains { - max-height: 40px; - line-height: 40px; - bottom: 0; - width: 100%; - border-top: 1px solid #AAAAAA; - -webkit-box-flex: 1; - -moz-box-flex: 1; - -webkit-flex: 1; - -ms-flex: 1; - flex: 1; -} -.mapContains span { - display: inline-block; - text-align: left; - padding-left: 27px; -} -.mapContains .topicCount { - background-image: url(MMCCicon_topic.png); - background-size: 20px 20px; - background-repeat: no-repeat; - background-position: 5px center; - line-height: 40px; - width: 72px; -} -.mapContains .synapseCount { - background-image: url(MMCCicon_synapse_black.png); - background-size: 20px 20px; - background-repeat: no-repeat; - background-position: 5px center; - line-height: 40px; - width: 95px; -} -#homeFigure figure .littleOverlay { - position: absolute; - top: 100%; - width: 100%; - z-index: 2; - background: rgba(255, 255, 255, 0); - transition: .6s; - border-radius: 5px; -} -#homeFigure figure:hover .littleOverlay { - /*top: 0; - background: rgba(255,255,255, 0.9); - bottom: 0; */ -} -#homeMap .map, -#homeMap .mapCard { - height: 315px; -} -.socialIcons { - position: fixed; - bottom: 0px; - height: 37px; - right: 0px; -} -.socialIcons a { - float: left; - height: 30px; - width: 30px; - margin: 0 7px 7px 0px; - background-repeat: no-repeat; - background-size: 30px 30px; -} -.socialIcons .twitter { - background-image: url('MMSocial-51.png'); -} -.socialIcons .google { - background-image: url('MMSocial-52.png'); -} -.socialIcons .wordpress { - background-image: url('MMSocial-53.png'); -} -.contact { - text-align: center; - margin: 1em 0 1em 0; -} -.contact a { - color: #36bbe8; -} + #edit_synapse label, #edit_synapse_left, #edit_synapse_right { diff --git a/app/assets/stylesheets/clean.css b/app/assets/stylesheets/clean.css index c0e4a4e8..311fea4b 100644 --- a/app/assets/stylesheets/clean.css +++ b/app/assets/stylesheets/clean.css @@ -87,7 +87,7 @@ } .logo { - color: #6B6B6B; + color: #9E9E9E; font-family: "vinyl", sans-serif; font-style: italic; text-transform: uppercase; @@ -131,7 +131,7 @@ .homeButton { width: 40px; height: 32px; - background: #757575; + background: #757575 url(home.png) no-repeat center center; border-top-left-radius: 2px; border-bottom-left-radius: 2px; float:left; @@ -158,8 +158,8 @@ border-top-right-radius: 2px; border-bottom-right-radius: 2px; height: 32px; - background: #4fb5c0 url('search_icon_32x32.png') no-repeat center center; - background-size: 25px 25px; + background: #4fb5c0 url('search.png') no-repeat center center; + background-size: 32px 32px; cursor: pointer; } .sidebarSearch .twitter-typeahead, .sidebarSearch .sidebarSearchField { @@ -585,15 +585,12 @@ cursor: pointer; } .openCheatsheet { - background: url('MMCCicon_help.png') no-repeat center center; - background-size: 27px 27px; + background: url('help.png') no-repeat center center; } - .mapInfoIcon { position: relative; top: 56px; /* puts it just offscreen */ - background: url('MMCCicon_info.png') no-repeat center center; - background-size: 19px 19px; + background: url('mapinfo.png') no-repeat center center; } .mapPage .mapInfoIcon { top: 0; @@ -626,17 +623,25 @@ width:32px; height:32px; background-color: #424242; + background-repeat: no-repeat; + background-position: center center; cursor:pointer; } -.centerMap, .zoomExtents { +.zoomExtents { + margin-bottom:5px; border-radius: 2px; } +.zoomExtents { + background-image: url(zoomextents.png); +} .zoomIn { + background-image: url(zoomin.png); border-top-left-radius: 2px; border-top-right-radius: 2px; } .zoomOut { + background-image: url(zoomout.png); border-bottom-left-radius: 2px; border-bottom-right-radius: 2px; } @@ -672,17 +677,24 @@ font-family: 'din-medium'; font-size: 14px; height: 14px; - padding: 14px; + padding: 14px 16px 12px 40px; + border-bottom: 2px solid rgba(0,0,0,0); display: inline-block; cursor: pointer; } -.exploreMapsCenter a.active { - text-decoration: none; - color:#424242; -} -.exploreMapsCenter a:hover { +.exploreMapsCenter a:hover, .exploreMapsCenter a.active { text-decoration: none; color: #424242; + border-bottom: 2px solid #00BCD4; +} +.exploreMapsCenter .myMaps { + background: url(metamap.png) no-repeat 0 center; +} +.exploreMapsCenter .activeMaps { + background: url(activity.png) no-repeat 0 center; +} +.exploreMapsCenter .featuredMaps { + background: url(featured.png) no-repeat 0 center; } .mapsWrapper { diff --git a/app/views/layouts/_lowermapelements.html.erb b/app/views/layouts/_lowermapelements.html.erb index 9942c139..c69d475f 100644 --- a/app/views/layouts/_lowermapelements.html.erb +++ b/app/views/layouts/_lowermapelements.html.erb @@ -1,8 +1,7 @@
-
E
-
C
-
+
-
-
+
+
+
diff --git a/public/famous/templates.js b/public/famous/templates.js index c241d596..0dee45a3 100644 --- a/public/famous/templates.js +++ b/public/famous/templates.js @@ -11,24 +11,24 @@ t.logoContent += '
  • Get Involved! t.logoContent += ''; /* logged out explore maps bars */ - t.activeContent = 'Recently Active Maps'; - t.activeContent += 'Featured Maps'; + t.activeContent = 'Recently Active Maps'; + t.activeContent += 'Featured Maps'; - t.featuredContent = 'Recently Active Maps'; - t.featuredContent += 'Featured Maps'; + t.featuredContent = 'Recently Active Maps'; + t.featuredContent += 'Featured Maps'; /* logged in explore maps bars */ - t.mineAuthContent = 'My Maps'; - t.mineAuthContent += 'Recently Active'; - t.mineAuthContent += 'Featured'; + t.mineAuthContent = 'My Maps'; + t.mineAuthContent += 'Recently Active'; + t.mineAuthContent += 'Featured'; - t.activeAuthContent = 'My Maps'; - t.activeAuthContent += 'Recently Active'; - t.activeAuthContent += 'Featured'; + t.activeAuthContent = 'My Maps'; + t.activeAuthContent += 'Recently Active'; + t.activeAuthContent += 'Featured'; - t.featuredAuthContent = 'My Maps'; - t.featuredAuthContent += 'Recently Active'; - t.featuredAuthContent += 'Featured'; + t.featuredAuthContent = 'My Maps'; + t.featuredAuthContent += 'Recently Active'; + t.featuredAuthContent += 'Featured'; module.exports = t; });