Merge remote branch 'upstream/master'

[friendica.git] / view / theme / diabook / style-network.css

diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css
index f322aac8ffea6e288149749e871da704e45bed72..f4dee582bd00894c25a54b16dbe6eb5e206c1db1 100644 (file)
--- a/view/theme/diabook/style-network.css
+++ b/view/theme/diabook/style-network.css
@@ -527,7 +527,8 @@ header {
   box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
 }
 header #site-location {
-  display: none;
+position: absolute;
+top: 30px;
 }
 header #banner {
   overflow: hidden;
@@ -642,6 +643,10 @@ nav #search-box #search-text {
   background-image:  url('icons/lupe.png');
   background-repeat:no-repeat;
   padding-left:20px;
+  border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
        }
 
 
@@ -996,6 +1001,10 @@ aside #profiles-menu {
 }
 aside #search-text {
        width: 150px;
+       border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
 }
 aside #side-follow-url {
        width: 150px;
@@ -1095,6 +1104,32 @@ aside #side-peoplefind-url {
   background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center;
 }
 /* widget: search */
+span.sbox_l  {
+       background: white url('../../../view/theme/diabook/icons/srch_l.gif') no-repeat top left;
+       float: left;
+       width: 19px; height: 19px;
+       margin-left: 10px;
+       margin-top: 5px;
+       
+}
+
+span.sbox_r  {
+       background: white url('../../../view/theme/diabook/icons/srch_r.gif') no-repeat top left;
+       float: left;
+       width: 19px; height: 19px;
+       margin-top: 5px;
+}
+
+span.sbox input {
+       background: white url('../../../view/theme/diabook/icons/srch_bg.gif') repeat-x top left;
+       float: left;
+       margin-top: 5px;
+       border: 0;
+       height: 13px; width: 100px;
+       padding: 3px;
+       font: 11px/13px arial;
+       color: #000;
+}
 #add-search-popup {
   width: 200px;
   top: 18px;
@@ -1174,9 +1209,20 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow:
 #page-sidebar-right_aside ul {margin-top: 0px;}
 right_aside .icon {width: 10px; height: 10px;}
 .close_box             { 
+               background-image: url("../../../view/theme/diabook-blue/icons/close_box.png");
+               float: right;
+               opacity: 0.1;
+               }
+.close_box:hover       { 
                background-image: url("../../../view/theme/diabook-blue/icons/close_box.png");
                float: right;
                cursor: pointer;
+               opacity: 1;
+-webkit-transition: all 0.2s ease-in-out;
+-moz-transition: all 0.2s ease-in-out;
+-o-transition: all 0.2s ease-in-out;
+-ms-transition: all 0.2s ease-in-out;
+transition: all 0.2s ease-in-out;
                }
 
 /* wall item */
@@ -1714,12 +1760,13 @@ right_aside .icon {width: 10px; height: 10px;}
     margin-left: 5px;
 }
 /*input[type="submit"] {
-       border: 0px;
-    background-color: @ButtonBackgroundColor;
-    color: @ButtonColor;
-    padding: 0px 10px;
-       .rounded(5px);
-    height: 18px;
+    background-color: #33ACFF;
+    background-image: -moz-linear-gradient(center top , #66C1FF 0%, #0097FF 100%);
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    margin-left: 5px;
 }*/
 /** acl **/
 #photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {