diff --git a/admin/assets/css/um-admin-misc.css b/admin/assets/css/um-admin-misc.css index 52b5258c..ea9a4769 100644 --- a/admin/assets/css/um-admin-misc.css +++ b/admin/assets/css/um-admin-misc.css @@ -228,6 +228,8 @@ p.disabled-on-off .um-admin-yesno *{ border-radius: 1px; cursor: pointer; border: solid 1px #cccccc; + margin: 0; + padding: 0 !important; } .um-admin-yesno span.btn.pos-1 {left: 60px} diff --git a/assets/css/um-account.css b/assets/css/um-account.css index 4942e817..f44e51bf 100644 --- a/assets/css/um-account.css +++ b/assets/css/um-account.css @@ -28,10 +28,6 @@ - Main tab */ -.um-account-main div.um-field { - padding-top: 25px; -} - .um-account-main div.um-account-heading { margin: 0 !important; font-size: 18px; @@ -65,20 +61,26 @@ margin-bottom: 20px; } -.um-account-meta img {margin: 0 !important} +.um-account-meta img { + margin: 0 !important; + position: static !important; + float: none !important; + display: inline-block; +} -.um-account-meta.radius-1 img { border-radius: 999px } -.um-account-meta.radius-2 img { border-radius: 4px } -.um-account-meta.radius-3 img { border-radius: 0 } +.um-account-meta.radius-1 img { -moz-border-radius: 999px;-webkit-border-radius: 999px;border-radius: 999px } +.um-account-meta.radius-2 img { -moz-border-radius: 4px;-webkit-border-radius: 4px;border-radius: 4px } +.um-account-meta.radius-3 img { -moz-border-radius: 0;-webkit-border-radius: 0;border-radius: 0 } .um-account-name a { font-weight: bold; - color: #555; + color: #555 !important; text-decoration: none !important; font-size: 18px; + line-height: 2em; } -.um-account-name a:hover {color: #3ba1da} +.um-account-name a:hover {color: #3ba1da !important} /* - Account nav @@ -88,7 +90,7 @@ display: block; height: 44px; line-height: 44px; - color: #666; + color: #666 !important; text-decoration: none !important; position: relative; padding-left: 40px; diff --git a/assets/css/um-fileupload.css b/assets/css/um-fileupload.css index 933265d3..5710a92d 100644 --- a/assets/css/um-fileupload.css +++ b/assets/css/um-fileupload.css @@ -12,6 +12,8 @@ display: block; overflow: hidden; margin: auto; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; border-radius: 3px; } @@ -37,6 +39,8 @@ right: -15px; width: 30px; height: 30px; + -moz-border-radius: 999px; + -webkit-border-radius: 999px; border-radius: 999px; background: #ddd; cursor: pointer; @@ -73,6 +77,8 @@ display: inline-block; width: 100px; height: 70px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; border-radius: 3px; background-color: #666; color: #fff !important; @@ -123,6 +129,8 @@ height: 10px; color: #666; background: #7ACF58; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; border-radius: 3px; } @@ -137,6 +145,8 @@ padding: 20px; box-sizing: border-box; border: 2px dashed #ddd; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; border-radius: 3px; font-size: 18px; line-height: 1em; @@ -171,6 +181,8 @@ height: 34px; display: inline-block; text-decoration: none; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; border-radius: 3px; padding: 0 20px; color: #fff; diff --git a/assets/css/um-members.css b/assets/css/um-members.css index cddf354d..65bcad90 100644 --- a/assets/css/um-members.css +++ b/assets/css/um-members.css @@ -5,7 +5,9 @@ .um-members img { display: block; overflow:hidden; - border-radius:0!important; + -moz-border-radius: 0!important; + -webkit-border-radius: 0!important; + border-radius: 0!important; margin: 0!important; padding: 0!important; } @@ -189,9 +191,9 @@ opacity: 1; } -.um-member-photo.radius-1 img { border-radius: 999px !important } -.um-member-photo.radius-2 img { border-radius: 4px !important } -.um-member-photo.radius-3 img { border-radius: 0 !important } +.um-member-photo.radius-1 img { -moz-border-radius: 999px !important;-webkit-border-radius: 999px !important;border-radius: 999px !important } +.um-member-photo.radius-2 img { -moz-border-radius: 4px !important;-webkit-border-radius: 4px !important;border-radius: 4px !important } +.um-member-photo.radius-3 img { -moz-border-radius: 0 !important;-webkit-border-radius: 0 !important; border-radius: 0 !important } /* - Member name @@ -224,6 +226,7 @@ font-size: 13px; line-height: 22px; color: #999; + padding: 0 15px; } /* @@ -283,6 +286,8 @@ width: 40px; line-height: 40px; height: 40px; + -moz-border-radius: 999px; + -webkit-border-radius: 999px; border-radius: 999px; color: #fff !important; opacity: 0.85; @@ -337,6 +342,7 @@ transition: all .2s linear; padding: 0px 14px; color: #666; + font-weight: normal; } .um-members-pagi a:hover { diff --git a/assets/css/um-modal.css b/assets/css/um-modal.css index a6165761..8c934d4a 100644 --- a/assets/css/um-modal.css +++ b/assets/css/um-modal.css @@ -37,6 +37,8 @@ } .um-modal { + -moz-border-radius: 3px; + -webkit-border-radius: 3px; border-radius: 3px; position: fixed; left: 50%; @@ -55,10 +57,14 @@ box-sizing: border-box; width: 100%; background: #fff; + -moz-border-radius: 0 0 3px 3px; + -webkit-border-radius: 0 0 3px 3px; border-radius: 0 0 3px 3px; } .um-modal-body.photo { + -moz-border-radius: 3px; + -webkit-border-radius: 3px; border-radius: 3px; box-shadow: 0px 0px 0px 1px rgba(0, 0, 0, 0.1), 0px 0px 0px 1px rgba(255, 255, 255, 0.12) inset; background: #888; @@ -66,6 +72,8 @@ } .um-modal-body.photo img { + -moz-border-radius: 3px; + -webkit-border-radius: 3px; border-radius: 3px; display: block; overflow: hidden; @@ -82,6 +90,8 @@ } .um-modal-header { + -moz-border-radius: 3px 3px 0 0; + -webkit-border-radius: 3px 3px 0 0; border-radius: 3px 3px 0 0; height: 44px; line-height: 44px; @@ -116,6 +126,8 @@ line-height: 34px !important; height: 34px; display: inline-block; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; border-radius: 3px; padding: 0 20px; text-align: center; diff --git a/assets/css/um-profile.css b/assets/css/um-profile.css index beb82430..762fe39d 100644 --- a/assets/css/um-profile.css +++ b/assets/css/um-profile.css @@ -103,7 +103,9 @@ vertical-align: middle; height: 100%; text-decoration: none !important; - background: none; + background: none !important; + color: #fff !important; + border-bottom: none !important; } .um-cover-overlay i { @@ -121,6 +123,7 @@ padding: 0 0 25px 0; border-bottom: solid 2px #eee; min-height: 85px; + box-sizing: content-box !important; } .um-profile-edit { @@ -170,6 +173,10 @@ - Profile photo */ +.um-profile .gravatar { + position: static; +} + .um-profile-photo { float: left; position: relative; @@ -220,7 +227,9 @@ vertical-align: middle; height: 100%; text-decoration: none !important; - background: none; + background: none !important; + color: #fff !important; + border-bottom: none !important; } .um-profile-photo-overlay i { diff --git a/assets/css/um-responsive.css b/assets/css/um-responsive.css index 277bdc13..553efb64 100644 --- a/assets/css/um-responsive.css +++ b/assets/css/um-responsive.css @@ -56,6 +56,8 @@ div.uimob340 .um-profile-photo-overlay i .um-modal.uimob340, .um-modal.uimob340 .um-modal-body, .um-modal.uimob340 .um-modal-header { + -moz-border-radius: 0; + -webkit-border-radius: 0; border-radius: 0; } @@ -195,8 +197,6 @@ div.uimob340 .um-account-tab { border-bottom: 1px solid #eee; } -div.uimob340 .um-account-main div.um-field {padding-top: 15px} - div.uimob340 .um-account-meta { margin-bottom: 0; } @@ -247,6 +247,8 @@ div.uimob500 .um-profile-photo-overlay i .um-modal.uimob500, .um-modal.uimob500 .um-modal-body, .um-modal.uimob500 .um-modal-header { + -moz-border-radius: 0; + -webkit-border-radius: 0; border-radius: 0; } @@ -386,8 +388,6 @@ div.uimob500 .um-account-tab { border-bottom: 1px solid #eee; } -div.uimob500 .um-account-main div.um-field {padding-top: 15px} - div.uimob500 .um-account-meta { margin-bottom: 0; } @@ -408,6 +408,8 @@ div.uimob800 .um-account-side { div.uimob800 .um-account-side ul { border: 1px solid #ddd; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; border-radius: 3px; } @@ -424,8 +426,8 @@ div.uimob800 .um-account-side li a{ background: transparent; transition: all .2s linear; } -div.uimob800 .um-account-side li:first-child a {border-radius: 3px 3px 0 0 } -div.uimob800 .um-account-side li:last-child a {border-radius: 0 0 3px 3px} +div.uimob800 .um-account-side li:first-child a {-moz-border-radius: 3px 3px 0 0;-webkit-border-radius: 3px 3px 0 0;border-radius: 3px 3px 0 0 } +div.uimob800 .um-account-side li:last-child a {-moz-border-radius: 0 0 3px 3px;-webkit-border-radius: 0 0 3px 3px;border-radius: 0 0 3px 3px} div.uimob800 .um-account-side li a span.um-account-icontip { display: block; @@ -458,6 +460,8 @@ div.uimob800 .um-account-meta a, div.uimob800 .um-account-meta img { display: block; overflow: hidden; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; border-radius: 3px; } @@ -577,6 +581,8 @@ div.uimob960 .um-gutter-sizer {width: 4%} .um-modal.no-photo, .um-modal.no-photo .um-modal-body, .um-modal.no-photo .um-modal-header { + -moz-border-radius: 0; + -webkit-border-radius: 0; border-radius: 0; } diff --git a/assets/css/um-select.css b/assets/css/um-select.css index 4bb7cc87..d7733262 100644 --- a/assets/css/um-select.css +++ b/assets/css/um-select.css @@ -43,6 +43,8 @@ Version: 3.4.8 Timestamp: Thu May 1 09:50:32 EDT 2014 text-align: left !important; text-decoration: none !important; + -moz-border-radius: 2px !important; + -webkit-border-radius: 2px !important; border-radius: 2px !important; background-clip: padding-box !important; @@ -58,7 +60,8 @@ Version: 3.4.8 Timestamp: Thu May 1 09:50:32 EDT 2014 } .select2-container.select2-drop-above .select2-choice { - + -moz-border-radius: 0 0 2px 2px !important; + -webkit-border-radius: 0 0 2px 2px !important; border-radius: 0 0 2px 2px !important; } @@ -76,6 +79,7 @@ Version: 3.4.8 Timestamp: Thu May 1 09:50:32 EDT 2014 text-overflow: ellipsis !important; float: none !important; width: auto !important; + font-weight: normal; } .select2-container .select2-choice abbr { @@ -129,6 +133,8 @@ Version: 3.4.8 Timestamp: Thu May 1 09:50:32 EDT 2014 background: #fff; color: #666; + -moz-border-radius: 0 0 2px 2px; + -webkit-border-radius: 0 0 2px 2px; border-radius: 0 0 2px 2px; box-shadow: none; @@ -138,6 +144,8 @@ Version: 3.4.8 Timestamp: Thu May 1 09:50:32 EDT 2014 .select2-drop.select2-drop-above { margin-top: 1px; + -moz-border-radius: 2px 2px 0 0; + -webkit-border-radius: 2px 2px 0 0; border-radius: 2px 2px 0 0; box-shadow: none; @@ -167,6 +175,8 @@ Version: 3.4.8 Timestamp: Thu May 1 09:50:32 EDT 2014 position: absolute !important; right: 0 !important; top: 0 !important; + -moz-border-radius: 0 2px 2px 0 !important; + -webkit-border-radius: 0 2px 2px 0 !important; border-radius: 0 2px 2px 0 !important; background-clip: padding-box !important; text-align: center !important; @@ -220,6 +230,8 @@ Version: 3.4.8 Timestamp: Thu May 1 09:50:32 EDT 2014 outline: 0 !important; border: 1px solid #ddd !important; color: #666 !important; + -moz-border-radius: 2px !important; + -webkit-border-radius: 2px !important; border-radius: 2px !important; font-size: 15px !important; box-sizing: border-box !important; @@ -425,7 +437,10 @@ disabled look for disabled choices in the results dropdown cursor: text !important; overflow: hidden !important; + -moz-border-radius: 2px !important; + -webkit-border-radius: 2px !important; border-radius: 2px !important; + box-shadow: none !important; } @@ -485,7 +500,10 @@ html[dir="rtl"] .select2-container-multi .select2-choices li cursor: default; border: 1px solid #dddddd; + -moz-border-radius: 2px; + -webkit-border-radius: 2px; border-radius: 2px; + box-shadow: none !important; -webkit-touch-callout: none; diff --git a/assets/css/um-styles.css b/assets/css/um-styles.css index 629abcc7..4b47255a 100644 --- a/assets/css/um-styles.css +++ b/assets/css/um-styles.css @@ -45,6 +45,15 @@ outline: 0 !important; } +.um a .image-overlay, +.um a:hover .image-overlay, +.um a:hover .image-overlay * { + display: none !important; + width: 0 !important; + height: 0 !important; + position: static !important; +} + /* only in admin mode */ .um.um-in-admin { padding-top: 0; @@ -147,12 +156,14 @@ p.um-notice { width: auto; - border-radius: 3px; color: #fff; box-sizing: border-box; font-size: 15px; padding: 12px !important; margin: 12px 0 0 0 !important; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; } p.um-notice.success { @@ -171,6 +182,8 @@ p.um-notice.err { width: auto; max-width: 100%; background: #C74A4A; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; border-radius: 3px; color: #fff; box-sizing: border-box; @@ -197,6 +210,8 @@ p.um-notice.err { width: auto; max-width: 100%; background: #C74A4A; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; border-radius: 3px; color: #fff; box-sizing: border-box; @@ -259,9 +274,9 @@ p.um-notice.err { .um-field-label .um-field-label-icon i { font-size: 22px; height: 22px; line-height: 22px; vertical-align: middle; } .um-field-label label { - display: inline-block; + display: inline-block !important; height: 22px; - font-size: 15px; + font-size: 15px !important; line-height: 22px !important; font-weight: bold; font-weight: 600; @@ -303,18 +318,21 @@ p.um-notice.err { .um-form input[type=text], .um-form input[type=password] { - padding: 0 12px; - width: 100%; - display: block; + padding: 0 12px !important; + width: 100% !important; + display: block !important; + -moz-border-radius: 2px; + -webkit-border-radius: 2px; border-radius: 2px; outline: none !important; cursor: text !important; font-size: 15px !important; height: 40px !important; - box-sizing: border-box; + box-sizing: border-box !important; box-shadow: none !important; - margin: 0; + margin: 0 !important; position: static; + outline: none !important; } .um-form input[type=text]:focus , @@ -323,6 +341,7 @@ p.um-notice.err { border-color: #ccc; background-color: #fff !important; box-shadow: none !important; + outline: none !important; } .um-form input[type=text].um-iconed, @@ -333,15 +352,18 @@ p.um-notice.err { .um-form textarea { width: 100%; - padding: 8px 12px; + padding: 8px 12px !important; display: block; font-size: 15px !important; line-height: 22px !important; background: #fff; + -moz-border-radius: 2px; + -webkit-border-radius: 2px; border-radius: 2px; box-sizing: border-box; - min-height: 80px; + min-height: 80px !important; box-shadow: none; + outline: none !important; } /* @@ -354,14 +376,9 @@ p.um-notice.err { margin: 8px 0; position: relative; cursor: pointer; - color: #888; } -.um-field-checkbox:hover i, -.um-field-radio:hover i -{ -color: #666 -} +.um-field-checkbox:hover i, .um-field-radio:hover i {color: #666} .um-field-checkbox input, .um-field-radio input{display:none!important} @@ -389,6 +406,7 @@ color: #666 .um-field-radio-option { margin: 0 0 0 36px; line-height: 24px; + color: #888 !important; } /* @@ -408,10 +426,11 @@ color: #666 transition: 0.25s; box-sizing: border-box; + -moz-border-radius: 4px !important; + -webkit-border-radius: 4px !important; border-radius: 4px !important; border-top: 1px solid rgba(0,0,0,0.0) !important; border-bottom: 2px solid rgba(0, 0, 0, 0.1) !important; - letter-spacing: 0.5px; } .um-field-group-head i { @@ -428,6 +447,8 @@ color: #666 margin: 15px 0 0 0; padding: 15px 20px 5px 20px; background: #f9f9f9; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; border-radius: 3px; position: relative; box-sizing: border-box; @@ -469,6 +490,14 @@ input[type=submit].um-button:focus { width: 100%; box-shadow: none; text-shadow: none; + font-family: inherit; + outline: none !important; + margin: 0; + opacity: 1; +} + +input[type=submit].um-button:hover { + opacity: 1; } .um-button { @@ -487,10 +516,12 @@ input[type=submit].um-button:focus { transition: 0.25s; box-sizing: border-box; + -moz-border-radius: 4px !important; + -webkit-border-radius: 4px !important; border-radius: 4px !important; border-top: 1px solid rgba(0,0,0,0.0) !important; border-bottom: 2px solid rgba(0, 0, 0, 0.1) !important; - letter-spacing: 0.5px; + opacity: 1; } @@ -520,8 +551,10 @@ a.um-link-alt:hover {text-decoration: underline !important;} position: absolute; height: auto; background: #fff; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; border-radius: 5px; - z-index: 1; + z-index: 10; display: none; border: 1px solid #e5e5e5; box-sizing: border-box; @@ -540,10 +573,8 @@ a.um-link-alt:hover {text-decoration: underline !important;} display: block; padding: 8px 12px; color: #666; - z-index: 4; font-size: 14px; line-height: 18px; - position: relative; } .um-dropdown li:last-child a { @@ -566,7 +597,7 @@ a.um-link-alt:hover {text-decoration: underline !important;} width: 24px; height: 24px; overflow: hidden; - z-index: 2; + z-index: 15; color: #eee; } @@ -586,6 +617,8 @@ div.um-photo { div.um-photo, div.um-photo a, div.um-photo img { + -moz-border-radius: 3px; + -webkit-border-radius: 3px; border-radius: 3px; } diff --git a/assets/dynamic_css/dynamic_profile.php b/assets/dynamic_css/dynamic_profile.php index da17cca0..f74432f2 100644 --- a/assets/dynamic_css/dynamic_profile.php +++ b/assets/dynamic_css/dynamic_profile.php @@ -10,7 +10,7 @@ print " .um-$form_id.um .um-profile-photo a.um-profile-photo-img, .um-$form_id.um .um-profile-photo img, .um-$form_id.um .um-profile-photo span.um-profile-photo-overlay -{ border-radius: 999px !important }"; +{ -moz-border-radius: 999px !important; -webkit-border-radius: 999px !important; border-radius: 999px !important }"; } if ( $photocorner == 2 ) { @@ -18,7 +18,7 @@ print " .um-$form_id.um .um-profile-photo a.um-profile-photo-img, .um-$form_id.um .um-profile-photo img, .um-$form_id.um .um-profile-photo span.um-profile-photo-overlay -{ border-radius: 4px !important }"; +{ -moz-border-radius: 4px !important; -webkit-border-radius: 4px !important; border-radius: 4px !important }"; } if ( $photocorner == 3 ) { @@ -26,7 +26,7 @@ print " .um-$form_id.um .um-profile-photo a.um-profile-photo-img, .um-$form_id.um .um-profile-photo img, .um-$form_id.um .um-profile-photo span.um-profile-photo-overlay -{ border-radius: 0px !important }"; +{ -moz-border-radius: 0px !important; -webkit-border-radius: 0px !important; border-radius: 0px !important }"; } print " diff --git a/assets/js/um-tipsy.js b/assets/js/um-tipsy.js index f95c063f..d0c6a872 100644 --- a/assets/js/um-tipsy.js +++ b/assets/js/um-tipsy.js @@ -37,7 +37,7 @@ width: this.$element[0].offsetWidth, height: this.$element[0].offsetHeight }); - + var actualWidth = $tip[0].offsetWidth, actualHeight = $tip[0].offsetHeight, gravity = maybeCall(this.options.gravity, this.$element[0]); @@ -54,7 +54,13 @@ tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth - this.options.offset}; break; case 'w': - tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width + this.options.offset}; + extra_gap = 0; + if ( $('body').css('position').length > 0 && $('body').css('position') == 'relative' ) { + if ( $('#wpadminbar').length ) { + extra_gap = $('#wpadminbar').height(); + } + } + tp = {top: pos.top + pos.height / 2 - actualHeight / 2 - extra_gap, left: pos.left + pos.width + this.options.offset}; break; } diff --git a/core/um-actions-account.php b/core/um-actions-account.php index a08c2246..93ad448f 100644 --- a/core/um-actions-account.php +++ b/core/um-actions-account.php @@ -133,7 +133,7 @@ if ( $output ) { ?> -