Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

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

diff --git a/view/theme/diabook/style-wide.css b/view/theme/diabook/style-wide.css
index d9a975e2c78c6b984cfe676cffa675c6154df3ea..abd10476a6cfcd6121a2beed1636361d144f11e5 100644 (file)
--- a/view/theme/diabook/style-wide.css
+++ b/view/theme/diabook/style-wide.css
@@ -130,7 +130,8 @@
 .icon.pencil   { background-image: url("../../../view/theme/diabook/icons/pencil.png");}
 .icon.recycle  { background-image: url("../../../view/theme/diabook/icons/recycle.png");}
 .icon.remote-link { background-image: url("../../../view/theme/diabook/icons/remote.png");}
-.icon.tagged    { background-image: url("../../../view/theme/diabook/icons/tagged.png");}  
+.icon.tagged    { background-image: url("../../../view/theme/diabook/icons/tagged.png");}
+.icon.file-as { background-image: url("../../../view/theme/diabook/icons/file_as.png");}  
 .star-item.icon.unstarred { background-image: url("../../../view/theme/diabook/icons/unstarred.png");}
 .star-item.icon.starred { background-image: url("../../../view/theme/diabook/icons/starred.png");}
 .icon.link             { background-image: url("../../../view/theme/diabook/icons/link.png");}
