harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/friendica/red into zpull

Browse Source
This commit is contained in:
friendica 2013-12-13 13:32:28 -08:00
commit a4624d2979
2 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
view/css/widgets.css
View File

@ -97,7 +97,6 @@
width: 12px; width: 12px;
} }
#sidebar-group-list li { #sidebar-group-list li {
margin-top: 3px; margin-top: 3px;
} }
@ -109,3 +108,16 @@
.group-edit-icon { .group-edit-icon {
opacity: 0; opacity: 0;
} }
/* affinity - slider */
#main-slider {
position: relative;
left: 5px;
width: 90%;
}
.slider {
margin-top: 10px;
margin-bottom: 45px;
}

42
view/theme/redbasic/css/style.css
View File

@ -676,7 +676,7 @@ footer {
list-style: none; list-style: none;
} }
.contact-entry-photo img, .profile-match-photo img, #photo-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo { /* .contact-entry-photo img, */ .profile-match-photo img, #photo-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo {
border-radius: $radiuspx; border-radius: $radiuspx;
-moz-border-radius: $radiuspx; -moz-border-radius: $radiuspx;
box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444; box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444;
@ -1610,21 +1610,6 @@ div.jGrowl div.info {
text-align: center; text-align: center;
} }
.slider {
margin-top: 10px;
margin-bottom: 45px;
}
#main-slider {
position: relative;
left: 5px;
width: 90%;
}
#contact-slider { #contact-slider {
position: relative; position: relative;
left: 5%; left: 5%;
@ -2477,6 +2462,13 @@ img.mail-list-sender-photo {
-moz-border-radius: $radiuspx; -moz-border-radius: $radiuspx;
} }
.categories-ul {
list-style-type: none;
}
#sidebar-group-list ul {
list-style-type: none;
}
/* need to put these back in the theme for now - used in more than one module */ /* need to put these back in the theme for now - used in more than one module */
@ -2496,12 +2488,16 @@ img.mail-list-sender-photo {
margin-bottom: 10px; margin-bottom: 10px;
} }
/* seems oblolete
.contact-entry-photo img { .contact-entry-photo img {
border: none; border: none;
} }
*/
.contact-entry-photo-end { .contact-entry-photo-end {
clear: both; clear: both;
} }
.contact-entry-name { .contact-entry-name {
float: left; float: left;
margin-left: 0px; margin-left: 0px;
@ -2509,11 +2505,14 @@ img.mail-list-sender-photo {
width: 120px; width: 120px;
overflow: hidden; overflow: hidden;
} }
/* seems obsolete
.contact-entry-edit-links { .contact-entry-edit-links {
margin-top: 6px; margin-top: 6px;
margin-left: 10px; margin-left: 10px;
width: 16px; width: 16px;
} }
.contact-entry-nav-wrapper { .contact-entry-nav-wrapper {
float: left; float: left;
margin-left: 10px; margin-left: 10px;
@ -2523,18 +2522,13 @@ img.mail-list-sender-photo {
border: none; border: none;
margin-right: 15px; margin-right: 15px;
} }
.contact-entry-photo { .contact-entry-photo {
float: left; float: left;
position: relative; position: relative;
} }
*/
.contact-entry-end { .contact-entry-end {
clear: both; clear: both;
} }
.categories-ul {
list-style-type: none;
}
#sidebar-group-list ul {
list-style-type: none;
}