Merge branch 'rewrites/dbm_is_result' into develop

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

diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css
index 8ade8e2aa561e46a3706779819e02aa48d3ec346..cbb850c130afadabf98f70ff17455936bc2abee1 100644 (file)
--- a/view/theme/vier/style.css
+++ b/view/theme/vier/style.css
@@ -24,69 +24,69 @@ 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: 1px solid #000000; margin: 5px 0px;}
@@ -641,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;
@@ -912,6 +912,10 @@ acpopup-mce {
   color: #2d2d2d;
   max-height: 150px;
 }
+nav .acpopup {
+  top: 31px !important;
+  margin-left: -23px
+}
 .acpopupitem {
   color: #2d2d2d;
   padding: 4px;
@@ -931,8 +935,19 @@ acpopup-mce {
   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;
@@ -1411,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;
@@ -1489,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;
@@ -1500,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;
@@ -1556,6 +1583,11 @@ section.minimal {
   margin-right: 1em;
   cursor: pointer;
 }
+.wall-item-container .wall-item-actions-social a.active,
+.wall-item-container .wall-item-actions-isevent a.active {
+       color: #36C;
+}
+
 .wall-item-container .wall-item-actions-tools {
   float: right;
   width: 80px;
@@ -1611,7 +1643,7 @@ section.minimal {
   max-width: calc(100% - 1px);
 }
 
-.children .wall-item-comment-wrapper textarea, 
+.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,
@@ -2363,6 +2395,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;
@@ -2971,10 +3008,6 @@ a.mail-list-link {
   list-style-type: none;
 }
 
-#contact-edit-settings {
-  margin-top: 10px;
-}
-
 a.btn#contact-edit-actions-button {
   cursor: pointer;
   border-radius: 3px;
@@ -3278,9 +3311,14 @@ img.photo-top-photo {
 }
 
 /* upload/select popup */
-.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; }
+  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%;
+}