Merge develop-new into event-attendance-new

[friendica.git] / view / theme / vier / style.css

diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css
index 29a4eb37233711071a311f9f48060f8f339f2e7b..1c03edc6bfbce09d10a962e2a3de3d84bb07327a 100644 (file)
--- a/view/theme/vier/style.css
+++ b/view/theme/vier/style.css
@@ -375,7 +375,7 @@ code {
 .tool a {
 /*  color: #000; */
 }
-.tool a:hover, .widget a:hover, #nets-sidear a:hover, #hide-forum-list:hover, .admin.link a:hover, aside h4 a:hover {
+.tool a:hover, .widget a:hover, #nets-sidear a:hover, #hide-forum-list:hover, .admin.link a:hover, aside h4 a:hover, right_aside h4 a:hover {
   /* text-decoration: underline; */
   text-decoration: none;
   color: black;
@@ -390,8 +390,8 @@ code {
 }
 
 .sidebar-group-li:hover, #sidebar-new-group:hover, #hide-forum-list:hover,
-#sidebar-ungrouped:hover, .side-link:hover, .nets-ul li:hover, #forum-list div:hover,
-.nets-all:hover, .saved-search-li:hover, li.tool:hover, .admin.link:hover, aside h4 a:hover, #message-new:hover {
+#sidebar-ungrouped:hover, .side-link:hover, .nets-ul li:hover, #forum-list div:hover, #forum-list-right div:hover,
+.nets-all:hover, .saved-search-li:hover, li.tool:hover, .admin.link:hover, aside h4 a:hover, right_aside h4 a:hover, #message-new:hover {
   /* background-color: #ddd; */
 /*  background-color: #e5e5e5; */
   background-color: #F5F5F5;
@@ -409,7 +409,7 @@ code {
   font-weight: bold;
 }
 
-#sidebar-new-group, #hide-forum-list, #forum-list, #sidebar-ungrouped,
+#sidebar-new-group, #hide-forum-list, #forum-list, #forum-list-right, #sidebar-ungrouped,
 .side-link, #peoplefind-desc, #connect-desc, .nets-all, .admin.link, #message-new {
   padding-left: 10px;
   padding-top: 3px;
@@ -418,7 +418,7 @@ code {
   display: block;
 }
 
-a.nets-link, .side-link a, #sidebar-new-group a, a.savedsearchterm, a.fileas-link, aside h4 a {
+a.nets-link, .side-link a, #sidebar-new-group a, a.savedsearchterm, a.fileas-link, aside h4 a, right_aside h4 a {
   display: block;
   color: #737373;
 }
@@ -445,11 +445,11 @@ a.sidebar-group-element {
   color: black;
 }
 
-#forum-list a, .tool a, .admin.link a {
+#forum-list a, #forum-list-right a, .tool a, .admin.link a {
   color: #737373;
 }
 
-#forum-list {
+#forum-list, #forum-list-right {
   margin-top: 2px;
 }
 
@@ -606,6 +606,7 @@ nav .nav-menu-icon {
 nav .nav-menu-icon.selected {
   background-color: #364e59;
 }
+nav .nav-menu img,
 nav .nav-menu-icon img {
   width: 22px;
   height: 22px;
@@ -613,6 +614,10 @@ nav .nav-menu-icon img {
   -moz-border-radius: 4px;
   border-radius: 4px;
 }
+nav .nav-menu img {
+  margin-top: -3px;
+  margin-right: 4px;
+}
 nav .nav-menu-icon .nav-notify {
   top: 3px;
 }
@@ -683,7 +688,7 @@ nav #nav-user-linklabel {
 }
 nav #nav-user-linklabel {
   padding-left: 0px;
-  margin-left: 0px;
+  margin-top: 0px;
 }
 nav #nav-help-link .menu-popup,
 nav #nav-search-link .menu-popup,
@@ -699,6 +704,17 @@ nav #nav-site-linkmenu {
   margin-left: 0px;
   margin-right: 0px;
 }
+.contact-entry-photo:hover .contact-photo-menu,
+.contact-photo-wrapper:hover .menu-popup,
+nav #nav-user-linklabel:hover #nav-user-menu,
+nav #nav-user-linkmenu:hover #nav-user-menu,
+nav #nav-apps-link:hover #nav-apps-menu,
+nav #nav-site-linkmenu:hover #nav-site-menu,
+nav #nav-notifications-linkmenu:hover #nav-notifications-menu {
+  display:block;
+  visibility:visible;
+  opacity:1;
+}
 nav #nav-notifications-linkmenu {
   margin-left: 0px;
   margin-right: 5px;
@@ -754,8 +770,12 @@ nav #nav-user-linkmenu {
         }
 
 ul.menu-popup {
+  visibility:hidden;
+  opacity:0;
+  z-index:1;
+  transition:all 0.2s ease-in-out;
+  /* display: none; */
   position: absolute;
-  display: none;
   width: 11em;
   background: #ffffff;
   color: #2d2d2d;
@@ -854,7 +874,7 @@ ul.menu-popup .empty {
 right_aside {
   width: 0px;
   top: 32px;
-  display: block;
+  display: none;
 }
 
 /* aside */
@@ -950,7 +970,7 @@ aside #profiles-menu {
   left: 10px;
 }
 
-aside #search-text, aside #side-follow-url, aside #side-peoplefind-url {
+aside #search-text, aside #side-follow-url, aside #side-peoplefind-url, right_aside input {
   width: 140px;
   height: 17px;
   padding-left: 10px;
@@ -964,7 +984,7 @@ aside #search-text, aside #side-follow-url, aside #side-peoplefind-url {
   -moz-border-right-colors: #dbdbdb;*/
 }
 
-aside h4 {
+aside h4, right_aside h4 {
   margin-bottom: 0px;
   margin-top: 0px;
   font-size: 1.17em;
@@ -1327,11 +1347,13 @@ section.minimal {
   width: 100%;
   margin-bottom: 0.3em;
 }
-.wall-item-container .wall-item-actions-social {
+.wall-item-container .wall-item-actions-social, 
+.wall-item-container .wall-item-actions-isevent {
   float: left;
   margin-bottom: 1px;
 }
-.wall-item-container .wall-item-actions-social a {
+.wall-item-container .wall-item-actions-social a, 
+.wall-item-container .wall-item-actions-isevent a {
   float: left;
   margin-right: 1em;
   cursor: pointer;
@@ -2214,6 +2236,12 @@ aside #id_password {
   float: left;
 }
 
+#register-name-end,
+#register-email-end,
+#register-nickname-end {
+  clear: both;
+}
+
 .required {
   display: inline;
   color: #B20202;