diff options
| author | friendica <info@friendica.com> | 2013-09-26 19:35:09 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-09-26 19:35:09 -0700 |
| commit | 6dc4d963fa510d873188226941456b4e4fa4e766 (patch) | |
| tree | 8bcecc19f7de82ed6cac5a9aa26eca8bfb8518d5 | |
| parent | 017db2994714b95c974ee87b841017a6da0b6557 (diff) | |
| parent | dc692cd748697be54bceae4ab373b13ae839bd8b (diff) | |
| download | volse-hubzilla-6dc4d963fa510d873188226941456b4e4fa4e766.tar.gz volse-hubzilla-6dc4d963fa510d873188226941456b4e4fa4e766.tar.bz2 volse-hubzilla-6dc4d963fa510d873188226941456b4e4fa4e766.zip | |
Merge https://github.com/friendica/red into zpull
| -rw-r--r-- | view/theme/redbasic/css/style.css | 27 | ||||
| -rwxr-xr-x | view/tpl/abook_edit.tpl | 4 | ||||
| -rw-r--r-- | view/tpl/write_pages.tpl | 2 |
3 files changed, 31 insertions, 2 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 48e38c0f6..f3f637996 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1228,6 +1228,9 @@ footer { border: none; } +div.dirtagblock.widget { + overflow: hidden; +} .pager { padding: 10px; @@ -2496,7 +2499,7 @@ brain is weird like that */ } .field_abook_help { - color: #888; + color: #000; } .abook-them { margin-left: 225px; @@ -2510,6 +2513,13 @@ brain is weird like that */ margin-bottom: 5px !important; } +.abook-pending-contact { + background: orange; + font-weight: bold; + margin: 10px; + padding: 20px 5px 10px; +} + #contact-slider { width: 600px !important; } @@ -3350,6 +3360,21 @@ div.page-list-item { margin: 20px; } +div#write-pages { +display: block; +position: fixed; +top: 24px; +z-index: 99; +background: silver; +width: 100%; +left: 0; +} + +div#write-pages a { +color: #000; +margin-right: 50px; +} + .pmenu ul { list-style-type: none; } diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index c285e56d1..30abcc6b3 100755 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -1,3 +1,4 @@ +<div class="generic-content-wrapper"> <h2>{{$header}}</h2> <h3>{{$addr}}</h3> @@ -40,7 +41,9 @@ {{if $is_pending}} +<div class="abook-pending-contact"> {{include file="field_checkbox.tpl" field=$unapproved}} +</div> {{/if}} <br /> @@ -82,3 +85,4 @@ </form> </div> +</div> diff --git a/view/tpl/write_pages.tpl b/view/tpl/write_pages.tpl index f6668ceb1..53146ee30 100644 --- a/view/tpl/write_pages.tpl +++ b/view/tpl/write_pages.tpl @@ -1,3 +1,3 @@ <div id="write-pages" class="bigwidget"> -<center><span id="wp-new"><a href="{{$newurl}}">{{$new}}</a></span> <span id="wp-edit"><a href="{{$editurl}}">{{$edit}}</a></span></center> +<span id="wp-new"><a href="{{$newurl}}">{{$new}}</a></span> <span id="wp-edit"><a href="{{$editurl}}">{{$edit}}</a></span> </div> |