Merge pull request #2686 from rabuzarus/2107-contact_edit

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

diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css
index 526402f2e317c3de6c8ba4208039322541736ff4..d53c2f393f09504116eb740c5b31c6173a965a15 100644 (file)
--- a/view/theme/vier/style.css
+++ b/view/theme/vier/style.css
@@ -24,72 +24,72 @@ img {
 }
 
 #pending-update {
-        float:right;
-        color: #ffffff;
-        font-weight: bold;
-        background-color: #FF0000;
-        padding: 0em 0.3em;
+  float:right;
+  color: #ffffff;
+  font-weight: bold;
+  background-color: #FF0000;
+  padding: 0em 0.3em;
 }
 
 .admin.linklist {
-        border: 0px;
-       padding: 0px;
-       list-style: none;
-       margin-top: 0px;
+  border: 0px;
+  padding: 0px;
+  list-style: none;
+  margin-top: 0px;
 }
 
 .admin.link {
-        list-style-position: inside;
-        font-size: 1em;
-/*        padding-left: 5px;
-        margin: 5px; */
+  list-style-position: inside;
+  font-size: 1em;
+/*  padding-left: 5px;
+    margin: 5px; */
 }
 
 #adminpage dl {
-        clear: left;
-        margin-bottom: 2px;
-        padding-bottom: 2px;
-        border-bottom: 1px solid black;
+  clear: left;
+  margin-bottom: 2px;
+  padding-bottom: 2px;
+  border-bottom: 1px solid black;
 }
 
 #adminpage dt {
-        width: 200px;
-        float: left;
-        font-weight: bold;
+  width: 200px;
+  float: left;
+  font-weight: bold;
 }
 
 #adminpage dd {
-        margin-left: 200px;
+  margin-left: 200px;
 }
 #adminpage h3 {
-        border-bottom: 1px solid #898989;
-        margin-bottom: 5px;
-        margin-top: 10px;
+  border-bottom: 1px solid #898989;
+  margin-bottom: 5px;
+  margin-top: 10px;
 }
 
 #adminpage .submit {
-        clear:left;
+  clear:left;
 }
 
 #adminpage #pluginslist {
-        margin: 0px; padding: 0px;
+  margin: 0px; padding: 0px;
 }
 
 #adminpage .plugin {
-        list-style: none;
-        display: block;
-       /* border: 1px solid #888888; */
-        padding: 1em;
-        margin-bottom: 5px;
-        clear: left;
+  list-style: none;
+  display: block;
+  /* border: 1px solid #888888; */
+  padding: 1em;
+  margin-bottom: 5px;
+  clear: left;
 }
 
 #adminpage .toggleplugin {
-        float:left;
-        margin-right: 1em;
+  float:left;
+  margin-right: 1em;
 }
 
-#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;}
+#adminpage table {width:100%; border-bottom: 1px solid #000000; margin: 5px 0px;}
 #adminpage table th { text-align: left;}
 #adminpage td .icon { float: left;}
 #adminpage table#users img { width: 16px; height: 16px; }
