diff options
| -rw-r--r-- | mod/admin.php | 2 | ||||
| -rw-r--r-- | mod/pubsites.php | 5 | ||||
| -rw-r--r-- | view/theme/redbasic/schema/bluegrid.css | 40 | ||||
| -rw-r--r-- | view/tpl/admin_queue.tpl | 3 | ||||
| -rw-r--r-- | view/tpl/rating_form.tpl | 3 | ||||
| -rw-r--r-- | view/tpl/sources_edit.tpl | 3 | ||||
| -rw-r--r-- | view/tpl/sources_list.tpl | 4 | ||||
| -rw-r--r-- | view/tpl/sources_new.tpl | 3 |
8 files changed, 53 insertions, 10 deletions
diff --git a/mod/admin.php b/mod/admin.php index aaf00b14f..8fe9c8336 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -557,7 +557,7 @@ function admin_page_dbsync(&$a) { } } if(! count($failed)) - return '<h3>' . t('No failed updates.') . '</h3>'; + return '<div class="generic-content-wrapper-styled"><h3>' . t('No failed updates.') . '</h3></div>'; $o = replace_macros(get_markup_template('failed_updates.tpl'),array( '$base' => $a->get_baseurl(true), diff --git a/mod/pubsites.php b/mod/pubsites.php index 726c681fa..ae8601366 100644 --- a/mod/pubsites.php +++ b/mod/pubsites.php @@ -13,6 +13,8 @@ function pubsites_content(&$a) { } $url .= '/sites'; + $o .= '<div class="generic-content-wrapper-styled">'; + $o .= '<h1>' . t('Public Sites') . '</h1>'; $o .= '<div class="descriptive-text">' . @@ -33,6 +35,9 @@ function pubsites_content(&$a) { } $o .= '</table>'; + + $o .= '</div>'; + } } return $o; diff --git a/view/theme/redbasic/schema/bluegrid.css b/view/theme/redbasic/schema/bluegrid.css index e88ea171e..15e17c48b 100644 --- a/view/theme/redbasic/schema/bluegrid.css +++ b/view/theme/redbasic/schema/bluegrid.css @@ -60,6 +60,16 @@ body { border-radius: 0px } +ul.dropdown-menu.acpopup > li.textcomplete-item > a { + color: #43488A; +} + +ul.dropdown-menu.acpopup > li.textcomplete-item > a:hover, ul.dropdown-menu.acpopup > li.textcomplete-item > a:focus { + background-color: #43488A; + color: #FFF; + cursor: pointer; +} + input#jot-title:hover, input#jot-title:focus { color: #43488A; border-radius: 0px; @@ -150,10 +160,22 @@ nav .badge:hover, nav .badge:focus { color: rgba(255,255,255,.8); } -.help-block, .comment-icon, .jot-icons { +.help-block, .comment-icon, .jot-icons, .admin-icons { color: inherit; } +#adminpage table tr:hover, #adminpage table tr:hover a, #adminpage table tr td.tools a:hover, #adminpage table tr:focus, #adminpage table tr:focus a, #adminpage table tr td.tools a:focus { + color: #43488A; +} + +#adminpage table tr:hover .tools a, #adminpage table tr:focus .tools a, .generic-content-wrapper-styled > .descriptive-text { + color: #FFF; +} + +.generic-content-wrapper-styled > .sources-links { + font-weight: bold; +} + .wall-item-tools .btn { border-color: #43488A; } @@ -269,6 +291,10 @@ input { background-color: #FFF; } +.directory-item.lframe { + background-color: transparent !important; +} + .contact-entry-wrapper { border: 1px solid rgba(255,255,255,.5); } @@ -286,7 +312,7 @@ input { text-decoration: none; } -.btn, #event-edit-form .btn { +.btn, #event-edit-form .btn, input.directory-rating-submit { border: 1px solid #FFF; color: #FFF; background-color: #43488A; @@ -304,14 +330,14 @@ input { background-color: #FFF; } -.btn-default:hover, .btn-default:focus, .open > .dropdown-toggle.btn-default { +.btn-default:hover, .btn-default:focus, .open > .dropdown-toggle.btn-default, input.directory-rating-submit:hover, input.directory-rating-submit:focus { border: 1px solid #43488A; outline: 0; color: #43488A; background-color: #FFF; } -.btn-primary, input#event-submit, input#rmagic-submit-button, input#lostpass-submit-button, input#side-follow-submit, .profile-edit-submit-wrapper > input.profile-edit-submit-button, input#profile-photo-submit, form#chat-form > input { +.btn-primary, input#event-submit, input#rmagic-submit-button, input#lostpass-submit-button, input#side-follow-submit, .profile-edit-submit-wrapper > input.profile-edit-submit-button, input#profile-photo-submit, form#chat-form > input, div#adminpage > form > div.submit > input, input.sources-submit, input.contact-edit-submit { background-color: #FFF; color: #43488A; border-radius: 0px; @@ -320,7 +346,7 @@ input { transition: all .3s ease-in-out; } -.btn-primary:hover, .btn-primary:focus, input#event-submit:hover, input#event-submit:focus, input#rmagic-submit-button:hover, input#rmagic-submit-button:focus, input#lostpass-submit-button:hover, input#lostpass-submit-button:focus, input#side-follow-submit:hover, input#side-follow-submit:focus, .profile-edit-submit-wrapper > input.profile-edit-submit-button:hover, .profile-edit-submit-wrapper > input.profile-edit-submit-button:focus, input#profile-photo-submit:hover, input#profile-photo-submit:focus, form#chat-form > input:hover, form#chat-form > input:focus { +.btn-primary:hover, .btn-primary:focus, input#event-submit:hover, input#event-submit:focus, input#rmagic-submit-button:hover, input#rmagic-submit-button:focus, input#lostpass-submit-button:hover, input#lostpass-submit-button:focus, input#side-follow-submit:hover, input#side-follow-submit:focus, .profile-edit-submit-wrapper > input.profile-edit-submit-button:hover, .profile-edit-submit-wrapper > input.profile-edit-submit-button:focus, input#profile-photo-submit:hover, input#profile-photo-submit:focus, form#chat-form > input:hover, form#chat-form > input:focus, div#adminpage > form > div.submit > input:hover, div#adminpage > form > div.submit > input:focus, input.sources-submit:hover, input.sources-submit:focus, input.contact-edit-submit:focus, input.contact-edit-submit:hover { border-color: #FFF; background-color: #43488A; color: #FFF; @@ -386,6 +412,10 @@ input { border-color: #AC2925 !important; } +a:hover > .icon-trash { + color: #C9302C !important; +} + @media screen and (max-width: 767px) { .navbar-inverse .navbar-collapse { background-color: #43488A; diff --git a/view/tpl/admin_queue.tpl b/view/tpl/admin_queue.tpl index 85b476266..56b70bbee 100644 --- a/view/tpl/admin_queue.tpl +++ b/view/tpl/admin_queue.tpl @@ -1,3 +1,4 @@ +<div class="generic-content-wrapper-styled"> <h3>{{$banner}}</h3> {{if $hasentries}} @@ -11,4 +12,4 @@ </table> -{{/if}}
\ No newline at end of file +{{/if}} diff --git a/view/tpl/rating_form.tpl b/view/tpl/rating_form.tpl index d072a0b3c..4bd826484 100644 --- a/view/tpl/rating_form.tpl +++ b/view/tpl/rating_form.tpl @@ -1,3 +1,4 @@ +<div class="generic-content-wrapper-styled"> <h3>{{$header}}</h3> <div class="rating-target-name">{{if $site}}{{$website}} {{$site}}{{else}}{{$tgt_name}}{{/if}}</div> @@ -12,6 +13,7 @@ <input type="hidden" name="target" value="{{$target}}" /> <input id="contact-rating-mirror" type="hidden" name="rating" value="{{$rating_val}}" /> +<br /> <h3 class="abook-rating-text-desc">{{$lbl_rating_txt}}</h3> <textarea name="rating_text" id="rating-text" >{{$rating_txt}}</textarea> @@ -20,3 +22,4 @@ <input class="contact-edit-submit" type="submit" name="done" value="{{$submit}}" /> </form> +</div> diff --git a/view/tpl/sources_edit.tpl b/view/tpl/sources_edit.tpl index 34023e03f..a5b384ca3 100644 --- a/view/tpl/sources_edit.tpl +++ b/view/tpl/sources_edit.tpl @@ -1,3 +1,4 @@ +<div class="generic-content-wrapper-styled"> <h1>{{$title}}</h1> <div class="descriptive-text">{{$desc}}</div> @@ -15,7 +16,7 @@ <br /> <br /> <a href="sources/{{$id}}/drop">{{$drop}}</a> - +</div> diff --git a/view/tpl/sources_list.tpl b/view/tpl/sources_list.tpl index 5fe50ba98..76be35b1a 100644 --- a/view/tpl/sources_list.tpl +++ b/view/tpl/sources_list.tpl @@ -1,3 +1,4 @@ +<div class="generic-content-wrapper-styled"> <h1>{{$title}}</h1> <div class="descriptive-text">{{$desc}}</div> @@ -12,4 +13,5 @@ <li><a href="sources/{{$source.src_id}}">{{$source.xchan_name}}</a></li> {{/foreach}} </ul> -{{/if}}
\ No newline at end of file +{{/if}} +</div> diff --git a/view/tpl/sources_new.tpl b/view/tpl/sources_new.tpl index 3c6a4be30..3c8a54373 100644 --- a/view/tpl/sources_new.tpl +++ b/view/tpl/sources_new.tpl @@ -1,3 +1,4 @@ +<div class="generic-content-wrapper-styled"> <h1>{{$title}}</h1> <div class="descriptive-text">{{$desc}}</div> @@ -11,5 +12,5 @@ <input type="submit" name="submit" class="sources-submit" value="{{$submit}}" /> </div> </form> - +</div> |