From ca71532060641cc253f3ce6abe2971b58158d0a3 Mon Sep 17 00:00:00 2001 From: ultimatemember Date: Wed, 14 Jan 2015 15:13:19 +0200 Subject: [PATCH] Update to FontIcons --- admin/assets/css/um-admin-modal.css | 2 +- admin/assets/js/um-admin-dragdrop.js | 6 +- admin/assets/js/um-admin-modal.js | 4 +- admin/core/um-admin-actions-modal.php | 8 +- admin/core/um-admin-builder.php | 28 +- admin/core/um-admin-dragdrop.php | 16 +- admin/core/um-admin-metabox.php | 54 +- admin/core/um-admin-redux.php | 2 +- admin/core/um-admin-roles.php | 4 +- admin/templates/dashboard.php | 5 +- admin/templates/dashboard/overview.php | 2 +- admin/templates/directory/profile.php | 8 +- admin/templates/directory/search.php | 4 +- admin/templates/form/builder.php | 4 +- admin/templates/form/profile_settings.php | 4 +- assets/css/um-fonticons.css | 12142 +------------------- assets/css/um-members.css | 14 +- assets/css/um-modal.css | 2 +- assets/font/ultimatemember.eot | Bin 886756 -> 125904 bytes assets/font/ultimatemember.svg | 4685 +------- assets/font/ultimatemember.ttf | Bin 886564 -> 125712 bytes assets/font/ultimatemember.woff | Bin 483560 -> 77292 bytes assets/js/um-scripts.js | 16 +- core/um-actions-account.php | 12 +- core/um-actions-members.php | 4 +- core/um-actions-profile.php | 8 +- core/um-builtin.php | 16 +- core/um-fields.php | 14 +- core/um-files.php | 24 +- core/um-form.php | 6 +- templates/account.php | 2 +- templates/modal/um_view_photo.php | 2 +- um-config.php | 16 +- 33 files changed, 1102 insertions(+), 16012 deletions(-) diff --git a/admin/assets/css/um-admin-modal.css b/admin/assets/css/um-admin-modal.css index 4e18099a..ab10df6c 100644 --- a/admin/assets/css/um-admin-modal.css +++ b/admin/assets/css/um-admin-modal.css @@ -235,7 +235,7 @@ p._icon_search input[type=text]{padding-right: 40px!important} cursor: pointer; float: left; margin: 5px; - color: #bbb; + color: #777; border: 4px solid #eee; border-radius: 3px; } diff --git a/admin/assets/js/um-admin-dragdrop.js b/admin/assets/js/um-admin-dragdrop.js index 42d8de82..5e613284 100644 --- a/admin/assets/js/um-admin-dragdrop.js +++ b/admin/assets/js/um-admin-dragdrop.js @@ -85,7 +85,7 @@ function UM_update_rows(){ c++; row = jQuery(this); if ( c != 1 ) { - row.find('.um-admin-drag-row-icons').append( '' ); + row.find('.um-admin-drag-row-icons').append( '' ); } }); } @@ -98,7 +98,7 @@ function UM_update_subrows(){ c++; row = jQuery(this); if ( c != 1 ) { - row.find('.um-admin-drag-rowsub-icons').append( '' ); + row.find('.um-admin-drag-rowsub-icons').append(''); } }); }); @@ -240,7 +240,7 @@ function UM_Rows_Refresh(){ function UM_Add_Icon(){ - var add_icon_html = ''; + var add_icon_html = ''; jQuery('.um-admin-drag-col').each(function(){ if ( jQuery(this).find('.um-admin-drag-add-field').length == 0 ) { diff --git a/admin/assets/js/um-admin-modal.js b/admin/assets/js/um-admin-modal.js index 64232a29..29649605 100644 --- a/admin/assets/js/um-admin-modal.js +++ b/admin/assets/js/um-admin-modal.js @@ -11,7 +11,7 @@ function um_admin_new_modal( id, ajax, size ){ jQuery('#' + id).show(); jQuery('.um-admin-modal').show(); - jQuery('.um-admin-modal-head').append(''); + jQuery('.um-admin-modal-head').append(''); if ( ajax == true ) { um_admin_modal_size( size ); @@ -168,7 +168,7 @@ jQuery(document).ready(function() { link.addClass('active'); } else { content.hide(); - link.find('i').removeClass().addClass('um-icon-plus-add'); + link.find('i').removeClass().addClass('um-icon-plus'); link.removeClass('active'); } um_admin_modal_responsive(); diff --git a/admin/core/um-admin-actions-modal.php b/admin/core/um-admin-actions-modal.php index 21eb273b..ab0d8f17 100644 --- a/admin/core/um-admin-actions-modal.php +++ b/admin/core/um-admin-actions-modal.php @@ -20,9 +20,9 @@
in_edit = true; $metabox->edit_array = $edit_array; ?> - tooltip('Here you can setup conditional logic to show/hide this field based on specific fields value or conditions'); ?> + tooltip('Here you can setup conditional logic to show/hide this field based on specific fields value or conditions'); ?> - tooltip('Here you can setup conditional logic to show/hide this field based on specific fields value or conditions'); ?> + tooltip('Here you can setup conditional logic to show/hide this field based on specific fields value or conditions'); ?>
@@ -44,7 +44,7 @@ field_input( '_conditional_value' . $k, $form_id ); ?> -

+

@@ -67,7 +67,7 @@ field_input( '_conditional_operator', $form_id ); ?> field_input( '_conditional_value', $form_id ); ?> -

+

diff --git a/admin/core/um-admin-builder.php b/admin/core/um-admin-builder.php index 1e808969..1e26168e 100644 --- a/admin/core/um-admin-builder.php +++ b/admin/core/um-admin-builder.php @@ -89,9 +89,9 @@ class UM_Admin_Builder {
- - - + + +
@@ -106,7 +106,7 @@ class UM_Admin_Builder {
- +
@@ -155,9 +155,9 @@ class UM_Admin_Builder {
- - - + + + @@ -204,8 +204,8 @@ class UM_Admin_Builder {
- - 0 ) { ?> + + 0 ) { ?>
@@ -226,7 +226,7 @@ class UM_Admin_Builder {
- +
@@ -234,16 +234,16 @@ class UM_Admin_Builder {
builtin->core_fields[$type]['name']; ?>
- + - + - + - + diff --git a/admin/core/um-admin-dragdrop.php b/admin/core/um-admin-dragdrop.php index 8c8795c0..42ae7741 100644 --- a/admin/core/um-admin-dragdrop.php +++ b/admin/core/um-admin-dragdrop.php @@ -137,10 +137,10 @@ class UM_Admin_DragDrop {