@@ -127,8 +127,8 @@ img {
 .icon {
   background-color: transparent ;
   background-repeat: no-repeat;
-  width: 18px;
-  height: 18px;
+  width: 20px;
+  height: 20px;
   /* display: block; */
   display: inline-block;
   overflow: hidden;
@@ -247,15 +247,6 @@ div.pager {
   float: left;
 }
 
-#contact-edit-drop-link-end {
-  /* clear: both; */
-}
-
-#contact-edit-links ul {
-  list-style: none;
-  list-style-type: none;
-}
-
 .hide-comments-outer {
   margin-left: 80px;
   margin-bottom: 5px;
@@ -268,8 +259,8 @@ div.pager {
 
 /* global */
 body {
-  /* font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif; */
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+/*  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; */
+  font-family: -apple-system,".SFNSText-Regular","San Francisco","Roboto","Segoe UI","Helvetica Neue","Lucida Grande",Helvetica,Arial,sans-serif;
   font-size: 14px;
   /* font-size: 13px;
   line-height: 19.5px; */
@@ -342,6 +333,23 @@ code {
   padding: 10px;
   margin-top: 20px;
   max-width: 640px;
+  white-space: pre-wrap;
+}
+.badge {
+  display: inline-block;
+  min-width: 10px;
+  padding: 3px 7px;
+  font-size: 10px;
+  font-weight: 700;
+  line-height: 1;
+  color: #fff;
+  text-align: center;
+  white-space: nowrap;
+  vertical-align: baseline;
+  /* background-color: #737373*/;
+  background-color: #36C;
+  border-radius: 4px;
+  opacity: 0.3;
 }
 #panel {
   position: absolute;
@@ -351,21 +359,50 @@ code {
   margin: 0px;
   padding: 1em;
   list-style: none;
-  border: 3px solid #364e59;
+  /*border: 3px solid #364e59;*/
   z-index: 100000;
   box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
 }
+
+/* some settings for different form-factors */
+@media (min-width: 601px) {
+  a.mobile-view { display: none };
+  a.desktop-view { display: initial };
+}
+
 /* tool */
 .tool {
   height: auto;
   overflow: auto;
   padding: 0px;
 }
+.menu-popup .divider {
+  width: 90%;
+  height: 1px;
+  margin: 3px auto;
+  overflow: hidden;
+  background-color: #737373;
+  opacity: 0.4;
+}
 #saved-search-ul .tool:hover,
 #nets-sidebar .tool:hover,
 #sidebar-group-list .tool:hover {
        background: #EEE;
 }
+/*#sidebar-group-list .notify {
+       min-width: 10px;
+       text-align: center;
+       color: #FFF;
+       background-color: #CB4437;
+       font: bold 10px Arial;
+       padding: 3px;
+       border-radius: 10px;
+       display: none;
+}*/
+#sidebar-group-list .notify {
+  display: none;
+}
+#sidebar-group-list .notify.show { display: inline-block; }
 .tool .label {
 /*  float: left; */
 }
@@ -375,7 +412,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, #forum-widget-collapse:hover, .admin.link a:hover, aside h4 a:hover, right_aside h4 a:hover {
   /* text-decoration: underline; */
   text-decoration: none;
   color: black;
@@ -389,9 +426,10 @@ code {
   opacity: 1;
 }
 
-.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-group-li:hover, #sidebar-new-group:hover, #sidebar-edit-groups:hover,#forum-widget-collapse:hover,
+#sidebar-ungrouped:hover, .side-link:hover, .nets-ul li:hover, #forumlist-sidebar li:hover, #forumlist-sidebar-right li: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,
+#sidebar-photos-albums li:hover, .photos-upload-link:hover, .textcomplete-item.active {
   /* background-color: #ddd; */
 /*  background-color: #e5e5e5; */
   background-color: #F5F5F5;
@@ -405,11 +443,11 @@ code {
 /*  color: #000; */
 }
 
-.group-selected, .nets-selected, .fileas-selected {
+.group-selected, .nets-selected, .fileas-selected, .forum-selected {
   font-weight: bold;
 }
 
-#sidebar-new-group, #hide-forum-list, #forum-list, #sidebar-ungrouped,
+#forum-widget-showmore, #sidebar-new-group, #sidebar-edit-groups, #forum-widget-collapse, #forumlist-rsidebar-right, #sidebar-ungrouped,
 .side-link, #peoplefind-desc, #connect-desc, .nets-all, .admin.link, #message-new {
   padding-left: 10px;
   padding-top: 3px;
@@ -418,7 +456,32 @@ code {
   display: block;
 }
 
-a.nets-link, .side-link a, #sidebar-new-group a, a.savedsearchterm, a.fileas-link, aside h4 a {
+.photos-upload-link {
+  padding-top: 3px;
+  padding-bottom: 3px;
+  display: block;
+}
+
+#forumlist-sidebar {
+  padding-top: 3px;
+  padding-bottom: 3px;
+  display: block;
+}
+
+.forum-widget-entry {
+  padding-left: 10px;
+  padding-right: 5px;
+}
+
+#forumlist-sidebar .notify, #forumlist-sidebar-right .notify {
+  display: none;
+}
+
+#forumlist-sidebar .notify.show, #forumlist-sidebar-right .notify.show {
+  display: inline-block;
+}
+
+a.nets-link, .side-link a, #sidebar-new-group a, #sidebar-edit-groups a, a.savedsearchterm,a.fileas-link, aside h4 a, right_aside h4 a {
   display: block;
   color: #737373;
 }
@@ -445,11 +508,11 @@ a.sidebar-group-element {
   color: black;
 }
 
-#forum-list a, .tool a, .admin.link a {
+#forumlist-sidebar a, #forumlist-sidebar-right a, .tool a, .admin.link a, #sidebar-photos-albums a {
   color: #737373;
 }
 
