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

CSS conflicts fixed

Browse Source
This commit is contained in:
ultimatemember
2015-01-11 19:07:55 +02:00
parent 4a6d8c5df5
commit 49a262fa18
36 changed files with 266 additions and 309 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/css/pickadate/default.time.css
+1
View File
@@ -76,6 +76,7 @@
outline: 0 !important;
background: none !important;
border-radius: 0 0 2px 2px;
color: #fff !important;
}
.picker--time .picker__button--clear:hover,
.picker--time .picker__button--clear:focus {
assets/css/um-account.css
+3 -1
View File
@@ -37,7 +37,7 @@
font-size: 18px;
line-height: 18px;
font-weight: bold;
color: #333;
color: #555;
}
.um-account-main div.um-account-heading i {
@@ -65,6 +65,8 @@
margin-bottom: 20px;
}
.um-account-meta img {margin: 0 !important}
.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 }
assets/css/um-members.css
+4 -2
View File
@@ -185,6 +185,8 @@
position: relative;
top: -35px;
margin-bottom: -45px !important;
float: none;
opacity: 1;
}
.um-member-photo.radius-1 img { border-radius: 999px !important }
@@ -276,13 +278,13 @@
padding-top: 20px;
}
.um-member-connect a{
.um-member-connect a {
display: inline-block;
width: 40px;
line-height: 40px;
height: 40px;
border-radius: 999px;
color: #fff;
color: #fff !important;
opacity: 0.85;
margin: 0 1px;
font-size: 16px;
assets/css/um-profile.css
+11 -5
View File
@@ -4,7 +4,6 @@
.um-profile {
box-sizing: border-box;
padding-top: 10px;
}
.um-profile .um-cover-overlay {
@@ -104,6 +103,7 @@
vertical-align: middle;
height: 100%;
text-decoration: none !important;
background: none;
}
.um-cover-overlay i {
@@ -131,7 +131,7 @@
font-size: 30px;
height: 30px;
line-height: 30px;
z-index: 666;
z-index: 66;
}
/*
@@ -153,7 +153,6 @@
float: none !important;
margin: 0 auto !important;
text-align: center !important;
padding-top: 20px !important;
}
.um-header.no-cover a.um-profile-photo-img {
@@ -161,8 +160,6 @@
top: auto !important;
left: auto !important;
float: none !important;
width: auto !important;
height: auto !important;
display: inline-block !important;
text-align: center !important;
}
@@ -223,6 +220,7 @@
vertical-align: middle;
height: 100%;
text-decoration: none !important;
background: none;
}
.um-profile-photo-overlay i {
@@ -236,6 +234,9 @@
.um-profile-meta {
padding-right: 30px;
-ms-word-break: break-all;
word-break: break-word;
word-wrap: break-word;
}
.um-main-meta {
@@ -247,12 +248,17 @@
font-size: 24px;
font-weight: bold;
margin-right: 30px;
line-height: 1.7em;
}
.um-meta {
font-size: 15px;
}
.um-meta span a {
font-weight: normal;
}
.um-meta span:first-child {margin: 0 5px 0 0}
.um-meta span {
margin: 0 5px;
assets/css/um-responsive.css
+32 -2
View File
@@ -102,6 +102,12 @@ div.uimob340 .um-profile-photo {
left: 0;
}
div.uimob340 .um-header.no-cover .um-profile-photo {
position: static;
top: auto;
left: auto;
}
div.uimob340 .um-profile-photo a.um-profile-photo-img {
width: 100px !important;
height: 100px !important;
@@ -113,13 +119,20 @@ div.uimob340 .um-profile-photo a.um-profile-photo-img {
left: auto !important;
}
div.uimob340 .um-header.no-cover .um-profile-photo a.um-profile-photo-img {
width: 120px !important;
height: 120px !important;
}
div.uimob340 .um-header .um-profile-meta {
padding-left: 0 !important;
padding-right: 0 !important;
text-align: center !important;
padding-top: 70px !important;
padding-top: 60px !important;
}
div.uimob340 .um-header.no-cover .um-profile-meta {padding-top: 0 !important}
div.uimob340 .um-header .um-name {
float: none !important;
margin-right: 0 !important;
@@ -280,6 +293,12 @@ div.uimob500 .um-profile-photo {
left: 0;
}
div.uimob500 .um-header.no-cover .um-profile-photo {
position: static;
top: auto;
left: auto;
}
div.uimob500 .um-profile-photo a.um-profile-photo-img {
width: 100px !important;
height: 100px !important;
@@ -291,13 +310,20 @@ div.uimob500 .um-profile-photo a.um-profile-photo-img {
left: auto !important;
}
div.uimob500 .um-header.no-cover .um-profile-photo a.um-profile-photo-img {
width: 120px !important;
height: 120px !important;
}
div.uimob500 .um-header .um-profile-meta {
padding-left: 0 !important;
padding-right: 0 !important;
text-align: center !important;
padding-top: 70px !important;
padding-top: 60px !important;
}
div.uimob500 .um-header.no-cover .um-profile-meta {padding-top: 0 !important}
div.uimob500 .um-header .um-name {
float: none !important;
margin-right: 0 !important;
@@ -445,6 +471,10 @@ div.uimob800 .um-profile-photo a.um-profile-photo-img {
top: -70px !important;
}
div.uimob800 .um-header.no-cover .um-profile-photo a.um-profile-photo-img {
top: auto !important;
}
div.uimob800 .um-header .um-profile-meta {
padding-left: 200px;
}
assets/css/um-select.css
+1
View File
@@ -536,6 +536,7 @@ html[dir="rtl"] .select2-container-multi .select2-choices .select2-search-choice
text-decoration: none !important;
width: 21px !important;
text-align: center !important;
border-bottom: 0 !important;
}
.select2-container-multi .select2-search-choice-close:before {
assets/css/um-styles.css
+32 -4
View File
@@ -25,6 +25,21 @@
box-sizing: content-box;
}
.um-header a,
.um-cover a,
.um-member-photo a,
.um-member-name a,
.um-member-more a,
.um-member-less a,
.um-members a,
.um-account-side li a,
.um-members-pagi span,
.um-members-pagi a,
.um-field-value a
{
border-bottom: 0 !important;
}
.um a:focus,
.um-modal a:focus {
outline: 0 !important;
@@ -238,12 +253,19 @@ p.um-notice.err {
.um-field-label {
display: block;
margin: 0 0 8px 0;
font-weight: bold;
font-weight: 500;
}
.um-field-label .um-field-label-icon { float: left; margin: 0 8px 0 0; vertical-align: middle !important; height: 22px; }
.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; height: 22px; font-size: 16px; line-height: 22px !important; }
.um-field-label label {
display: inline-block;
height: 22px;
font-size: 15px;
line-height: 22px !important;
font-weight: bold;
font-weight: 600;
}
.um-field-area {
position: relative;
@@ -276,6 +298,7 @@ p.um-notice.err {
left: 0;
width: 44px;
font-size: 22px;
line-height: 1.7em;
}
.um-form input[type=text],
@@ -291,6 +314,7 @@ p.um-notice.err {
box-sizing: border-box;
box-shadow: none !important;
margin: 0;
position: static;
}
.um-form input[type=text]:focus ,
@@ -317,6 +341,7 @@ p.um-notice.err {
border-radius: 2px;
box-sizing: border-box;
min-height: 80px;
box-shadow: none;
}
/*
@@ -441,6 +466,9 @@ input[type=submit].um-button:focus {
height: auto !important;
font-size: 15px;
cursor: pointer !important;
width: 100%;
box-shadow: none;
text-shadow: none;
}
.um-button {
@@ -493,7 +521,7 @@ a.um-link-alt:hover {text-decoration: underline !important;}
height: auto;
background: #fff;
border-radius: 5px;
z-index: 555555;
z-index: 1;
display: none;
border: 1px solid #e5e5e5;
box-sizing: border-box;