From: rabuzarus <trebor@central-unit>
Date: Sun, 25 Oct 2015 15:57:04 +0000 (+0100)
Subject: Merge develop into manage
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4c263aa4ac89aa935d7305856c8a919c7fefcf71;p=friendica.git

Merge develop into manage

Conflicts:
	view/global.css
---

4c263aa4ac89aa935d7305856c8a919c7fefcf71
diff --cc view/global.css
index d1c07d60aa,55f44ee51b..477f778d9a
--- a/view/global.css
+++ b/view/global.css
@@@ -213,47 -213,19 +213,63 @@@ a 
    border: 0;
  }
  
 +.itentity-match-wrapper {
 +  float: left;
 +  padding: 10px;
 +  width: 120px;
 +  height: 140px;
 +  margin-bottom: 20px;
 +}
 +
 +.identity-match-photo {
 +  float: left;
 +  text-align: center;
 +  width: 120px;
 +}
 +
 +.identity-match-name {
 +  text-align: center;
 +}
 +
 +.identity-match-details {
 +  float: left;
 +  text-align: center;
 +  width: 120px;
 +  overflow: hidden;
 +  font-size: 10px;
 +  font-weight: 500;
 +  color: #999999;
 +}
 +
 +.identity-match-break, .identity-match-end {
 +  clear: both;
 +}
 +
 +.identity-match-photo button {
 +  border: none;
 +  padding: 0;
 +  margin: 0;
 +  background: none;
 +  height: 80px;
 +  width: 80px;
 +}
 +
 +.selected-identity img {
 +  border: 2px solid #ff0000;
- }
++}
+ /* poke */
+ #poke-desc {
+ 	margin: 5px 0 10px;
+ }
+ 
+ #poke-wrapper  {
+ 	padding: 10px 0 0px;
+ }
+ 
+ #poke-recipient, #poke-action, #poke-privacy-settings {
+ 	margin: 10px 0 30px;
+ }
+ 
+ #poke-recip-label, #poke-action-label, #prvmail-message-label {
+ 	margin: 10px 0 10px;
+ }