resolve conflicts and remake

2026-06-14 18:42:30 +03:00 · 2012-09-17 16:43:18 -07:00
parent c52368d3c5 501a2d69e1
commit 917b46a343
5 changed files with 173 additions and 0 deletions
@@ -155,6 +155,20 @@
    }
  }

+  // Medias
+  .media .pull-left,
+  .media .pull-right {
+    float: none;
+    display: block;
+    margin-bottom: 10px;
+  }
+  .media .pull-left {
+    margin-right: 0;
+  }
+  .media .pull-right {
+    margin-left: 0;
+  }
+
  // Modals
  .modal {
    top:   10px;