resolve conflicts and remake

3 files changed, 84 insertions, 0 deletions

diff --git a/less/bootstrap.less b/less/bootstrap.less
index aaa3d8a6f..0a1d2f375 100644
--- a/less/bootstrap.less
+++ b/less/bootstrap.less
@@ -52,6 +52,7 @@
 
 // Components: Misc
 @import "thumbnails.less";
+@import "media.less";
 @import "labels-badges.less";
 @import "progress-bars.less";
 @import "accordion.less";
diff --git a/less/media.less b/less/media.less
new file mode 100644
index 000000000..dbcc212a0
--- /dev/null
+++ b/less/media.less
@@ -0,0 +1,69 @@
+// COMMON STYLES
+// -------------
+
+.media, 
+.media-body {
+  overflow: hidden;
+  *overflow: visible;
+  zoom: 1;
+}
+.media {
+  margin-bottom: 10px;
+}
+.media .media {
+  margin-top: 20px;
+}
+.media .pull-left {
+  margin-right: 10px;
+}
+.media .pull-right {
+  margin-left: 10px;
+}
+.media .media-object {
+  display: block;
+}
+
+// Media list
+.medias {
+  margin-top: 20px;
+  margin-left: 0;
+  list-style-type: none;
+}
+.medias .media {
+  padding-bottom: 10px;
+  border-bottom: 1px solid rgba(0,0,0,.07);
+}
+.medias > .media.last {
+  margin: 0;
+  border-bottom: none;
+}
+.medias > .media .media {
+  margin-bottom: 0;
+  padding-bottom: 0;
+  border-bottom: none;
+} 
+
+// Media box
+.media-box {
+  margin-bottom: 19px;
+  padding: 10px;
+  background-color: #fff;
+  border: 1px solid rgba(0,0,0,.09);
+  .border-radius(4px);
+  .box-shadow(1px 1px 2px rgba(0,0,0,.1));
+}
+
+@media (max-width: 480px) {
+.media .pull-left,
+.media .pull-right  {
+  float: none;
+  display: block;
+  margin-bottom: 10px;
+}
+.media .pull-left {
+  margin-right: 0; // we stack the components so the indent is not needed anymore 
+}
+.media .pull-right {
+  margin-left: 0; // we stack the components so the indent is not needed anymore 
+}
+}
\ No newline at end of file
diff --git a/less/responsive-767px-max.less b/less/responsive-767px-max.less
index 79c7eaa82..322acae21 100644
--- a/less/responsive-767px-max.less
+++ b/less/responsive-767px-max.less
@@ -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;