From 06d48d39758dea9feb159820401ddf8c08390b50 Mon Sep 17 00:00:00 2001
From: Igor Zhukov <igor.beatle@gmail.com>
Date: Sat, 15 Feb 2014 10:26:49 +0400
Subject: [PATCH] merged with master

---
 css/app.css                  | 2 +-
 partials/chat_modal.html     | 2 +-
 partials/contacts_modal.html | 2 +-
 partials/error_modal.html    | 2 +-
 partials/settings_modal.html | 2 +-
 partials/user_modal.html     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/css/app.css b/css/app.css
index 51d97333..adc2fefc 100644
--- a/css/app.css
+++ b/css/app.css
@@ -1909,7 +1909,7 @@ img.img_fullsize {
 
 @media (min-height: 768px) {
   .user_modal_window .modal-dialog {
-    padding-top: 150px;
+    margin-top: 150px;
   }
 }
 
diff --git a/partials/chat_modal.html b/partials/chat_modal.html
index b3c778d6..e2454a23 100644
--- a/partials/chat_modal.html
+++ b/partials/chat_modal.html
@@ -1,7 +1,7 @@
 <div class="chat_modal_wrap">
 
   <div class="modal-header">
-    <a class="modal-close-link visible-xs" ng-click="$close()">Close</a>
+    <a class="modal-close-link visible-xs visible-sm" ng-click="$close()">Close</a>
     <h4 class="modal-title">Group Info</h4>
   </div>
 
diff --git a/partials/contacts_modal.html b/partials/contacts_modal.html
index 2de41f67..c2d629e4 100644
--- a/partials/contacts_modal.html
+++ b/partials/contacts_modal.html
@@ -1,7 +1,7 @@
 <div class="contacts_modal_wrap">
 
   <div class="modal-header">
-    <a class="modal-close-link visible-xs" ng-click="$close()">Close</a>
+    <a class="modal-close-link visible-xs visible-sm" ng-click="$close()">Close</a>
     <h4 class="modal-title">Contacts</h4>
   </div>
 
diff --git a/partials/error_modal.html b/partials/error_modal.html
index 50e2ac2e..26a0b5c2 100644
--- a/partials/error_modal.html
+++ b/partials/error_modal.html
@@ -1,7 +1,7 @@
 <div class="error_modal_wrap">
 
   <div class="modal-header">
-    <a class="modal-close-link" ng-click="$close()">Close</a>
+    <a class="modal-close-link visible-xs visible-sm" ng-click="$close()">Close</a>
     <h4 class="modal-title">{{title}}</h4>
   </div>
 
diff --git a/partials/settings_modal.html b/partials/settings_modal.html
index 8ab2eb9a..d37e894b 100644
--- a/partials/settings_modal.html
+++ b/partials/settings_modal.html
@@ -1,7 +1,7 @@
 <div class="settings_modal_wrap">
 
   <div class="modal-header">
-    <a class="modal-close-link visible-xs" ng-click="$close()">Close</a>
+    <a class="modal-close-link visible-xs visible-sm" ng-click="$close()">Close</a>
     <h4 class="modal-title">Settings</h4>
   </div>
 
diff --git a/partials/user_modal.html b/partials/user_modal.html
index c5991f7a..8dc0e3b9 100644
--- a/partials/user_modal.html
+++ b/partials/user_modal.html
@@ -1,7 +1,7 @@
 <div class="user_modal_wrap">
 
   <div class="modal-header">
-    <a class="modal-close-link visible-xs" ng-click="$close()">Close</a>
+    <a class="modal-close-link visible-xs visible-sm" ng-click="$close()">Close</a>
     <h4 class="modal-title">Info</h4>
   </div>