diff options
| -rw-r--r-- | view/css/conversation.css | 9 | ||||
| -rw-r--r-- | view/css/mod_connections.css | 5 | ||||
| -rw-r--r-- | view/css/widgets.css | 51 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 17 | ||||
| -rwxr-xr-x | view/tpl/connections.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/follow.tpl | 3 | ||||
| -rwxr-xr-x | view/tpl/group_side.tpl | 9 | ||||
| -rw-r--r-- | view/tpl/saved_searches.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/saved_searches_aside.tpl | 2 |
9 files changed, 63 insertions, 37 deletions
diff --git a/view/css/conversation.css b/view/css/conversation.css index fc3131642..7e439137e 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -58,12 +58,14 @@ .thread-wrapper.toplevel_item { width: 90%; + margin-bottom: 10px; } /* conv_item */ .hide-comments-outer { - margin-left: 10px; + margin-left: 60px; + padding: 15px 10px 15px 10px; } .wall-item-content-wrapper { @@ -213,6 +215,11 @@ .wall-item-tools { clear: both; padding: 5px 10px; + margin-left: 60px; +} + +.comment .wall-item-tools { + margin-left: 0; } .item-tool { diff --git a/view/css/mod_connections.css b/view/css/mod_connections.css index 6fd666845..097027179 100644 --- a/view/css/mod_connections.css +++ b/view/css/mod_connections.css @@ -1,4 +1,9 @@ +.search-input { + padding: 4px 12px; + margin: 3px; +} + .field_abook_help { color: #000; } diff --git a/view/css/widgets.css b/view/css/widgets.css index a3263c64f..d100ae3ec 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -45,8 +45,14 @@ opacity: 1; } +.saved-search-icon { + float: right; +} + .savedsearchterm { - margin-left: 10px; + display: block; + width: 150px; + overflow: hidden; } /* peoplefind */ @@ -66,17 +72,6 @@ /* fileas */ -.fileas-ul li { - margin-top: 10px; -} - -.fileas-link { - margin-left: 24px; -} - -.fileas-all { - margin-left: 0px; -} /* posted date */ @@ -88,17 +83,6 @@ /* categories */ -.categories-ul li { - margin-top: 10px; -} - -.categories-link { - margin-left: 24px; -} - -.categories-all { - margin-left: 0px; -} /* group */ @@ -106,17 +90,32 @@ margin-bottom: 10px; } +#sidebar-new-group { + margin-bottom: 10px; +} + #sidebar-group-list .icon, #sidebar-group-list .iconspacer { display: inline-block; height: 12px; width: 12px; } +.sidebar-group-name { + display: block; + width: 170px; + overflow: hidden; +} + +#sidebar-group-ul { + margin-bottom: 10px; +} + #sidebar-group-list li { margin-top: 3px; } .groupsideedit { + float: right; margin-right: 10px; } @@ -139,3 +138,9 @@ li:hover .group-edit-icon { margin-top: 10px; margin-bottom: 45px; } + +/* photo albums */ + +#photo-albums-upload-link { + margin-top: 10px; +}
\ No newline at end of file diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 297c011a4..a7d99efb1 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -228,6 +228,16 @@ footer { margin-bottom: 15px; } +aside ul { + list-style-type: none; + margin: 0; + padding: 0; +} + +aside li { + margin-top: 5px; +} + /*TODO: we should use one class for all this. */ .group-selected, .fileas-selected, .categories-selected, .search-selected, .active { color: $selected_active_colour !important; @@ -1748,10 +1758,6 @@ margin-right: 50px; list-style-type: none; } -.pmenu li { - margin-left: -20px; -} - .admin-icons { font-size: 1.2em; color: $toolicon_colour; @@ -2083,7 +2089,7 @@ img.mail-list-sender-photo { border-radius: $radiuspx; -moz-border-radius: $radiuspx; } - +/* .categories-ul { list-style-type: none; } @@ -2091,6 +2097,7 @@ img.mail-list-sender-photo { #sidebar-group-list ul, #posted-date-selector { list-style-type: none; } +*/ .profile-thing-list img, .thing-show img, .thing-edit-links a { margin-top: 8px; diff --git a/view/tpl/connections.tpl b/view/tpl/connections.tpl index f254ce8c2..c69dcde50 100755 --- a/view/tpl/connections.tpl +++ b/view/tpl/connections.tpl @@ -6,7 +6,7 @@ <form id="contacts-search-form" action="{{$cmd}}" method="get" > <span class="contacts-search-desc">{{$desc}}</span> <input type="text" name="search" id="contacts-search" class="search-input" onfocus="this.select();" value="{{$search}}" /> -<input type="submit" name="submit" id="contacts-search-submit" value="{{$submit}}" /> +<input type="submit" name="submit" id="contacts-search-submit" class="btn btn-default" value="{{$submit}}" /> </form> </div> <div id="contacts-search-end"></div> diff --git a/view/tpl/follow.tpl b/view/tpl/follow.tpl index b0597e9b6..f643a3597 100755 --- a/view/tpl/follow.tpl +++ b/view/tpl/follow.tpl @@ -2,7 +2,8 @@ <h3>{{$connect}}</h3> <div id="connect-desc">{{$desc}}</div> <form action="follow" method="post" /> - <input id="side-follow-url" type="text" name="url" size="24" title="{{$hint}}" /><input id="side-follow-submit" type="submit" name="submit" value="{{$follow}}" /> + <input id="side-follow-url" type="text" name="url" size="24" title="{{$hint}}" /> + <input id="side-follow-submit" type="submit" name="submit" class="btn btn-default" value="{{$follow}}" /> </form> {{if $abook_usage_message}} <div class="usage-message" id="abook-usage-message">{{$abook_usage_message}}</div> diff --git a/view/tpl/group_side.tpl b/view/tpl/group_side.tpl index a0ed7a82d..dd3c7e737 100755 --- a/view/tpl/group_side.tpl +++ b/view/tpl/group_side.tpl @@ -1,6 +1,10 @@ <div class="widget" id="group-sidebar"> <h3>{{$title}}</h3> + <div id="sidebar-new-group"> + <a href="group/new">{{$createtext}}</a> + </div> + <div id="sidebar-group-list"> <ul id="sidebar-group-ul"> {{foreach $groups as $group}} @@ -15,14 +19,11 @@ {{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> {{/if}} - <a id="sidebar-group-element-{{$group.id}}" class="sidebar-group-element {{if $group.selected}}group-selected{{/if}}" href="{{$group.href}}">{{$group.text}}</a> + <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> </li> {{/foreach}} </ul> </div> - <div id="sidebar-new-group"> - <a href="group/new">{{$createtext}}</a> - </div> </div> diff --git a/view/tpl/saved_searches.tpl b/view/tpl/saved_searches.tpl index d0f9e2b0e..1a9f51af9 100644 --- a/view/tpl/saved_searches.tpl +++ b/view/tpl/saved_searches.tpl @@ -5,7 +5,7 @@ <ul id="saved-search-ul"> {{foreach $saved as $search}} <li id="search-term-{{$search.id}}" class="saved-search-li clear"> - <a title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" href="{{$search.dellink}}"><i id="dropicon-saved-search-term-{{$search.id}}" class="icon-remove drop-icons iconspacer" ></i></a> + <a title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" href="{{$search.dellink}}"><i id="dropicon-saved-search-term-{{$search.id}}" class="icon-remove drop-icons iconspacer saved-search-icon" ></i></a> <a id="saved-search-term-{{$search.id}}" class="savedsearchterm{{if $search.selected}} search-selected{{/if}}" href="{{$search.srchlink}}">{{$search.displayterm}}</a> </li> {{/foreach}} diff --git a/view/tpl/saved_searches_aside.tpl b/view/tpl/saved_searches_aside.tpl index 615eca39d..0258a7632 100755 --- a/view/tpl/saved_searches_aside.tpl +++ b/view/tpl/saved_searches_aside.tpl @@ -5,7 +5,7 @@ <ul id="saved-search-ul"> {{foreach $saved as $search}} <li id="search-term-{{$search.id}}" class="saved-search-li clear"> - <a title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" href="network/?f=&remove=1&search={{$search.encodedterm}}"><i id="dropicon-saved-search-term-{{$search.id}}" class="icon-remove drop-icons iconspacer savedsearchdrop" ></i></a> + <a title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" href="network/?f=&remove=1&search={{$search.encodedterm}}"><i id="dropicon-saved-search-term-{{$search.id}}" class="icon-remove drop-icons iconspacer savedsearchdrop saved-search-icon" ></i></a> <a id="saved-search-term-{{$search.id}}" class="savedsearchterm{{if $search.selected}} search-selected{{/if}}" href="network/?f=&search={{$search.encodedterm}}">{{$search.displayterm}}</a> </li> {{/foreach}} |