resolve conflicts and remake

2026-05-24 14:04:09 +03:00 · 2012-09-17 16:43:18 -07:00
parent c52368d3c5 501a2d69e1
commit 917b46a343
5 changed files with 173 additions and 0 deletions
@@ -895,6 +895,18 @@
    padding-right: 10px;
    padding-left: 10px;
  }
+  .media .pull-left,
+  .media .pull-right {
+    display: block;
+    float: none;
+    margin-bottom: 10px;
+  }
+  .media .pull-left {
+    margin-right: 0;
+  }
+  .media .pull-right {
+    margin-left: 0;
+  }
  .modal {
    top: 10px;
    right: 10px;