-#forum-list {
+#forumlist-sidebar, #forumlist-sidebar-right {
   margin-top: 2px;
 }
 
@@ -578,7 +641,7 @@ nav ul li .menu-popup {
   right: auto;
 }
 
-nav #search-box #search-text {
+nav #nav-search-box #nav-search-text {
   /*background-image:  url('icons/lupe.png');
   background-repeat:no-repeat; */
   padding-left:0px;
@@ -618,6 +681,7 @@ nav .nav-menu img {
   margin-top: -3px;
   margin-right: 4px;
 }
+
 nav .nav-menu-icon .nav-notify {
   top: 3px;
 }
@@ -652,6 +716,23 @@ nav .nav-menu:hover {
 /*    background: #4c619c; */
     text-decoration: none;
 }
+
+.manage-notify {
+   background-color: #F80;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+  font-size: 10px;
+  padding: 1px 3px;
+  top: 0px;
+  min-width: 15px;
+  text-align: center;
+  color: white;
+  float: right;
+  margin-top: -14px;
+  margin-right: -20px;
+}
+
 nav .nav-notify {
   display: none;
   position: absolute;
@@ -671,6 +752,7 @@ nav .nav-notify {
   text-align: center;
   color: white;
 }
+
 nav .nav-notify.show {
   display: block;
 }
@@ -710,7 +792,8 @@ 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 {
+nav #nav-notifications-linkmenu:hover #nav-notifications-menu,
+#contact-edit-actions:hover #contact-actions-menu {
   display:block;
   visibility:visible;
   opacity:1;
@@ -817,15 +900,22 @@ ul.menu-popup .empty {
   color: #9eabb0;
 }
 /* autocomplete popup */
-.acpopup {
-  max-height: 150px;
+
+.acpopup, .acpopup-mce {
   background-color: #ffffff;
-  color: #2d2d2d;
   border: 1px solid #MenuBorder;
   overflow: auto;
   z-index: 100000;
   box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
 }
+acpopup-mce {
+  color: #2d2d2d;
+  max-height: 150px;
+}
+nav .acpopup {
+  top: 31px !important;
+  margin-left: -23px
+}
 .acpopupitem {
   color: #2d2d2d;
   padding: 4px;
@@ -838,6 +928,27 @@ ul.menu-popup .empty {
 .acpopupitem.selected {
   background-color: #bdcdd4;
 }
+.textcomplete-item {
+  float: none;
+}
+.textcomplete-item a {
+  color: #737373;
+}
+.textcomplete-item a:hover {
+  color: #000;
+  padding: 3px 20px;
+}
+.textcomplete-item a .forum, .forum .acpopup-sub-text {
+  color: #36C;
+  opacity: 0.8;
+}
+.textcomplete-item a .forum:hover {
+  opacity: 1.0;
+}
+img.acpopup-img {
+  border-radius: 4px;
+}
+
 #nav-notifications-menu {
   width: 400px;
   max-height: 550px;
@@ -852,10 +963,33 @@ ul.menu-popup .empty {
   background-color: #bdcdd4;
 }*/
 
+#nav-notifications-menu > li {
+  display: block;
+  color: #737373;
+  cursor: pointer;
+}
+
+#nav-notifications-menu > li:hover {
+  background-color: #e5e5e5;
+  color: #000;
+}
+#nav-notifications-mark-all a {
+  color: #737373;
+}
+
 #nav-notifications-menu img {
-  float: left;
-  margin-right: 5px;
+  width: 32px;
+  height: 32px;
+  border-radius: 5px;
+  margin: 0;
+  padding: 0;
 }
+
+#nav-notifications-menu .notif-desc-wrapper a {
+  display: inline;
+  padding: 0px;
+}
+
 #nav-notifications-menu .contactname {
   font-weight: bold;
 }
@@ -871,10 +1005,43 @@ ul.menu-popup .empty {
         padding: 7px 7px 0px 0px;
 }
 
