This commit is contained in:
Tobias Diekershoff 2013-02-23 08:25:12 +01:00
commit c35b21eb18
9 changed files with 11448 additions and 11395 deletions

View file

@ -12,7 +12,7 @@ require_once('library/Mobile_Detect/Mobile_Detect.php');
require_once('include/features.php'); require_once('include/features.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '3.1.1618' ); define ( 'FRIENDICA_VERSION', '3.1.1619' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1163 ); define ( 'DB_UPDATE_VERSION', 1163 );
define ( 'EOL', "<br />\r\n" ); define ( 'EOL', "<br />\r\n" );

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -648,26 +648,34 @@ ul.menu-popup .toolbar a:hover {
background-color: #ffffff; background-color: #ffffff;
} }
/* autocomplete popup */ /* autocomplete popup */
.autocomplete,
.acpopup { .acpopup {
max-height: 150px; max-height: 150px;
background-color: #ffffff; background-color: #ffffff;
color: #2d2d2d; color: #2d2d2d;
border: 1px solid #MenuBorder; border: 1px solid #364e59;
overflow: auto; overflow: auto;
z-index: 100000; z-index: 100000;
-webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
-moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
} }
.autocomplete > div,
.acpopupitem { .acpopupitem {
color: #2d2d2d; color: #2d2d2d;
padding: 4px; padding: 4px;
clear: left; clear: left;
overflow: auto;
height: auto;
} }
.autocomplete > div img,
.acpopupitem img { .acpopupitem img {
float: left; float: left;
margin-right: 4px; margin-right: 4px;
width: 16px !important;
height: 16px !important;
} }
.autocomplete > div.selected,
.acpopupitem.selected { .acpopupitem.selected {
background-color: #bdcdd4; background-color: #bdcdd4;
} }
@ -983,7 +991,7 @@ section {
word-wrap: break-word; word-wrap: break-word;
} }
.wall-item-container .wall-item-content img { .wall-item-container .wall-item-content img {
max-width: 710px; max-width: 700px;
} }
.wall-item-container .wall-item-links, .wall-item-container .wall-item-links,
.wall-item-container .wall-item-actions { .wall-item-container .wall-item-actions {

View file

@ -648,26 +648,34 @@ ul.menu-popup .toolbar a:hover {
background-color: #ffffff; background-color: #ffffff;
} }
/* autocomplete popup */ /* autocomplete popup */
.autocomplete,
.acpopup { .acpopup {
max-height: 150px; max-height: 150px;
background-color: #ffffff; background-color: #ffffff;
color: #2d2d2d; color: #2d2d2d;
border: 1px solid #MenuBorder; border: 1px solid #364e59;
overflow: auto; overflow: auto;
z-index: 100000; z-index: 100000;
-webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
-moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
} }
.autocomplete > div,
.acpopupitem { .acpopupitem {
color: #2d2d2d; color: #2d2d2d;
padding: 4px; padding: 4px;
clear: left; clear: left;
overflow: auto;
height: auto;
} }
.autocomplete > div img,
.acpopupitem img { .acpopupitem img {
float: left; float: left;
margin-right: 4px; margin-right: 4px;
width: 16px !important;
height: 16px !important;
} }
.autocomplete > div.selected,
.acpopupitem.selected { .acpopupitem.selected {
background-color: #ccff42; background-color: #ccff42;
} }
@ -983,7 +991,7 @@ section {
word-wrap: break-word; word-wrap: break-word;
} }
.wall-item-container .wall-item-content img { .wall-item-container .wall-item-content img {
max-width: 710px; max-width: 700px;
} }
.wall-item-container .wall-item-links, .wall-item-container .wall-item-links,
.wall-item-container .wall-item-actions { .wall-item-container .wall-item-actions {

View file

@ -648,26 +648,34 @@ ul.menu-popup .toolbar a:hover {
background-color: #ffffff; background-color: #ffffff;
} }
/* autocomplete popup */ /* autocomplete popup */
.autocomplete,
.acpopup { .acpopup {
max-height: 150px; max-height: 150px;
background-color: #ffffff; background-color: #ffffff;
color: #2d2d2d; color: #2d2d2d;
border: 1px solid #MenuBorder; border: 1px solid #364e59;
overflow: auto; overflow: auto;
z-index: 100000; z-index: 100000;
-webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
-moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
} }
.autocomplete > div,
.acpopupitem { .acpopupitem {
color: #2d2d2d; color: #2d2d2d;
padding: 4px; padding: 4px;
clear: left; clear: left;
overflow: auto;
height: auto;
} }
.autocomplete > div img,
.acpopupitem img { .acpopupitem img {
float: left; float: left;
margin-right: 4px; margin-right: 4px;
width: 16px !important;
height: 16px !important;
} }
.autocomplete > div.selected,
.acpopupitem.selected { .acpopupitem.selected {
background-color: #c0a3c7; background-color: #c0a3c7;
} }
@ -983,7 +991,7 @@ section {
word-wrap: break-word; word-wrap: break-word;
} }
.wall-item-container .wall-item-content img { .wall-item-container .wall-item-content img {
max-width: 710px; max-width: 700px;
} }
.wall-item-container .wall-item-links, .wall-item-container .wall-item-links,
.wall-item-container .wall-item-actions { .wall-item-container .wall-item-actions {

View file

@ -7,7 +7,12 @@
$parent $parent
<div id="prvmail-to-label">$to</div> <div id="prvmail-to-label">$to</div>
{{ if $showinputs }}
<input type="text" id="recip" name="messagerecip" value="$prefill" maxlength="255" size="64" tabindex="10" />
<input type="hidden" id="recip-complete" name="messageto" value="$preid">
{{ else }}
$select $select
{{ endif }}
<div id="prvmail-subject-label">$subject</div> <div id="prvmail-subject-label">$subject</div>
<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="$subjtxt" $readonly tabindex="11" /> <input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="$subjtxt" $readonly tabindex="11" />

View file

@ -254,21 +254,27 @@ ul.menu-popup {
} }
/* autocomplete popup */ /* autocomplete popup */
.autocomplete,
.acpopup { .acpopup {
max-height:150px; max-height:150px;
background-color:@MenuBg; background-color:@MenuBg;
color: @Menu; color: @Menu;
border:1px solid #MenuBorder; border:1px solid @MenuBorder;
overflow:auto; overflow:auto;
z-index:100000; z-index:100000;
.shadow(); .shadow();
} }
.autocomplete > div,
.acpopupitem { .acpopupitem {
color: @MenuItem; padding: 4px; color: @MenuItem; padding: 4px;
clear:left; clear:left;
overflow: auto;
height: auto;
img { img {
float: left; float: left;
margin-right: 4px; margin-right: 4px;
width: 16px !important;
height: 16px !important;
} }
&.selected{ &.selected{
background-color: @MenuItemHoverBg; background-color: @MenuItemHoverBg;
@ -484,7 +490,7 @@ section {
max-width: 720px; max-width: 720px;
word-wrap: break-word; word-wrap: break-word;
} }
.wall-item-content img { max-width: 710px; } .wall-item-content img { max-width: 700px; }
.wall-item-links, .wall-item-links,
.wall-item-actions { .wall-item-actions {
display: table-cell; display: table-cell;