]> git.mxchange.org Git - friendica.git/commitdiff
Merge pull request #2688 from rabuzarus/2607-drop
authorTobias Diekershoff <tobias.diekershoff@gmx.net>
Tue, 26 Jul 2016 08:45:52 +0000 (10:45 +0200)
committerGitHub <noreply@github.com>
Tue, 26 Jul 2016 08:45:52 +0000 (10:45 +0200)
frio: provide confirm modal

1  2 
mod/contacts.php
view/theme/frio/css/style.css

Simple merge
index ed264ac2d567a5c73c12d6f83282cd919ac094f8,30b2221e3bbc1976468894c42e23dded4ba9b202..99f32a588127fef994aa0f3ecaa17bdb1a12202f
@@@ -1908,29 -1908,15 +1908,37 @@@ ul li:hover .contact-wrapper a.contact-
  #directory-search-wrapper{
      padding: 10px 0;
  }
+ #contact-drop-confirm .contact-actions,
+ #contact-drop-confirm .contact-photo-overlay,
+ #contact-drop-confirm .contact-photo-menu {
+     display: none;
+ }
+ #contact-drop-confirm #confirm-form {
+     margin-top: 20px;
+ }
  
 +/* contact-edit */
 +#contact-edit-actions {
 +    position: absolute;
 +}
 +#contact-edit-status-wrapper {
 +    border: none;
 +    background-color: #E1F5FE;
 +    margin: 15px -15px;
 +}
 +#contact-edit-tools {
 +    margin-left: -15px;
 +    margin-right: -15px;
 +}
 +#contact-edit-tools > .panel {
 +    padding-left: 15px;
 +    padding-right: 15px;
 +}
 +#contact-edit-settings {
 +    display: block;
 +    margin: 0;
 +}
 +
  /* directory page */
  #directory-search-heading {
      padding-top: 10px;