10h30/ultimatemember
1
0
Fork 0
mirror of https://github.com/10h30/ultimatemember.git synced 2026-06-05 15:09:37 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Revert "Theme compatibility fixes""

Browse Source 
This reverts commit 1db8b0f23c.
This commit is contained in:
ultimatemember
2015-01-14 00:11:38 +02:00
parent 1db8b0f23c
commit c4e6ef4933
17 changed files with 194 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/assets/css/um-admin-misc.css
+2
View File
@@ -228,6 +228,8 @@ p.disabled-on-off .um-admin-yesno *{
border-radius: 1px; border-radius: 1px;
cursor: pointer; cursor: pointer;
border: solid 1px #cccccc; border: solid 1px #cccccc;
margin: 0;
padding: 0 !important;
} }
.um-admin-yesno span.btn.pos-1 {left: 60px} .um-admin-yesno span.btn.pos-1 {left: 60px}
assets/css/um-account.css
+13 -11
View File
@@ -28,10 +28,6 @@
- Main tab - Main tab
*/ */
.um-account-main div.um-field {
padding-top: 25px;
}
.um-account-main div.um-account-heading { .um-account-main div.um-account-heading {
margin: 0 !important; margin: 0 !important;
font-size: 18px; font-size: 18px;
@@ -65,20 +61,26 @@
margin-bottom: 20px; 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-1 img { -moz-border-radius: 999px;-webkit-border-radius: 999px;border-radius: 999px }
.um-account-meta.radius-2 img { border-radius: 4px } .um-account-meta.radius-2 img { -moz-border-radius: 4px;-webkit-border-radius: 4px;border-radius: 4px }
.um-account-meta.radius-3 img { border-radius: 0 } .um-account-meta.radius-3 img { -moz-border-radius: 0;-webkit-border-radius: 0;border-radius: 0 }
.um-account-name a { .um-account-name a {
font-weight: bold; font-weight: bold;
color: #555; color: #555 !important;
text-decoration: none !important; text-decoration: none !important;
font-size: 18px; font-size: 18px;
line-height: 2em;
} }
.um-account-name a:hover {color: #3ba1da} .um-account-name a:hover {color: #3ba1da !important}
/* /*
- Account nav - Account nav
@@ -88,7 +90,7 @@
display: block; display: block;
height: 44px; height: 44px;
line-height: 44px; line-height: 44px;
color: #666; color: #666 !important;
text-decoration: none !important; text-decoration: none !important;
position: relative; position: relative;
padding-left: 40px; padding-left: 40px;
assets/css/um-fileupload.css
+12
View File
@@ -12,6 +12,8 @@
display: block; display: block;
overflow: hidden; overflow: hidden;
margin: auto; margin: auto;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
} }
@@ -37,6 +39,8 @@
right: -15px; right: -15px;
width: 30px; width: 30px;
height: 30px; height: 30px;
-moz-border-radius: 999px;
-webkit-border-radius: 999px;
border-radius: 999px; border-radius: 999px;
background: #ddd; background: #ddd;
cursor: pointer; cursor: pointer;
@@ -73,6 +77,8 @@
display: inline-block; display: inline-block;
width: 100px; width: 100px;
height: 70px; height: 70px;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
background-color: #666; background-color: #666;
color: #fff !important; color: #fff !important;
@@ -123,6 +129,8 @@
height: 10px; height: 10px;
color: #666; color: #666;
background: #7ACF58; background: #7ACF58;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
} }
@@ -137,6 +145,8 @@
padding: 20px; padding: 20px;
box-sizing: border-box; box-sizing: border-box;
border: 2px dashed #ddd; border: 2px dashed #ddd;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
font-size: 18px; font-size: 18px;
line-height: 1em; line-height: 1em;
@@ -171,6 +181,8 @@
height: 34px; height: 34px;
display: inline-block; display: inline-block;
text-decoration: none; text-decoration: none;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
padding: 0 20px; padding: 0 20px;
color: #fff; color: #fff;
assets/css/um-members.css
+10 -4
View File
@@ -5,7 +5,9 @@
.um-members img { .um-members img {
display: block; display: block;
overflow:hidden; overflow:hidden;
border-radius:0!important; -moz-border-radius: 0!important;
-webkit-border-radius: 0!important;
border-radius: 0!important;
margin: 0!important; margin: 0!important;
padding: 0!important; padding: 0!important;
} }
@@ -189,9 +191,9 @@
opacity: 1; opacity: 1;
} }
.um-member-photo.radius-1 img { border-radius: 999px !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 { border-radius: 4px !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 { border-radius: 0 !important } .um-member-photo.radius-3 img { -moz-border-radius: 0 !important;-webkit-border-radius: 0 !important; border-radius: 0 !important }
/* /*
- Member name - Member name
@@ -224,6 +226,7 @@
font-size: 13px; font-size: 13px;
line-height: 22px; line-height: 22px;
color: #999; color: #999;
padding: 0 15px;
} }
/* /*
@@ -283,6 +286,8 @@
width: 40px; width: 40px;
line-height: 40px; line-height: 40px;
height: 40px; height: 40px;
-moz-border-radius: 999px;
-webkit-border-radius: 999px;
border-radius: 999px; border-radius: 999px;
color: #fff !important; color: #fff !important;
opacity: 0.85; opacity: 0.85;
@@ -337,6 +342,7 @@
transition: all .2s linear; transition: all .2s linear;
padding: 0px 14px; padding: 0px 14px;
color: #666; color: #666;
font-weight: normal;
} }
.um-members-pagi a:hover { .um-members-pagi a:hover {
assets/css/um-modal.css
+12
View File
@@ -37,6 +37,8 @@
} }
.um-modal { .um-modal {
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
position: fixed; position: fixed;
left: 50%; left: 50%;
@@ -55,10 +57,14 @@
box-sizing: border-box; box-sizing: border-box;
width: 100%; width: 100%;
background: #fff; background: #fff;
-moz-border-radius: 0 0 3px 3px;
-webkit-border-radius: 0 0 3px 3px;
border-radius: 0 0 3px 3px; border-radius: 0 0 3px 3px;
} }
.um-modal-body.photo { .um-modal-body.photo {
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
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; 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; background: #888;
@@ -66,6 +72,8 @@
} }
.um-modal-body.photo img { .um-modal-body.photo img {
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
display: block; display: block;
overflow: hidden; overflow: hidden;
@@ -82,6 +90,8 @@
} }
.um-modal-header { .um-modal-header {
-moz-border-radius: 3px 3px 0 0;
-webkit-border-radius: 3px 3px 0 0;
border-radius: 3px 3px 0 0; border-radius: 3px 3px 0 0;
height: 44px; height: 44px;
line-height: 44px; line-height: 44px;
@@ -116,6 +126,8 @@
line-height: 34px !important; line-height: 34px !important;
height: 34px; height: 34px;
display: inline-block; display: inline-block;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
padding: 0 20px; padding: 0 20px;
text-align: center; text-align: center;
assets/css/um-profile.css
+11 -2
View File
@@ -103,7 +103,9 @@
vertical-align: middle; vertical-align: middle;
height: 100%; height: 100%;
text-decoration: none !important; text-decoration: none !important;
background: none; background: none !important;
color: #fff !important;
border-bottom: none !important;
} }
.um-cover-overlay i { .um-cover-overlay i {
@@ -121,6 +123,7 @@
padding: 0 0 25px 0; padding: 0 0 25px 0;
border-bottom: solid 2px #eee; border-bottom: solid 2px #eee;
min-height: 85px; min-height: 85px;
box-sizing: content-box !important;
} }
.um-profile-edit { .um-profile-edit {
@@ -170,6 +173,10 @@
- Profile photo - Profile photo
*/ */
.um-profile .gravatar {
position: static;
}
.um-profile-photo { .um-profile-photo {
float: left; float: left;
position: relative; position: relative;
@@ -220,7 +227,9 @@
vertical-align: middle; vertical-align: middle;
height: 100%; height: 100%;
text-decoration: none !important; text-decoration: none !important;
background: none; background: none !important;
color: #fff !important;
border-bottom: none !important;
} }
.um-profile-photo-overlay i { .um-profile-photo-overlay i {
assets/css/um-responsive.css
+12 -6
View File
@@ -56,6 +56,8 @@ div.uimob340 .um-profile-photo-overlay i
.um-modal.uimob340, .um-modal.uimob340,
.um-modal.uimob340 .um-modal-body, .um-modal.uimob340 .um-modal-body,
.um-modal.uimob340 .um-modal-header { .um-modal.uimob340 .um-modal-header {
-moz-border-radius: 0;
-webkit-border-radius: 0;
border-radius: 0; border-radius: 0;
} }
@@ -195,8 +197,6 @@ div.uimob340 .um-account-tab {
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
} }
div.uimob340 .um-account-main div.um-field {padding-top: 15px}
div.uimob340 .um-account-meta { div.uimob340 .um-account-meta {
margin-bottom: 0; margin-bottom: 0;
} }
@@ -247,6 +247,8 @@ div.uimob500 .um-profile-photo-overlay i
.um-modal.uimob500, .um-modal.uimob500,
.um-modal.uimob500 .um-modal-body, .um-modal.uimob500 .um-modal-body,
.um-modal.uimob500 .um-modal-header { .um-modal.uimob500 .um-modal-header {
-moz-border-radius: 0;
-webkit-border-radius: 0;
border-radius: 0; border-radius: 0;
} }
@@ -386,8 +388,6 @@ div.uimob500 .um-account-tab {
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
} }
div.uimob500 .um-account-main div.um-field {padding-top: 15px}
div.uimob500 .um-account-meta { div.uimob500 .um-account-meta {
margin-bottom: 0; margin-bottom: 0;
} }
@@ -408,6 +408,8 @@ div.uimob800 .um-account-side {
div.uimob800 .um-account-side ul { div.uimob800 .um-account-side ul {
border: 1px solid #ddd; border: 1px solid #ddd;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
} }
@@ -424,8 +426,8 @@ div.uimob800 .um-account-side li a{
background: transparent; background: transparent;
transition: all .2s linear; 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: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 {border-radius: 0 0 3px 3px} 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 { div.uimob800 .um-account-side li a span.um-account-icontip {
display: block; display: block;
@@ -458,6 +460,8 @@ div.uimob800 .um-account-meta a,
div.uimob800 .um-account-meta img { div.uimob800 .um-account-meta img {
display: block; display: block;
overflow: hidden; overflow: hidden;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
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.no-photo .um-modal-body, .um-modal.no-photo .um-modal-body,
.um-modal.no-photo .um-modal-header { .um-modal.no-photo .um-modal-header {
-moz-border-radius: 0;
-webkit-border-radius: 0;
border-radius: 0; border-radius: 0;
} }
assets/css/um-select.css
+19 -1
View File
@@ -43,6 +43,8 @@ Version: 3.4.8 Timestamp: Thu May 1 09:50:32 EDT 2014
text-align: left !important; text-align: left !important;
text-decoration: none !important; text-decoration: none !important;
-moz-border-radius: 2px !important;
-webkit-border-radius: 2px !important;
border-radius: 2px !important; border-radius: 2px !important;
background-clip: padding-box !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 { .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; 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; text-overflow: ellipsis !important;
float: none !important; float: none !important;
width: auto !important; width: auto !important;
font-weight: normal;
} }
.select2-container .select2-choice abbr { .select2-container .select2-choice abbr {
@@ -129,6 +133,8 @@ Version: 3.4.8 Timestamp: Thu May 1 09:50:32 EDT 2014
background: #fff; background: #fff;
color: #666; color: #666;
-moz-border-radius: 0 0 2px 2px;
-webkit-border-radius: 0 0 2px 2px;
border-radius: 0 0 2px 2px; border-radius: 0 0 2px 2px;
box-shadow: none; 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 { .select2-drop.select2-drop-above {
margin-top: 1px; margin-top: 1px;
-moz-border-radius: 2px 2px 0 0;
-webkit-border-radius: 2px 2px 0 0;
border-radius: 2px 2px 0 0; border-radius: 2px 2px 0 0;
box-shadow: none; box-shadow: none;
@@ -167,6 +175,8 @@ Version: 3.4.8 Timestamp: Thu May 1 09:50:32 EDT 2014
position: absolute !important; position: absolute !important;
right: 0 !important; right: 0 !important;
top: 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; border-radius: 0 2px 2px 0 !important;
background-clip: padding-box !important; background-clip: padding-box !important;
text-align: center !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; outline: 0 !important;
border: 1px solid #ddd !important; border: 1px solid #ddd !important;
color: #666 !important; color: #666 !important;
-moz-border-radius: 2px !important;
-webkit-border-radius: 2px !important;
border-radius: 2px !important; border-radius: 2px !important;
font-size: 15px !important; font-size: 15px !important;
box-sizing: border-box !important; box-sizing: border-box !important;
@@ -425,7 +437,10 @@ disabled look for disabled choices in the results dropdown
cursor: text !important; cursor: text !important;
overflow: hidden !important; overflow: hidden !important;
-moz-border-radius: 2px !important;
-webkit-border-radius: 2px !important;
border-radius: 2px !important; border-radius: 2px !important;
box-shadow: none !important; box-shadow: none !important;
} }
@@ -485,7 +500,10 @@ html[dir="rtl"] .select2-container-multi .select2-choices li
cursor: default; cursor: default;
border: 1px solid #dddddd; border: 1px solid #dddddd;
-moz-border-radius: 2px;
-webkit-border-radius: 2px;
border-radius: 2px; border-radius: 2px;
box-shadow: none !important; box-shadow: none !important;
-webkit-touch-callout: none; -webkit-touch-callout: none;
assets/css/um-styles.css
+55 -22
View File
@@ -45,6 +45,15 @@
outline: 0 !important; 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 */ /* only in admin mode */
.um.um-in-admin { .um.um-in-admin {
padding-top: 0; padding-top: 0;
@@ -147,12 +156,14 @@
p.um-notice { p.um-notice {
width: auto; width: auto;
border-radius: 3px;
color: #fff; color: #fff;
box-sizing: border-box; box-sizing: border-box;
font-size: 15px; font-size: 15px;
padding: 12px !important; padding: 12px !important;
margin: 12px 0 0 0 !important; margin: 12px 0 0 0 !important;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
} }
p.um-notice.success { p.um-notice.success {
@@ -171,6 +182,8 @@ p.um-notice.err {
width: auto; width: auto;
max-width: 100%; max-width: 100%;
background: #C74A4A; background: #C74A4A;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
color: #fff; color: #fff;
box-sizing: border-box; box-sizing: border-box;
@@ -197,6 +210,8 @@ p.um-notice.err {
width: auto; width: auto;
max-width: 100%; max-width: 100%;
background: #C74A4A; background: #C74A4A;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
color: #fff; color: #fff;
box-sizing: border-box; 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 .um-field-label-icon i { font-size: 22px; height: 22px; line-height: 22px; vertical-align: middle; }
.um-field-label label { .um-field-label label {
display: inline-block; display: inline-block !important;
height: 22px; height: 22px;
font-size: 15px; font-size: 15px !important;
line-height: 22px !important; line-height: 22px !important;
font-weight: bold; font-weight: bold;
font-weight: 600; font-weight: 600;
@@ -303,18 +318,21 @@ p.um-notice.err {
.um-form input[type=text], .um-form input[type=text],
.um-form input[type=password] { .um-form input[type=password] {
padding: 0 12px; padding: 0 12px !important;
width: 100%; width: 100% !important;
display: block; display: block !important;
-moz-border-radius: 2px;
-webkit-border-radius: 2px;
border-radius: 2px; border-radius: 2px;
outline: none !important; outline: none !important;
cursor: text !important; cursor: text !important;
font-size: 15px !important; font-size: 15px !important;
height: 40px !important; height: 40px !important;
box-sizing: border-box; box-sizing: border-box !important;
box-shadow: none !important; box-shadow: none !important;
margin: 0; margin: 0 !important;
position: static; position: static;
outline: none !important;
} }
.um-form input[type=text]:focus , .um-form input[type=text]:focus ,
@@ -323,6 +341,7 @@ p.um-notice.err {
border-color: #ccc; border-color: #ccc;
background-color: #fff !important; background-color: #fff !important;
box-shadow: none !important; box-shadow: none !important;
outline: none !important;
} }
.um-form input[type=text].um-iconed, .um-form input[type=text].um-iconed,
@@ -333,15 +352,18 @@ p.um-notice.err {
.um-form textarea { .um-form textarea {
width: 100%; width: 100%;
padding: 8px 12px; padding: 8px 12px !important;
display: block; display: block;
font-size: 15px !important; font-size: 15px !important;
line-height: 22px !important; line-height: 22px !important;
background: #fff; background: #fff;
-moz-border-radius: 2px;
-webkit-border-radius: 2px;
border-radius: 2px; border-radius: 2px;
box-sizing: border-box; box-sizing: border-box;
min-height: 80px; min-height: 80px !important;
box-shadow: none; box-shadow: none;
outline: none !important;
} }
/* /*
@@ -354,14 +376,9 @@ p.um-notice.err {
margin: 8px 0; margin: 8px 0;
position: relative; position: relative;
cursor: pointer; cursor: pointer;
color: #888;
} }
.um-field-checkbox:hover i, .um-field-checkbox:hover i, .um-field-radio:hover i {color: #666}
.um-field-radio:hover i
{
color: #666
}
.um-field-checkbox input, .um-field-checkbox input,
.um-field-radio input{display:none!important} .um-field-radio input{display:none!important}
@@ -389,6 +406,7 @@ color: #666
.um-field-radio-option { .um-field-radio-option {
margin: 0 0 0 36px; margin: 0 0 0 36px;
line-height: 24px; line-height: 24px;
color: #888 !important;
} }
/* /*
@@ -408,10 +426,11 @@ color: #666
transition: 0.25s; transition: 0.25s;
box-sizing: border-box; box-sizing: border-box;
-moz-border-radius: 4px !important;
-webkit-border-radius: 4px !important;
border-radius: 4px !important; border-radius: 4px !important;
border-top: 1px solid rgba(0,0,0,0.0) !important; border-top: 1px solid rgba(0,0,0,0.0) !important;
border-bottom: 2px solid rgba(0, 0, 0, 0.1) !important; border-bottom: 2px solid rgba(0, 0, 0, 0.1) !important;
letter-spacing: 0.5px;
} }
.um-field-group-head i { .um-field-group-head i {
@@ -428,6 +447,8 @@ color: #666
margin: 15px 0 0 0; margin: 15px 0 0 0;
padding: 15px 20px 5px 20px; padding: 15px 20px 5px 20px;
background: #f9f9f9; background: #f9f9f9;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
position: relative; position: relative;
box-sizing: border-box; box-sizing: border-box;
@@ -469,6 +490,14 @@ input[type=submit].um-button:focus {
width: 100%; width: 100%;
box-shadow: none; box-shadow: none;
text-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 { .um-button {
@@ -487,10 +516,12 @@ input[type=submit].um-button:focus {
transition: 0.25s; transition: 0.25s;
box-sizing: border-box; box-sizing: border-box;
-moz-border-radius: 4px !important;
-webkit-border-radius: 4px !important;
border-radius: 4px !important; border-radius: 4px !important;
border-top: 1px solid rgba(0,0,0,0.0) !important; border-top: 1px solid rgba(0,0,0,0.0) !important;
border-bottom: 2px solid rgba(0, 0, 0, 0.1) !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; position: absolute;
height: auto; height: auto;
background: #fff; background: #fff;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
border-radius: 5px; border-radius: 5px;
z-index: 1; z-index: 10;
display: none; display: none;
border: 1px solid #e5e5e5; border: 1px solid #e5e5e5;
box-sizing: border-box; box-sizing: border-box;
@@ -540,10 +573,8 @@ a.um-link-alt:hover {text-decoration: underline !important;}
display: block; display: block;
padding: 8px 12px; padding: 8px 12px;
color: #666; color: #666;
z-index: 4;
font-size: 14px; font-size: 14px;
line-height: 18px; line-height: 18px;
position: relative;
} }
.um-dropdown li:last-child a { .um-dropdown li:last-child a {
@@ -566,7 +597,7 @@ a.um-link-alt:hover {text-decoration: underline !important;}
width: 24px; width: 24px;
height: 24px; height: 24px;
overflow: hidden; overflow: hidden;
z-index: 2; z-index: 15;
color: #eee; color: #eee;
} }
@@ -586,6 +617,8 @@ div.um-photo {
div.um-photo, div.um-photo,
div.um-photo a, div.um-photo a,
div.um-photo img { div.um-photo img {
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
} }
assets/dynamic_css/dynamic_profile.php
+3 -3
View File
@@ -10,7 +10,7 @@ print "
.um-$form_id.um .um-profile-photo a.um-profile-photo-img, .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 img,
.um-$form_id.um .um-profile-photo span.um-profile-photo-overlay .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 ) { 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 a.um-profile-photo-img,
.um-$form_id.um .um-profile-photo img, .um-$form_id.um .um-profile-photo img,
.um-$form_id.um .um-profile-photo span.um-profile-photo-overlay .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 ) { 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 a.um-profile-photo-img,
.um-$form_id.um .um-profile-photo img, .um-$form_id.um .um-profile-photo img,
.um-$form_id.um .um-profile-photo span.um-profile-photo-overlay .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 " print "
assets/js/um-tipsy.js
+8 -2
View File
@@ -37,7 +37,7 @@
width: this.$element[0].offsetWidth, width: this.$element[0].offsetWidth,
height: this.$element[0].offsetHeight height: this.$element[0].offsetHeight
}); });
var actualWidth = $tip[0].offsetWidth, var actualWidth = $tip[0].offsetWidth,
actualHeight = $tip[0].offsetHeight, actualHeight = $tip[0].offsetHeight,
gravity = maybeCall(this.options.gravity, this.$element[0]); 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}; tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth - this.options.offset};
break; break;
case 'w': 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; break;
} }
core/um-actions-account.php
+19 -5
View File
@@ -133,7 +133,7 @@
if ( $output ) { ?> if ( $output ) { ?>
<div class="um-account-heading uimob500-hide"><i class="<?php echo $icon; ?>"></i><?php echo $title; ?></div> <div class="um-account-heading uimob300-hide uimob500-hide"><i class="<?php echo $icon; ?>"></i><?php echo $title; ?></div>
<?php echo wpautop( um_get_option('delete_account_text') ); ?> <?php echo wpautop( um_get_option('delete_account_text') ); ?>
@@ -158,7 +158,7 @@
if ( $output ) { ?> if ( $output ) { ?>
<div class="um-account-heading uimob500-hide"><i class="<?php echo $icon; ?>"></i><?php echo $title; ?></div> <div class="um-account-heading uimob340-hide uimob500-hide"><i class="<?php echo $icon; ?>"></i><?php echo $title; ?></div>
<?php echo $output; ?> <?php echo $output; ?>
@@ -181,7 +181,7 @@
if ( $output ) { ?> if ( $output ) { ?>
<div class="um-account-heading uimob500-hide"><i class="<?php echo $icon; ?>"></i><?php echo $title; ?></div> <div class="um-account-heading uimob340-hide uimob500-hide"><i class="<?php echo $icon; ?>"></i><?php echo $title; ?></div>
<?php echo $output; ?> <?php echo $output; ?>
@@ -205,7 +205,7 @@
if ( $output ) { ?> if ( $output ) { ?>
<div class="um-account-heading uimob500-hide"><i class="<?php echo $icon; ?>"></i><?php echo $title; ?></div> <div class="um-account-heading uimob340-hide uimob500-hide"><i class="<?php echo $icon; ?>"></i><?php echo $title; ?></div>
<?php echo $output; ?> <?php echo $output; ?>
@@ -226,7 +226,7 @@
?> ?>
<div class="um-account-meta uimob500-show"> <div class="um-account-meta radius-<?php echo um_get_option('profile_photocorner'); ?> uimob340-show uimob500-show">
<div class="um-account-meta-img"><a href="<?php echo um_user_profile_url(); ?>"><?php echo um_user('profile_photo', 120); ?></a></div> <div class="um-account-meta-img"><a href="<?php echo um_user_profile_url(); ?>"><?php echo um_user('profile_photo', 120); ?></a></div>
@@ -252,8 +252,16 @@
<div class="um-account-meta-img uimob800-hide"><a href="<?php echo um_user_profile_url(); ?>"><?php echo um_user('profile_photo', 120); ?></a></div> <div class="um-account-meta-img uimob800-hide"><a href="<?php echo um_user_profile_url(); ?>"><?php echo um_user('profile_photo', 120); ?></a></div>
<?php if ( $ultimatemember->mobile->isMobile() ) { ?>
<div class="um-account-meta-img-b uimob800-show" title="<?php echo um_user('display_name'); ?>"><a href="<?php echo um_user_profile_url(); ?>"><?php echo um_user('profile_photo', 120); ?></a></div>
<?php } else { ?>
<div class="um-account-meta-img-b uimob800-show um-tip-w" title="<?php echo um_user('display_name'); ?>"><a href="<?php echo um_user_profile_url(); ?>"><?php echo um_user('profile_photo', 120); ?></a></div> <div class="um-account-meta-img-b uimob800-show um-tip-w" title="<?php echo um_user('display_name'); ?>"><a href="<?php echo um_user_profile_url(); ?>"><?php echo um_user('profile_photo', 120); ?></a></div>
<?php } ?>
<div class="um-account-name uimob800-hide"><a href="<?php echo um_user_profile_url(); ?>"><?php echo um_user('display_name'); ?></a></div> <div class="um-account-name uimob800-hide"><a href="<?php echo um_user_profile_url(); ?>"><?php echo um_user('display_name'); ?></a></div>
</div> </div>
@@ -302,7 +310,13 @@
<li> <li>
<a data-tab="<?php echo $id; ?>" href="<?php echo $ultimatemember->account->tab_link($id); ?>" class="um-account-link <?php if ( $id == $current_tab ) echo 'current'; ?>"> <a data-tab="<?php echo $id; ?>" href="<?php echo $ultimatemember->account->tab_link($id); ?>" class="um-account-link <?php if ( $id == $current_tab ) echo 'current'; ?>">
<?php if ( $ultimatemember->mobile->isMobile() ) { ?>
<span class="um-account-icontip uimob800-show" title="<?php echo $title; ?>"><i class="<?php echo $icon; ?>"></i></span>
<?php } else { ?>
<span class="um-account-icontip uimob800-show um-tip-w" title="<?php echo $title; ?>"><i class="<?php echo $icon; ?>"></i></span> <span class="um-account-icontip uimob800-show um-tip-w" title="<?php echo $title; ?>"><i class="<?php echo $icon; ?>"></i></span>
<?php } ?>
<span class="um-account-icon uimob800-hide"><i class="<?php echo $icon; ?>"></i></span> <span class="um-account-icon uimob800-hide"><i class="<?php echo $icon; ?>"></i></span>
<span class="um-account-title uimob800-hide"><?php echo $title; ?></span> <span class="um-account-title uimob800-hide"><?php echo $title; ?></span>
<span class="um-account-arrow uimob800-hide"><i class="um-icon-right-open"></i></span> <span class="um-account-arrow uimob800-hide"><i class="um-icon-right-open"></i></span>
core/um-actions-login.php
+1 -1
View File
@@ -66,7 +66,7 @@
case 'incorrect_password': case 'incorrect_password':
if ( username_exists( $user_name ) ) { if ( username_exists( $user_name ) ) {
$ultimatemember->form->add_error( 'user_password', __('That password is incorrect. Please try again.') ); $ultimatemember->form->add_error( 'user_password', __('Password is incorrect. Please try again.') );
} }
break; break;
core/um-actions-profile.php
+1 -1
View File
@@ -389,7 +389,7 @@
} }
echo $ultimatemember->menu->new_ui( 'bc', 'div.um-profile-edit', 'click', $items ); echo $ultimatemember->menu->new_ui( $args['header_menu'], 'div.um-profile-edit', 'click', $items );
?> ?>
core/um-setup.php
+1
View File
@@ -87,6 +87,7 @@ class UM_Setup {
'_um_profile_show_name' => 1, '_um_profile_show_name' => 1,
'_um_profile_show_bio' => 1, '_um_profile_show_bio' => 1,
'_um_profile_bio_maxchars' => 180, '_um_profile_bio_maxchars' => 180,
'_um_profile_header_menu' => 'bc',
'_um_profile_role' => '0', '_um_profile_role' => '0',
'_um_profile_template' => 'profile', '_um_profile_template' => 'profile',
'_um_profile_max_width' => '1000px', '_um_profile_max_width' => '1000px',
templates/account.php
+2 -2
View File
@@ -8,7 +8,7 @@
<?php do_action('um_account_user_photo_hook__mobile', $args ); ?> <?php do_action('um_account_user_photo_hook__mobile', $args ); ?>
<div class="um-account-side uimob500-hide"> <div class="um-account-side uimob340-hide uimob500-hide">
<?php do_action('um_account_user_photo_hook', $args ); ?> <?php do_action('um_account_user_photo_hook', $args ); ?>
@@ -30,7 +30,7 @@
?> ?>
<div class="um-account-nav uimob500-show"><a href="#" data-tab="<?php echo $id; ?>" class="<?php if ( $id == $current_tab ) echo 'current'; ?>"><?php echo $title; ?> <div class="um-account-nav uimob340-show uimob500-show"><a href="#" data-tab="<?php echo $id; ?>" class="<?php if ( $id == $current_tab ) echo 'current'; ?>"><?php echo $title; ?>
<span class="ico"><i class="<?php echo $icon; ?>"></i></span> <span class="ico"><i class="<?php echo $icon; ?>"></i></span>
<span class="arr"><i class="um-icon-chevron-down-3"></i></span> <span class="arr"><i class="um-icon-chevron-down-3"></i></span>
</a></div> </a></div>
um-config.php
+13
View File
@@ -1202,6 +1202,19 @@ $this->sections[] = array(
'required' => array( 'profile_show_bio', '=', 1 ), 'required' => array( 'profile_show_bio', '=', 1 ),
), ),
array(
'id' => 'profile_header_menu',
'type' => 'select',
'title' => __( 'Profile Header Menu Position' ),
'default' => um_get_metadefault('profile_header_menu'),
'desc' => __('For incompatible themes, please make the menu open from left instead of bottom by default.','ultimatemember'),
'select2' => array( 'allowClear' => 0, 'minimumResultsForSearch' => -1 ),
'options' => array(
'bc' => 'Bottom of Icon',
'lc' => 'Left of Icon',
),
),
) )
); );