@@ -149,7 +150,7 @@
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
                          }     
 .video         { background-image: url("../../../view/theme/diabook/icons/video.png"); 
-                         display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+                         display: block; width: 100%; height: 140px; background-repeat: no-repeat;
                          }
 .audio2        { background-image: url("../../../view/theme/diabook/icons/audio.png"); 
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -168,13 +169,17 @@
                          }
 .edit    {background-image: url("../../../view/theme/diabook/icons/pencil2.png"); 
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
-                         
+.icon.block   {background-image: url("../../../view/theme/diabook/icons/block.png"); 
+                         display: block; width: 16px; height: 16px; background-repeat: no-repeat;}
+.icon.block.dim  {background-image: url("../../../view/theme/diabook/icons/block.png"); 
+                         display: block; width: 16px; height: 16px; background-repeat: no-repeat; opacity: 0.3;}
+.icon.ad_drop  { background-image: url("../../../view/theme/diabook/icons/drop.png");
+                         display: block; margin-left:5px; width: 16px; height: 16px; background-repeat: no-repeat;}                      
                          
 
 
 .article       { background-position: -50px  0px;}
 /*.audio               { background-position: -70px  0px;}*/
-.block                 { background-position: -90px  0px;}
 /*.drop                { background-position: -110px 0px;}*/
 /*.drophide    { background-position: -130px 0px;}*/
 /*.edit                { background-position: -150px 0px;}*/
@@ -413,7 +418,7 @@
 .hide-comments-outer {
   margin-left: 80px;
   margin-bottom: 5px;
-  width: 684px;
+  width: 675px;
   border-bottom: 1px solid #BDCDD4;
   border-top: 1px solid #BDCDD4;
 
@@ -423,7 +428,7 @@
 /* global */
 body {
   font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 15px;
+  font-size: 13px;
   background-color: #ffffff;
   color: #2d2d2d;
   margin: 50px auto auto;
@@ -431,6 +436,10 @@ body {
 
 }
 
+#jappix_mini {
+right: 45px !important;
+}
+
 h4 {
   font-size: 1.1em;
 }
@@ -1082,8 +1091,8 @@ ul.menu-popup .empty {
 aside {
   display: table-cell;
   vertical-align: top;
-  width: 170px;
-  padding: 0px 10px 0px 0px;
+  width: 180px;
+  padding: 0px 5px 0px 0px;
   border-right: 1px solid #D2D2D2;
   float: left;
   /* background: #F1F1F1; */
@@ -1185,6 +1194,9 @@ aside #side-peoplefind-url {
   float: left;
   margin-right: 20px;  
        }
+#login-submit-wrapper{
+  margin-bottom: 15px;
+       }
 /* widget */
 .widget {
   margin-bottom: 2em;
@@ -1261,7 +1273,7 @@ aside #side-peoplefind-url {
 .icon.text_add         { 
                background-image: url("../../../images/icons/16/add.png");
                float: right;
-               opacity: 0.1;
+               opacity: 0.2;
                margin-right: 14px;
                }
 .icon.text_add:hover   { 
@@ -1278,7 +1290,7 @@ transition: all 0.2s ease-in-out;
                }
 .icon.text_edit {
   background-image: url("../../../images/icons/10/edit.png");
-  opacity: 0.1;
+  opacity: 0.2;
   margin-top: 6px;
   float: right;
   height: 10px;
@@ -1353,7 +1365,7 @@ body .pageheader{
        margin-bottom: 10px;
        }
 /* wall item */
-/*marker*/
+
 .tread-wrapper {
   border-bottom: 1px solid #D2D2D2;
   position: relative;
@@ -1362,7 +1374,7 @@ body .pageheader{
   width: 775px;
   padding-top: 10px;
 }
-
+/*marker*/
 .wall-item-decor {
   position: absolute;
   left: 780px;
@@ -1445,7 +1457,7 @@ body .pageheader{
   max-width: 690px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 /*marker*/
 .wall-item-photo-container .wall-item-content {
@@ -1610,13 +1622,13 @@ body .pageheader{
   padding-left: 12px;
 }
 .wall-item-comment-wrapper {
-  margin: 1px 5px 17px 80px;
+  margin: 1px 5px 5px 80px;
 }
 .wall-item-comment-wrapper .comment-edit-photo {
   display: none;
 }
 .wall-item-comment-wrapper textarea {
-  height: 2.0em;
+  height: 1.6em;
   width: 100%;
   font-size: 10px;
   color: #999999;
@@ -1678,14 +1690,14 @@ body .pageheader{
 }
 .tag {
   /*background: url("../../../images/tag_b.png") repeat-x center left;*/
-  color: #3465A4;
+  color: #999;
   padding-left: 3px;
   font-size: 12px;
 }
 .tag a {
   padding-right: 5px;
   /*background: url("../../../images/tag.png") no-repeat center right;*/
-  color: #3465A4;
+  color: #999;
 }
 .wwto {
   position: absolute !important;
@@ -1863,7 +1875,7 @@ body .pageheader{
 #jot #jot-tools li.loading img {
   margin-top: 10px;
 }
-#profile-jot-form #jot-title {
+#profile-jot-form #jot-title, #profile-jot-form #jot-category {
     
         border-radius: 5px 5px 5px 5px;
     font-weight: bold;
@@ -2124,7 +2136,7 @@ body .pageheader{
 ul.tabs {
   list-style-type: none;
   padding-bottom: 10px;
-  font-size: 15px;
+  font-size: 13px;
   width: 805px;
 }
 ul.tabs li {
@@ -2417,6 +2429,9 @@ box-shadow: 1px 1px 5px 0;
 #group-separator,
 #prof-separator { display: none;}
 */
+#prof-members-end{
+       clear: both;
+       }
 
 #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
        margin-bottom: 10px;
@@ -2540,17 +2555,40 @@ a.mail-list-link {
 }
 
 .vevent {
-        border: 1px solid #CCCCCC;
-}
-.vevent .event-description, .vevent .event-location {
+position: relative;
+width: 400px;
+padding: 20px;
+padding-top: 10px;
+margin: 0 0px;
+margin-bottom: 10px;
+background-color: white;
+-webkit-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+-moz-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+box-shadow: 0 0 5px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+}
+.vevent .event-location {
         margin-left: 10px;
         margin-right: 10px;
 }
-.vevent .event-start {
-        margin-left: 10px;
-        margin-right: 10px;
+.vevent .event-description {
+margin-left: 10px;
+margin-right: 10px;
+font-size: 1.1em;
+font-weight: bolder;
+}
+.vevent .event-start, .vevent .event-end {
+
+margin-right: 20px;
+margin-bottom: 2px;
+margin-top: 2px;
+font-size: 0.9em;
+text-align: left;
+}
+.event-start .dtstart, .event-end .dtend {
+float: right;
 }
 
+
 #new-event-link {
         margin-bottom: 10px;
 }
@@ -2563,7 +2601,7 @@ a.mail-list-link {
 }
 
 .event-description:before {
-        content: url('../../../images/calendar.png');
+        content:   url("../../../view/theme/diabook/icons/events2.png") !important;
         margin-right: 15px;
 }
 
@@ -2576,7 +2614,6 @@ a.mail-list-link {
 .event-start .dtstart, .event-end .dtend {
         float: right;
 }
-
 .event-list-date {
         margin-bottom: 10px;
 }