diff options
| -rw-r--r-- | view/css/conversation.css | 4 | ||||
| -rw-r--r-- | view/css/mod_photos.css | 4 | ||||
| -rw-r--r-- | view/css/widgets.css | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 18 | ||||
| -rwxr-xr-x | view/tpl/group_side.tpl | 42 | ||||
| -rwxr-xr-x | view/tpl/photos_upload.tpl | 8 |
6 files changed, 38 insertions, 40 deletions
diff --git a/view/css/conversation.css b/view/css/conversation.css index 7b0d87030..9cde6052f 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -93,6 +93,10 @@ float: left; } +a.wall-item-name-link { + font-weight: bold; +} + .wall-item-author { white-space: nowrap; overflow: hidden; diff --git a/view/css/mod_photos.css b/view/css/mod_photos.css index 0c4c25bae..5f8ed6124 100644 --- a/view/css/mod_photos.css +++ b/view/css/mod_photos.css @@ -135,7 +135,7 @@ margin-left: 200px; } -div[id^='photo-album-contents-'] { - margin-bottom: 3px; +#photos-usage-message { + line-height: 22px; } diff --git a/view/css/widgets.css b/view/css/widgets.css index 96b4c1d60..8d8c9dba1 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -2,7 +2,6 @@ /* Easiest way to indent the widget body - indent the entire widget and then shift the header label back to the left */ .widget { - word-wrap: break-word; margin-bottom: 10px; padding: 10px 10px 10px 20px; } @@ -125,6 +124,7 @@ .group-edit-icon { opacity: 0; + z-index: 1; } li:hover .group-edit-icon { diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 1c036793c..29c034ac8 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -62,7 +62,6 @@ abbr { } a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link { - font-weight: bold; color: $link_colour; text-decoration: none; } @@ -75,12 +74,10 @@ a:hover, .fakelink:hover { color: $link_colour; text-decoration: underline; } a.btn-default { color: #333; - font-weight: normal; } a.btn-success { color: #fff; - font-weight: normal; } input[type="text"], @@ -444,7 +441,6 @@ aside li { margin-bottom: 15px; } - .fn { font-weight: bold; font-size: 16px; @@ -461,11 +457,6 @@ aside li { border-radius: $radiuspx; } -.vcard .title { - margin-bottom: 10px; - -} - .vcard dl { margin-top: 10px; margin-bottom: 0px; @@ -530,6 +521,11 @@ aside li { height: 197px; } +#profile-photo-wrapper { + margin-top: 10px; +} + + #profile-in-dir-yes-label, #profile-in-dir-no-label, #profile-in-netdir-yes-label, @@ -2142,7 +2138,7 @@ img.mail-list-sender-photo { border-bottom-right-radius: $radiuspx; border-bottom-left-radius: $radiuspx; text-align: center; - font-weight: bold; + font-size: $body_font_size; color: $link_colour; cursor: pointer; } @@ -2532,4 +2528,4 @@ blockquote { .shareable_element_text { height: 300px; width: 300px; -}
\ No newline at end of file +} diff --git a/view/tpl/group_side.tpl b/view/tpl/group_side.tpl index 8680a3db0..9037e0871 100755 --- a/view/tpl/group_side.tpl +++ b/view/tpl/group_side.tpl @@ -1,31 +1,27 @@ <div class="widget" id="group-sidebar"> -<h3>{{$title}}</h3> - - -<div id="sidebar-group-list"> - <ul id="sidebar-group-ul"> - {{foreach $groups as $group}} - <li class="sidebar-group-li"> + <h3>{{$title}}</h3> + <div> + <ul class="nav nav-pills nav-stacked"> + {{foreach $groups as $group}} + <li> {{if $group.cid}} - <input type="checkbox" - class="{{if $group.selected}}ticked{{else}}unticked {{/if}} action" - onclick="contactgroupChangeMember('{{$group.id}}','{{$group.enc_cid}}');return true;" - {{if $group.ismember}}checked="checked"{{/if}} - /> - {{/if}} + <input type="checkbox" + class="{{if $group.selected}}ticked{{else}}unticked {{/if}} action" + onclick="contactgroupChangeMember('{{$group.id}}','{{$group.enc_cid}}');return true;" + {{if $group.ismember}}checked="checked"{{/if}} + /> + {{/if}} {{if $group.edit}} - <a class="groupsideedit" href="{{$group.edit.href}}" title="{{$edittext}}"><i id="edit-sidebar-group-element-{{$group.id}}" class="group-edit-icon iconspacer icon-pencil"></i></a> + <a class="pull-right group-edit-icon" href="{{$group.edit.href}}" title="{{$edittext}}"><i class="icon-pencil"></i></a> {{/if}} - <span class="sidebar-group-name"><a id="sidebar-group-element-{{$group.id}}" class="sidebar-group-element {{if $group.selected}}group-selected{{/if}}" href="{{$group.href}}">{{$group.text}}</a></span> + <a class="{{if $group.selected}}group-selected{{/if}}" href="{{$group.href}}">{{$group.text}}</a> </li> - {{/foreach}} - </ul> -</div> - - <div id="sidebar-new-group"> - <a href="group/new">{{$createtext}}</a> - </div> - + {{/foreach}} + <li> + <a href="group/new">{{$createtext}}</a> + </li> + </ul> + </div> </div> diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl index 62591c648..c0e891547 100755 --- a/view/tpl/photos_upload.tpl +++ b/view/tpl/photos_upload.tpl @@ -1,6 +1,8 @@ -<h3>{{$pagename}}</h3> - -<div id="photos-usage-message" class="usage-message">{{$usage}}</div> +<div class="section-title-wrapper"> + <div id="photos-usage-message" class="pull-right">{{$usage}}</div> + <h2>{{$pagename}}</h2> + <div class="clear"></div> +</div> <form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form" > <input type="hidden" id="photos-upload-source" name="source" value="photos" /> |