diff options
author | friendica <info@friendica.com> | 2013-12-13 13:37:10 -0800 |
---|---|---|
committer | friendica <info@friendica.com> | 2013-12-13 13:37:10 -0800 |
commit | 744d449284f775b47c4dba6b96a032353cd887b9 (patch) | |
tree | f854a764cfc184651007ca1abb8da2b061f1c9d4 /view | |
parent | 94975f8d3081051df48b6fdd73be3f4be5484cf6 (diff) | |
parent | b994faee9d24a6290e342b6389c56fa7f9ecfac1 (diff) | |
download | volse-hubzilla-744d449284f775b47c4dba6b96a032353cd887b9.tar.gz volse-hubzilla-744d449284f775b47c4dba6b96a032353cd887b9.tar.bz2 volse-hubzilla-744d449284f775b47c4dba6b96a032353cd887b9.zip |
Merge pull request #242 from git-marijus/master
move affinity slider to widgets.css and minor cleanup
Diffstat (limited to 'view')
-rw-r--r-- | view/css/widgets.css | 14 | ||||
-rw-r--r-- | view/theme/redbasic/css/style.css | 42 |
2 files changed, 31 insertions, 25 deletions
diff --git a/view/css/widgets.css b/view/css/widgets.css index 2e424a8dc..a34508961 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -97,7 +97,6 @@ width: 12px; } - #sidebar-group-list li { margin-top: 3px; } @@ -109,3 +108,16 @@ .group-edit-icon { opacity: 0; } + +/* affinity - slider */ + +#main-slider { + position: relative; + left: 5px; + width: 90%; +} + +.slider { + margin-top: 10px; + margin-bottom: 45px; +} diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index a67742c81..0db9caa4e 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -676,7 +676,7 @@ footer { 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; -moz-border-radius: $radiuspx; box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444; @@ -1610,21 +1610,6 @@ div.jGrowl div.info { text-align: center; } - -.slider { - margin-top: 10px; - margin-bottom: 45px; -} - - -#main-slider { - position: relative; - left: 5px; - width: 90%; - -} - - #contact-slider { position: relative; left: 5%; @@ -2477,6 +2462,13 @@ img.mail-list-sender-photo { -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 */ @@ -2496,12 +2488,16 @@ img.mail-list-sender-photo { margin-bottom: 10px; } +/* seems oblolete .contact-entry-photo img { border: none; } +*/ + .contact-entry-photo-end { clear: both; } + .contact-entry-name { float: left; margin-left: 0px; @@ -2509,11 +2505,14 @@ img.mail-list-sender-photo { width: 120px; overflow: hidden; } + +/* seems obsolete .contact-entry-edit-links { margin-top: 6px; margin-left: 10px; width: 16px; } + .contact-entry-nav-wrapper { float: left; margin-left: 10px; @@ -2523,18 +2522,13 @@ img.mail-list-sender-photo { border: none; margin-right: 15px; } + .contact-entry-photo { float: left; position: relative; } +*/ + .contact-entry-end { clear: both; } - -.categories-ul { - list-style-type: none; -} - -#sidebar-group-list ul { - list-style-type: none; -} |