+.notif-entry-wrapper {
+  padding: 5px 10px;
+  min-height: 32px;
+  /*border-bottom: 1px solid #DDDDDD;*/
+}
+
+.notif-photo-wrapper {
+  float: left;
+  margin-right: 10px;
+}
+
+.notif-photo-wrapper a {
+  padding: 0 !important;
+}
+
+.notif-desc-wrapper {
+  overflow: hidden;
+}
+
 right_aside {
-  width: 0px;
+  display: none;
+  vertical-align: top;
+  width: 185px;
+  padding-top: 10px;
+  padding-right: 20px;
+  padding-bottom: 0px;
+  padding-left: 10px;
+  background-color: #FFFFFF;
+  font-size: 13px;
+  overflow-y: auto;
+  z-index: 2;
+  /* line-height: 17px; */
+  color: #737373;
+  box-shadow: 1px 2px 0px 0px #D8D8D8;
   top: 32px;
-  display: block;
+  position: absolute;
+  margin-left: calc(100% - 215px);
 }
 
 /* aside */
@@ -894,7 +1061,7 @@ aside {
   top: 32px;
   overflow-y: auto;
   z-index: 2;
-  line-height: 17px;
+  /* line-height: 17px; */
   position: fixed;
   /* overflow: auto; */
   height: 100%;
@@ -903,6 +1070,9 @@ aside {
   box-shadow: 1px 2px 0px 0px #D8D8D8;
   color: #737373;
 }
+aside .vcard .tool {
+  clear: both;
+}
 aside .vcard .fn {
   font-size: 18px;
   font-weight: bold;
@@ -915,6 +1085,12 @@ aside .vcard .title {
 aside .vcard dl {
   height: auto;
   overflow: auto;
+  word-break: break-word;
+}
+aside .vcard .account-type {
+  margin-bottom: 13px;
+  font-size: 14px;
+  font-weight: bold;
 }
 
 aside select {
@@ -944,9 +1120,11 @@ aside #profile-extra-links ul {
 }
 aside #profile-extra-links li {
   padding: 0px;
+  padding-bottom: 4px;
   margin: 0px;
   list-style: none;
 }
+aside #subscribe-feed-link,
 aside #dfrn-request-link,
 aside #wallmessage-link {
   display: block;
@@ -959,6 +1137,7 @@ aside #wallmessage-link {
   text-transform: uppercase;
   padding: 4px 2px 2px 35px;
 }
+aside #subscribe-feed-link:hover,
 aside #dfrn-request-link:hover,
 aside #wallmessage-link:hover {
   text-decoration: none;
@@ -970,7 +1149,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;
@@ -984,12 +1163,16 @@ 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;
 }
 
+aside img {
+  max-width: 175px;
+}
+
 .nets-ul {
   margin-top: 0px;
 }
