From 19d7e5b0daec2b1217f157e14521ceea770d2542 Mon Sep 17 00:00:00 2001
From: connors
Date: Sun, 9 Feb 2014 17:06:29 -0800
Subject: [PATCH] add media in table views
---
components.html | 78 +++++++++++++++++++++++++++++++++++++++
dist/ratchet.css | 25 +++++++------
lib/sass/table-views.scss | 31 ++++++++--------
3 files changed, 106 insertions(+), 28 deletions(-)
diff --git a/components.html b/components.html
index 0eddb26..b60c322 100644
--- a/components.html
+++ b/components.html
@@ -499,6 +499,84 @@ quis nostrud exercitation ullamco.
+
+ Table view with media
+
+
+
+{% highlight html %}
+
+{% endhighlight %}
+
+
+
Table view with buttons
diff --git a/dist/ratchet.css b/dist/ratchet.css
index 0a44cec..6f694ed 100644
--- a/dist/ratchet.css
+++ b/dist/ratchet.css
@@ -684,7 +684,8 @@ input[type="button"] {
}
.table-view .table-view-cell {
position: relative;
- padding: 11px 15px 12px 15px;
+ overflow: hidden;
+ padding: 11px 15px;
border-bottom: 1px solid #dddddd;
}
.table-view .table-view-cell:last-child {
@@ -693,8 +694,9 @@ input[type="button"] {
.table-view .table-view-cell > a:not(.btn) {
position: relative;
display: block;
+ overflow: hidden;
padding: inherit;
- margin: -11px -15px -12px -15px;
+ margin: -11px -15px;
color: inherit;
}
.table-view .table-view-cell > a:not(.btn):active {
@@ -723,18 +725,17 @@ input[type="button"] {
border-radius: 0 0 6px 6px;
}
-.table-view-indented .table-view-cell {
- padding-left: 59px;
- background-position-x: 59px;
+.table-view .media,
+.table-view .media-body {
+ overflow: hidden;
+ zoom: 1;
}
-.table-view-indented .table-view-cell > a:not(.btn) {
- margin-left: -59px;
+
+.table-view .media-object.pull-left {
+ margin-right: 10px;
}
-.table-view-indented .table-view-cell > .pull-left,
-.table-view-indented .table-view-cell > a:not(.btn) .pull-left {
- position: absolute;
- left: 15px;
- z-index: 1;
+.table-view .media-object.pull-right {
+ margin-left: 10px;
}
.table-view .btn {
diff --git a/lib/sass/table-views.scss b/lib/sass/table-views.scss
index 143f26e..d099547 100644
--- a/lib/sass/table-views.scss
+++ b/lib/sass/table-views.scss
@@ -11,7 +11,8 @@
// Pad each table view item and add dividers
.table-view-cell {
position: relative;
- padding: 11px 15px 12px 15px;
+ overflow: hidden;
+ padding: 11px 15px;
border-bottom: $border-default;
// Remove the border from the last table view item
@@ -22,8 +23,9 @@
> a:not(.btn) {
position: relative;
display: block;
+ overflow: hidden;
padding: inherit;
- margin: -11px -15px -12px -15px; // Make the entire list item tappable.
+ margin: -11px -15px; // Make the entire list item tappable.
color: inherit;
&:active {
@@ -64,26 +66,23 @@
}
-// Indented table views
+// Table-views with media (images,avatars, icons)
// --------------------------------------------------
-.table-view-indented .table-view-cell {
- padding-left: 59px;
- background-position-x: 59px; // Make room for your left aligned media/icons.
-
- > a:not(.btn) {
- margin-left: -59px;
+.table-view .media,
+.table-view .media-body {
+ overflow: hidden;
+ zoom: 1;
+}
+.table-view .media-object {
+ &.pull-left {
+ margin-right: 10px;
}
-
- > .pull-left,
- > a:not(.btn) .pull-left {
- position: absolute;
- left: 15px;
- z-index: 1;
+ &.pull-right {
+ margin-left: 10px;
}
}
-
// Table-views with buttons
// --------------------------------------------------