10h30/ultimatemember
1
0
Fork 0
mirror of https://github.com/10h30/ultimatemember.git synced 2026-07-11 18:56:10 +09:00
Code Issues Packages Projects Releases Wiki Activity

Update 1.3.29

Browse Source
This commit is contained in:
champsupertramp
2015-11-05 19:51:31 +08:00
parent 8b89da079a
commit 0634f773d5
260 changed files with 21302 additions and 5951 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/css/um-account.css
+5 -1
View File
@@ -25,6 +25,10 @@
box-sizing: border-box;
}
.um-account-main a {
border-bottom: none !important;
}
.um-account-tab {
display: none;
}
@@ -97,7 +101,7 @@
text-decoration: none !important;
position: relative;
padding-left: 40px;
border-bottom: 1px solid #eee;
border-bottom: 1px solid #eee !important;
transition: all .2s linear;
font-size: 14px;
}
assets/css/um-misc.css
+26
View File
@@ -62,4 +62,30 @@
line-height: 36px;
height: 36px;
font-size: 20px;
}
/* pop effect */
@-webkit-keyframes um-effect-pop {
50% {
-webkit-transform: scale(1.2);
transform: scale(1.2);
}
}
@keyframes um-effect-pop {
50% {
-webkit-transform: scale(1.2);
transform: scale(1.2);
}
}
.um-effect-pop {
-webkit-animation-name: um-effect-pop;
animation-name: um-effect-pop;
-webkit-animation-duration: 0.2s;
animation-duration: 0.2s;
-webkit-animation-timing-function: linear;
animation-timing-function: linear;
-webkit-animation-iteration-count: 1;
animation-iteration-count: 1;
}
assets/css/um-profile.css
+3 -2
View File
@@ -313,7 +313,7 @@ font-weight: normal;
.um-profile-note {
display: none;
text-align: center;
margin-top: 20px;
padding-top: 20px;
color: #666;
}
@@ -326,7 +326,7 @@ font-weight: normal;
.um-profile-note i.um-faicon-lock{
position: relative;
top: 1px;
top: 2px;
display: inline-block;
font-size: 24px;
height: auto;
@@ -408,6 +408,7 @@ font-weight: normal;
font-size: 15px;
font-weight: 600;
margin: 0 20px;
border-bottom: none !important;
}
.um-profile-subnav a:hover {color: #333}
assets/css/um-responsive.css
-8
View File
@@ -627,14 +627,6 @@ div.uimob800 .um-gutter-sizer {width: 4%}
/********************************************/
div.uimob960 .um-col-131,
div.uimob960 .um-col-132,
div.uimob960 .um-col-133 {
float: none;
width: 100%;
margin: 0;
}
div.uimob960 .um-search {
padding: 20px 0 !important;
width: 100% !important;
assets/css/um-styles.css
+5 -5
View File
@@ -324,6 +324,7 @@ p.um-notice.warning {
.um-field-area {
position: relative;
word-wrap: break-word;
}
.um-field-value p {
@@ -547,10 +548,11 @@ p.um-notice.warning {
*/
.um div.disabled,
.um-disabled,
.um input[type=submit]:disabled,
.um input[type=text]:disabled {
opacity: 0.6 !important;
cursor: default !important;
cursor: no-drop !important;
}
input[type=submit].um-button,
@@ -566,6 +568,7 @@ input[type=submit].um-button:focus {
outline: none !important;
margin: 0;
opacity: 1;
-webkit-appearance: none;
}
input[type=submit].um-button:hover {
@@ -713,9 +716,6 @@ div.um-photo img {max-height: 300px; max-width: 100%;}
span.um-req {
margin: 0 0 0 8px;
font-size: x-large;
font-size: 14px;
display: inline-block;
font-weight: bold;
position: relative;
top: 8px;
}
assets/css/um.min.css
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long
assets/css/um.rtl.css
+17
View File
@@ -67,6 +67,23 @@ div.uimob800 .um-header .um-profile-meta {
margin-left: 10px;
}
.um-account-side li a span.um-account-icon,
.um-account-side li a.current span.um-account-icon,
.um-account-side li a.current:hover span.um-account-icon {
float: right;
border-left: 1px solid #ccc;
}
.um-account-side li a span.um-account-title {
padding-right: 20px;
float: right;
}
.um-account-side li a span.um-account-arrow {
right: auto;
left: 10px;
}
.um-field-label .um-field-label-icon {
float: right;
margin: 0 0 0 8px;
assets/dynamic_css/dynamic_directory.php
+4 -4
View File
@@ -1,7 +1,7 @@
<style type="text/css">
<?php
if ($css_profile_card_bg) {
if ( isset( $css_profile_card_bg ) ) {
print ".um-$form_id .um-member {
background: $css_profile_card_bg;
@@ -17,7 +17,7 @@ print ".um-$form_id .um-member {
}
if ($css_profile_card_text) {
if ( isset( $css_profile_card_text ) ) {
print ".um-$form_id .um-member-card * {
color: $css_profile_card_text;
@@ -25,7 +25,7 @@ print ".um-$form_id .um-member-card * {
}
if ($css_card_bordercolor) {
if ( isset( $css_card_bordercolor ) ) {
print ".um-$form_id .um-member {
border-color: $css_card_bordercolor;
@@ -33,7 +33,7 @@ print ".um-$form_id .um-member {
}
if ($css_img_bordercolor) {
if ( isset( $css_img_bordercolor ) ) {
print ".um-$form_id .um-member-photo img {
border-color: $css_img_bordercolor;
assets/dynamic_css/dynamic_global.php
+17 -2
View File
@@ -24,7 +24,9 @@ print "
.um-account-nav a.current,
.um-account-side li a.current span.um-account-icon,
.um-account-side li a.current:hover span.um-account-icon,
.um-dropdown li a:hover
.um-dropdown li a:hover,
i.um-active-color,
span.um-active-color
{
color: $active_color;
}
@@ -84,14 +86,24 @@ print ".um-$form_id.um {
}
if ( $primary_btn_color ) {
print ".um-$form_id.um input[type=submit]:disabled:hover {
background: $primary_btn_color;
}";
print ".um-$form_id.um input[type=submit].um-button,
.um-$form_id.um input[type=submit].um-button:focus,
.um-$form_id.um a.um-button {
.um-$form_id.um a.um-button,
.um-$form_id.um a.um-button.um-disabled:hover,
.um-$form_id.um a.um-button.um-disabled:focus,
.um-$form_id.um a.um-button.um-disabled:active {
background: $primary_btn_color;
}";
print ".um-$form_id.um a.um-link {
color: $primary_btn_color;
}";
}
if ( $primary_btn_hover ) {
@@ -99,6 +111,9 @@ print ".um-$form_id.um input[type=submit].um-button:hover,
.um-$form_id.um a.um-button:hover {
background-color: $primary_btn_hover;
}";
print ".um-$form_id.um a.um-link:hover, .um-$form_id.um a.um-link-hvr:hover {
color: $primary_btn_hover;
}";
}
if ( $primary_btn_text ) {
assets/js/um-functions.js
+9 -9
View File
@@ -306,9 +306,9 @@ function um_responsive(){
if ( jQuery('.um-account-nav').length > 0 && jQuery('.um-account-side').is(':visible') && jQuery('.um-account-tab:visible').length == 0 ) {
jQuery('.um-account-side li a.current').trigger('click');
}
jQuery(this).css('opacity',1);
});
jQuery('.um-cover, .um-member-cover').each(function(){
@@ -733,7 +733,7 @@ function um_modal_responsive() {
function um_remove_modal(){
jQuery('.um-modal .um-single-image-preview img').cropper("destroy");
jQuery('img.cropper-hidden').cropper('destroy');
jQuery('body,html,textarea').css("overflow", "auto");
@@ -766,17 +766,17 @@ function remove_Modal() {
jQuery('.tipsy').remove();
jQuery('.um-popup').empty().remove();
jQuery('.um-popup-overlay').empty().remove();
jQuery("body,html").css({ overflow: 'inherit' });
jQuery("body,html").css({ overflow: 'auto' });
}
}
function show_Modal( contents ) {
if ( jQuery('.um-popup-overlay').length ) {
jQuery('.um-popup').removeClass('loading').html( contents );
jQuery('.um-tip-n').tipsy({gravity: 'n', opacity: 1, offset: 3, delayIn: 500 });
jQuery('.um-tip-w').tipsy({gravity: 'w', opacity: 1, offset: 3, delayIn: 500 });
jQuery('.um-tip-e').tipsy({gravity: 'e', opacity: 1, offset: 3, delayIn: 500 });
jQuery('.um-tip-s').tipsy({gravity: 's', opacity: 1, offset: 3, delayIn: 500 });
jQuery('.um-tip-n').tipsy({gravity: 'n', opacity: 1, offset: 3 });
jQuery('.um-tip-w').tipsy({gravity: 'w', opacity: 1, offset: 3 });
jQuery('.um-tip-e').tipsy({gravity: 'e', opacity: 1, offset: 3 });
jQuery('.um-tip-s').tipsy({gravity: 's', opacity: 1, offset: 3 });
}
}
@@ -787,7 +787,7 @@ function responsive_Modal() {
if ( ag_height > 350 ) {
ag_height = 350;
}
if ( jQuery('.um-popup-autogrow:visible').length ) {
jQuery('.um-popup-autogrow:visible').css({'height': ag_height + 'px'});
assets/js/um-modal.js
+1 -1
View File
@@ -45,7 +45,7 @@ jQuery(document).ready(function() {
var parent = jQuery(this).parents('.um-modal-body');
var src = jQuery(this).parents('.um-modal-body').find('.um-single-image-preview img').attr('src');
parent.find('.um-modal .um-single-image-preview img').cropper("destroy");
jQuery('img.cropper-hidden').cropper('destroy');
parent.find('.um-single-image-preview img').attr('src', '');
assets/js/um-responsive.js
+2 -1
View File
@@ -7,7 +7,8 @@ jQuery(window).load(function() {
jQuery(window).resize(function() {
responsive_Modal();
jQuery('.um-modal .um-single-image-preview.crop:visible img').cropper("destroy");
jQuery('img.cropper-hidden').cropper('destroy');
um_responsive();
um_modal_responsive();
assets/js/um-scripts.js
+4 -4
View File
@@ -25,10 +25,10 @@ jQuery(document).ready(function() {
jQuery(this).parents( parent ).find( child ).trigger('click');
});
jQuery('.um-tip-n').tipsy({gravity: 'n', opacity: 1, live: 'a.live', offset: 3, delayIn: 500 });
jQuery('.um-tip-w').tipsy({gravity: 'w', opacity: 1, live: 'a.live', offset: 3, delayIn: 500 });
jQuery('.um-tip-e').tipsy({gravity: 'e', opacity: 1, live: 'a.live', offset: 3, delayIn: 500 });
jQuery('.um-tip-s').tipsy({gravity: 's', opacity: 1, live: 'a.live', offset: 3, delayIn: 500 });
jQuery('.um-tip-n').tipsy({gravity: 'n', opacity: 1, live: 'a.live', offset: 3 });
jQuery('.um-tip-w').tipsy({gravity: 'w', opacity: 1, live: 'a.live', offset: 3 });
jQuery('.um-tip-e').tipsy({gravity: 'e', opacity: 1, live: 'a.live', offset: 3 });
jQuery('.um-tip-s').tipsy({gravity: 's', opacity: 1, live: 'a.live', offset: 3 });
jQuery(document).on('change', '.um-field-area input[type=radio]', function(){
var field = jQuery(this).parents('.um-field-area');
assets/js/um-scrollto.js
+210
View File
@@ -0,0 +1,210 @@
/*!
* jQuery.scrollTo
* Copyright (c) 2007-2015 Ariel Flesler - aflesler<a>gmail<d>com | http://flesler.blogspot.com
* Licensed under MIT
* http://flesler.blogspot.com/2007/10/jqueryscrollto.html
* @projectDescription Lightweight, cross-browser and highly customizable animated scrolling with jQuery
* @author Ariel Flesler
* @version 2.1.1
*/
;(function(factory) {
'use strict';
if (typeof define === 'function' && define.amd) {
// AMD
define(['jquery'], factory);
} else if (typeof module !== 'undefined' && module.exports) {
// CommonJS
module.exports = factory(require('jquery'));
} else {
// Global
factory(jQuery);
}
})(function($) {
'use strict';
var $scrollTo = $.scrollTo = function(target, duration, settings) {
return $(window).scrollTo(target, duration, settings);
};
$scrollTo.defaults = {
axis:'xy',
duration: 0,
limit:true
};
function isWin(elem) {
return !elem.nodeName ||
$.inArray(elem.nodeName.toLowerCase(), ['iframe','#document','html','body']) !== -1;
}
$.fn.scrollTo = function(target, duration, settings) {
if (typeof duration === 'object') {
settings = duration;
duration = 0;
}
if (typeof settings === 'function') {
settings = { onAfter:settings };
}
if (target === 'max') {
target = 9e9;
}
settings = $.extend({}, $scrollTo.defaults, settings);
// Speed is still recognized for backwards compatibility
duration = duration || settings.duration;
// Make sure the settings are given right
var queue = settings.queue && settings.axis.length > 1;
if (queue) {
// Let's keep the overall duration
duration /= 2;
}
settings.offset = both(settings.offset);
settings.over = both(settings.over);
return this.each(function() {
// Null target yields nothing, just like jQuery does
if (target === null) return;
var win = isWin(this),
elem = win ? this.contentWindow || window : this,
$elem = $(elem),
targ = target,
attr = {},
toff;
switch (typeof targ) {
// A number will pass the regex
case 'number':
case 'string':
if (/^([+-]=?)?\d+(\.\d+)?(px|%)?$/.test(targ)) {
targ = both(targ);
// We are done
break;
}
// Relative/Absolute selector
targ = win ? $(targ) : $(targ, elem);
if (!targ.length) return;
/* falls through */
case 'object':
// DOMElement / jQuery
if (targ.is || targ.style) {
// Get the real position of the target
toff = (targ = $(targ)).offset();
}
}
var offset = $.isFunction(settings.offset) && settings.offset(elem, targ) || settings.offset;
$.each(settings.axis.split(''), function(i, axis) {
var Pos = axis === 'x' ? 'Left' : 'Top',
pos = Pos.toLowerCase(),
key = 'scroll' + Pos,
prev = $elem[key](),
max = $scrollTo.max(elem, axis);
if (toff) {// jQuery / DOMElement
attr[key] = toff[pos] + (win ? 0 : prev - $elem.offset()[pos]);
// If it's a dom element, reduce the margin
if (settings.margin) {
attr[key] -= parseInt(targ.css('margin'+Pos), 10) || 0;
attr[key] -= parseInt(targ.css('border'+Pos+'Width'), 10) || 0;
}
attr[key] += offset[pos] || 0;
if (settings.over[pos]) {
// Scroll to a fraction of its width/height
attr[key] += targ[axis === 'x'?'width':'height']() * settings.over[pos];
}
} else {
var val = targ[pos];
// Handle percentage values
attr[key] = val.slice && val.slice(-1) === '%' ?
parseFloat(val) / 100 * max
: val;
}
// Number or 'number'
if (settings.limit && /^\d+$/.test(attr[key])) {
// Check the limits
attr[key] = attr[key] <= 0 ? 0 : Math.min(attr[key], max);
}
// Don't waste time animating, if there's no need.
if (!i && settings.axis.length > 1) {
if (prev === attr[key]) {
// No animation needed
attr = {};
} else if (queue) {
// Intermediate animation
animate(settings.onAfterFirst);
// Don't animate this axis again in the next iteration.
attr = {};
}
}
});
animate(settings.onAfter);
function animate(callback) {
var opts = $.extend({}, settings, {
// The queue setting conflicts with animate()
// Force it to always be true
queue: true,
duration: duration,
complete: callback && function() {
callback.call(elem, targ, settings);
}
});
$elem.animate(attr, opts);
}
});
};
// Max scrolling position, works on quirks mode
// It only fails (not too badly) on IE, quirks mode.
$scrollTo.max = function(elem, axis) {
var Dim = axis === 'x' ? 'Width' : 'Height',
scroll = 'scroll'+Dim;
if (!isWin(elem))
return elem[scroll] - $(elem)[Dim.toLowerCase()]();
var size = 'client' + Dim,
doc = elem.ownerDocument || elem.document,
html = doc.documentElement,
body = doc.body;
return Math.max(html[scroll], body[scroll]) - Math.min(html[size], body[size]);
};
function both(val) {
return $.isFunction(val) || $.isPlainObject(val) ? val : { top:val, left:val };
}
// Add special hooks so that window scroll properties can be animated
$.Tween.propHooks.scrollLeft =
$.Tween.propHooks.scrollTop = {
get: function(t) {
return $(t.elem)[t.prop]();
},
set: function(t) {
var curr = this.get(t);
// If interrupt is true and user scrolled, stop animating
if (t.options.interrupt && t._last && t._last !== curr) {
return $(t.elem).stop();
}
var next = Math.round(t.now);
// Don't waste CPU
// Browsers don't render floating point scroll
if (curr !== next) {
$(t.elem)[t.prop](next);
t._last = this.get(t);
}
}
};
// AMD requirement
return $scrollTo;
});
assets/js/um.min.js
Vendored
+7 -5
View File
File diff suppressed because one or more lines are too long