@@ -1109,7 +1292,6 @@ section {
   line-height: 19.5px;*/
   font-size: 14.95px;
   line-height: 21px;
-  /* font-family: Quodana,Verdana,DejaVu Sans,Bitstream Vera Sans,Helvetica,sans-serif; */
   display: table-cell;
   vertical-align: top;
   top: 32px;
@@ -1137,6 +1319,31 @@ section.minimal {
   height: 100%;
 }
 
+/* Contact-Header for the Network Stream */
+#viewcontact_wrapper-network {
+  width: 100%;
+  min-height: 100px;
+  background-color: #FAFAFA;
+  box-shadow: 1px 2px 0px 0px #D8D8D8;
+  border-bottom: 1px solid #D2D2D2;
+}
+#contact-entry-wrapper-network {
+  float: none;
+  width: auto;
+  height: auto;
+  padding: 10px;
+  margin: 0;
+}
+#contact-entry-accounttype-network {
+  font-size: 20px;
+}
+#contact-entry-name-network {
+  font-size: 24.5px;
+}
+.contact-entry-photo img {
+  border-radius: 4px;
+}
+
 /* wall item */
 .tread-wrapper {
 /*    border-bottom: 1px solid #BDCDD4; */
@@ -1219,6 +1426,15 @@ section.minimal {
   font-size: 12px;
 }
 
+.shared-time {
+  color: #999;
+  font-size: 12px;
+}
+
+.shared_header {
+  line-height: 14px;
+}
+
 .wall-item-network {
   color: #999;
   font-size: 12px;
@@ -1226,6 +1442,10 @@ section.minimal {
   float: right;
 }
 
+.wall-item-network-end {
+  clear: both;
+}
+
 .wall-item-location {
   width: 350px;
   float: left;
@@ -1236,6 +1456,7 @@ section.minimal {
   /* font-size: 14px; */
   max-width: 660px;
   word-wrap: break-word;
+  word-break: break-word;
   /* line-height: 1.36; */
   padding-bottom: 6px;
 }
@@ -1248,8 +1469,8 @@ section.minimal {
 }
 .children .wall-item-container .wall-item-item .wall-item-content img {
   /* max-width: 650px; */
-  /* max-width: 580px; */
-  max-width: 100%;
+  max-width: 520px;
+  /* max-width: 100%; */
 }
 .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
   display: table-cell;
@@ -1292,7 +1513,8 @@ section.minimal {
   color: #36c;
 }
 
-.wall-item-container .wall-item-name {
+.wall-item-container .wall-item-name,
+.wall-item-container .shared-author {
   color: black;
   font-weight: bold;
   -webkit-transition: all 0.2s ease-in-out;
@@ -1303,7 +1525,9 @@ section.minimal {
 }
 
 .toplevel_item:hover .wall-item-name,
-.wall-item-container:hover .wall-item-name {
+.wall-item-container:hover .wall-item-name,
+.toplevel_item:hover .shared-author,
+.wall-item-container:hover .shared-author {
   color: #36c;
   font-weight: bold;
   -webkit-transition: all 0.2s ease-in-out;
@@ -1324,6 +1548,7 @@ section.minimal {
   transition: all 0.2s ease-in-out;
   /* color: darkblue; */
   /* color: #3E3E8C; */
+  word-break: break-word;
 }
 
 .toplevel_item:hover .fakelink,
@@ -1347,15 +1572,13 @@ section.minimal {
   width: 100%;
   margin-bottom: 0.3em;
 }
-.wall-item-container .wall-item-actions-social, 
-.wall-item-container .wall-item-actions-isevent,
-.wall-item-container .wall-item-actions-canvote {
+.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-isevent a, 
-.wall-item-container .wall-item-actions-canvote a{
+.wall-item-container .wall-item-actions-social a,
+.wall-item-container .wall-item-actions-isevent a {
   float: left;
   margin-right: 1em;
   cursor: pointer;
@@ -1406,63 +1629,34 @@ section.minimal {
   width: calc(100% - 165px);
 }
 
-.wall-item-container.comment .wall-item-content {
-  max-width: 585px;
-}
-.wall-item-container.thread_level_3 .wall-item-content {
-  max-width: 570px;
-}
-.wall-item-container.thread_level_4 .wall-item-content {
-  max-width: 555px;
-}
-.wall-item-container.thread_level_5 .wall-item-content {
-  max-width: 540px;
-}
-.wall-item-container.thread_level_6 .wall-item-content {
-  max-width: 525px;
-}
+.wall-item-container.comment .wall-item-content,
+.wall-item-container.thread_level_3 .wall-item-content,
+.wall-item-container.thread_level_4 .wall-item-content,
+.wall-item-container.thread_level_5 .wall-item-content,
+.wall-item-container.thread_level_6 .wall-item-content,
 .wall-item-container.thread_level_7 .wall-item-content {
-  max-width: 510px;
+  max-width: calc(100% - 1px);
 }
 
-.children .wall-item-comment-wrapper textarea {
-  width: 570px;
-}
-.wall-item-container.thread_level_3 .wall-item-comment-wrapper textarea {
-  width: 555px;
-}
-.wall-item-container.thread_level_4 .wall-item-comment-wrapper textarea {
-  width: 540px;
-}
-.wall-item-container.thread_level_5 .wall-item-comment-wrapper textarea {
-  width: 525px;
-}
-.wall-item-container.thread_level_6 .wall-item-comment-wrapper textarea {
-  width: 510px;
-}
+.children .wall-item-comment-wrapper textarea, 
+.wall-item-container.thread_level_3 .wall-item-comment-wrapper textarea,
+.wall-item-container.thread_level_4 .wall-item-comment-wrapper textarea,
+.wall-item-container.thread_level_5 .wall-item-comment-wrapper textarea,
+.wall-item-container.thread_level_6 .wall-item-comment-wrapper textarea,
 .wall-item-container.thread_level_7 .wall-item-comment-wrapper textarea {
-  width: 495px;
+  width: calc(100% - 11px);
 }
 
-.children .wall-item-bottom .comment-edit-preview {
-  width: 575px;
-}
-.wall-item-container.thread_level_3 .wall-item-bottom .comment-edit-preview {
-  width: 560px;
-}
-.wall-item-container.thread_level_4 .wall-item-bottom .comment-edit-preview {
-  width: 545px;
-}
-.wall-item-container.thread_level_5 .wall-item-bottom .comment-edit-preview {
-  width: 530px;
-}
-.wall-item-container.thread_level_6 .wall-item-bottom .comment-edit-preview {
-  width: 515px;
-}
+.children .wall-item-bottom .comment-edit-preview,
+.wall-item-container.thread_level_3 .wall-item-bottom .comment-edit-preview,
+.wall-item-container.thread_level_4 .wall-item-bottom .comment-edit-preview,
+.wall-item-container.thread_level_5 .wall-item-bottom .comment-edit-preview,
+.wall-item-container.thread_level_6 .wall-item-bottom .comment-edit-preview,
 .wall-item-container.thread_level_7 .wall-item-bottom .comment-edit-preview {
-  width: 500px;
+  width: calc(100% - 6px);
 }
 
+
 .wall-item-container.comment .contact-photo {
   width: 32px;
   height: 32px;
@@ -1606,7 +1800,8 @@ section.minimal {
 }
 
 #jot-preview-content {
-  padding-top: 25px;
+  padding-top: 4px;
+  clear: both;
 }
 
 #jot-preview-content .tread-wrapper {
@@ -1867,17 +2062,21 @@ section.minimal {
   margin-left: 15px;
   cursor: pointer;
 }
-#profile-voting-wrapper {
-  float: left;
-  margin-left: 15px;
-  cursor: pointer;
-}
 #profile-smiley-wrapper {
   float: left;
   margin-left: 15px;
   cursor: pointer;
   margin-top: 3px;
   height: 10px;
+  display: inline-block;
+}
+#smileybutton {
+  position: absolute;
+  z-index: 99;
+}
+table.smiley-preview{
+  background-color: #FFF;
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
 }
 #jot-perms-icon {
   float: right;
@@ -2191,6 +2390,11 @@ ul.tabs li .active, span.pager_current a {
 aside form {
   overflow-x: hidden;
 }
+aside form fieldset {
+  margin: 0px;
+  padding: 0px;
+  border: 0px none;
+}
 aside form .field label {
   float: left;
   width: 170px;
@@ -2277,18 +2481,52 @@ aside #id_password {
   float: left;
 }
 /* contacts */
-.contact-entry-wrapper {
+/*.contact-entry-wrapper {
   width: 120px;
   height: 130px;
   float: left;
-/*  overflow: hidden; */
+  overflow: hidden;
   margin-left: 5px;
+}*/
+
+.contact-entry-wrapper {
+  float: left;
+  width: 363px;
+  height: 100px;
+  padding-right: 10px;
+  margin: 0 10px 10px 0px;
+}
+.contact-entry-wrapper .contact-entry-photo-wrapper {
+  float: left;
+  margin-right: 10px;
+  width: 80px;
+  height: 80px;
+}
+.contact-entry-photo-wrapper {
+  position: relative;
+}
+.contact-entry-desc {
+  overflow: hidden;
+}
+.contact-entry-name {
+  font-weight: bold;
+}
+.contact-entry-details {
+  font-size: 13px;
+  color: #999999;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 /* photo */
 .lframe {
   float: left;
   margin: 0px 10px 10px 0px;
 }
+.contact-entry-photo a img {
+  width: 80px;
+  height: 80px;
+}
 /* profile match wrapper */
 .profile-match-wrapper {
   float: left;
@@ -2326,14 +2564,15 @@ aside #id_password {
 }
 .contact-photo-menu {
         width: 11em;
-        border: 3px solid #364e59;
+        /*border: 3px solid #364e59;*/
        color: #2d2d2d;
         background: #FFFFFF;
-/*        position: absolute;*/
-        position: relative;
-        left: 0px; top: 0px;
+        position: absolute;
+        /*position: relative;*/
+        left: 0px; /*top: 0px;*/
         display: none;
         z-index: 10000;
+       box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
 }
 .contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
 .contact-photo-menu li a {
@@ -2366,6 +2605,25 @@ blockquote {
     display: block;
 }
 
+.oembed.video .embed_video > div {
+    position: absolute; top: 0px; left: 0px;
+    background-color: rgba(0,0,0,0.5);
+}
+.oembed.video .embed_video > div::before {
+    font-family: FontAwesome;
+    font-weight: normal;
+    font-style: normal;
+    display: inline-block;
+    text-decoration: inherit;
+    vertical-align: top;
+    font-size: 3em;
+    content: "\f01d"; /* icon-play-circle */
+    color: #fff;
+    bottom: 10px;
+    right: 10px;
+    position: absolute;
+}
+
 /* ================== */
 /* = Contacts Block = */
 /* ================== */
@@ -2503,6 +2761,7 @@ a.mail-list-link {
        border: none;
 }
 
+
 /* ========== */
 /* = Events = */
 /* ========== */
@@ -2520,7 +2779,9 @@ a.mail-list-link {
         margin-bottom: 15px;
 }
 
-.vevent .event-description, .vevent .event-location {
+.vevent .event-summary,
+.vevent .event-description,
+.vevent .event-location {
         margin-left: 10px;
         margin-right: 10px;
 }
@@ -2577,6 +2838,13 @@ a.mail-list-link {
         font-weight: bold;
         color: #FF0000;
 }
+#event-desc-text-edit-bb, #event-location-text-edit-bb {
+  float: none;
+}
+#event-start-text, #event-finish-text, #event-summary-text, #event-desc-text, #event-location-text {
+  margin-bottom: 10px;
+  margin-top: 20px;
+}
 
 .settings-block {
         /* border: 1px solid #AAA; */
@@ -2712,35 +2980,79 @@ a.mail-list-link {
   color: #999999;
 }
 
+/* contact edit page */
+#contact-edit-nav-wrapper {
+  margin-top: 24px;
+}
+#contact-edit-status-wrapper {
+  border-color: #c9d8f6;
+  background-color: #e0e8fa;
+  border-radius: 3px;
+}
+
+#contact-edit-contact-status {
+  font-weight: bold;
+}
+
+#contact-edit-drop-link-end {
+  /* clear: both; */
+}
+
+#contact-edit-links ul {
+  list-style: none;
+  list-style-type: none;
+}
+
+a.btn#contact-edit-actions-button {
+  cursor: pointer;
+  border-radius: 3px;
+  font-size: inherit;
+  font-weight: normal;
+  height: auto;
+  line-height: inherit;
+  padding: 5px 10px;
+}
+
+#lost-contact-message, #insecure-message,
+#block-message, #ignore-message, #archive-message {
+  color: #CB4437;
+}
+
+/* photo album page */
 .photo-top-image-wrapper {
-        position: relative;
-        float: left;
-        margin-top: 15px;
-        margin-right: 15px;
-        width: 200px; height: 200px;
-        overflow: hidden;
+  position: relative;
+  float: left;
+  margin-top: 15px;
+  margin-right: 15px;
+  width: 200px; height: 200px;
+  overflow: hidden;
 }
 .photo-top-album-name {
-        width: 100%;
-        min-height: 2em;
-        position: absolute;
-        bottom: 0px;
-        padding: 0px 3px;
-        padding-top: 0.5em;
-        background-color: rgb(255, 255, 255);
+  width: 100%;
+  min-height: 2em;
+  position: absolute;
+  bottom: 0px;
+  padding: 0px 3px;
+  padding-top: 0.5em;
+  background-color: rgb(255, 255, 255);
 }
 #photo-top-end {
-        clear: both;
+  clear: both;
 }
 
 #photo-top-links {
-        margin-bottom: 30px;
-        margin-left: 30px;
+  margin-bottom: 30px;
+  margin-left: 30px;
 }
 
 #photos-upload-newalbum-div {
-        float: left;
-        width: 175px;
+  float: left;
+  width: 175px;
+}
+img.photo-top-photo {
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
 }
 
 .menu-profile-list{
@@ -2950,7 +3262,7 @@ a.mail-list-link {
   border:1px solid #dcdcdc;
   display:inline-block;
   color:#777777;
-  font-family:Arial;
+  font-family:Arial, sans-serif;
   font-size:15px;
   font-weight:bold;
   font-style:normal;
@@ -2994,4 +3306,14 @@ a.mail-list-link {
 }
 
 /* upload/select popup */
-.fbrowser.image .photo-album-image-wrapper { margin-left: 10px; }
+  fbrowser.image .photo-album-image-wrapper { margin-left: 10px; }
+  #message-preview { margin-top: 15px; }
+  #message-preview span { width: 100%; }
+  #message-preview .mail-count, #message-preview .mail-delete { display:none; }
+  #message-preview .mail-list-wrapper { padding: 3px; }
+  #message-preview .mail-date { opacity:0.6; font-size:10px; }
+
+/* colorbox */
+#colorbox img {
+  max-width: 100%;
+}