Skip to content

Commit c5f7fed

Browse files
committed
Merge pull request #172 from PalmerAL/gh-pages
add support for grid lists
2 parents 0f7612c + f8c33c6 commit c5f7fed

File tree

2 files changed

+110
-4
lines changed

2 files changed

+110
-4
lines changed

css/material.css

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -825,7 +825,7 @@ code {
825825
padding: 0;
826826
list-style: none;
827827
}
828-
.list > li {
828+
.list > li, .grid-list > .tile > .tile-footer {
829829
margin: 0;
830830
padding: 0.2em 0.4em;
831831
display: -webkit-flex;
@@ -853,7 +853,7 @@ code {
853853
transform: translate(-50%, -50%);
854854
font-size: 1.5em;
855855
}
856-
.list > li .item-text {
856+
.list > li .item-text, .grid-list > .tile > .tile-footer > .item-text {
857857
font-size: 1em;
858858
display: inline-block;
859859
vertical-align: top;
@@ -867,7 +867,7 @@ code {
867867
overflow: hidden;
868868
text-overflow: ellipsis;
869869
}
870-
.list > li .secondary-text {
870+
.list > li .secondary-text, .grid-list >.tile > .tile-footer .secondary-text {
871871
font-size: 0.875em;
872872
display: block;
873873
white-space: nowrap;
@@ -886,10 +886,37 @@ code {
886886
.list > li .item-action:first-child {
887887
margin-left: 0;
888888
}
889-
.list > li i::before {
889+
.list > li i::before, .grid-list > .tile > .tile-footer i::before {
890890
line-height: inherit !important;
891891
}
892892

893+
/* specific to grid lists */
894+
895+
.grid-list > .tile {
896+
width: 11em;
897+
margin: 0.25em;
898+
display: inline-block;
899+
}
900+
901+
.grid-list > .tile > .tile-image {
902+
height: 11em;
903+
width: 100%;
904+
display: inline-block;
905+
}
906+
907+
.grid-list > .tile > .tile-footer {
908+
padding: 0.5em;
909+
}
910+
911+
.grid-list > .tile > .tile-footer > .item-text {
912+
padding: 0.5em;
913+
}
914+
915+
.grid-list > .tile > .tile-footer .item-action {
916+
font-size: 1.5em;
917+
padding: 0.5em;
918+
}
919+
893920
/* Dividers */
894921
.divider {
895922
margin: 0;

index.html

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1890,6 +1890,85 @@ <h2>Example</h2>
18901890
&lt;/li&gt;
18911891
&lt;/ul&gt;
18921892
</code>
1893+
1894+
<div class="divider"></div>
1895+
<h1>Grid Lists</h1>
1896+
1897+
<div class="grid-list">
1898+
<div class="tile">
1899+
<img class="tile-image" src="demo-files/avatar.jpg"/>
1900+
<div class="tile-footer">
1901+
<span class="item-text">
1902+
Larry Page
1903+
<span class="secondary-text">
1904+
I love your Material design framework !
1905+
</span>
1906+
</span>
1907+
<i class="icon-star item-action"></i>
1908+
</div>
1909+
</div>
1910+
<div class="tile">
1911+
<img class="tile-image" src="demo-files/avatar.jpg"/>
1912+
<div class="tile-footer">
1913+
<span class="item-text">
1914+
Larry Page
1915+
<span class="secondary-text">
1916+
I love your Material design framework !
1917+
</span>
1918+
</span>
1919+
<i class="icon-star item-action"></i>
1920+
</div>
1921+
</div>
1922+
<div class="tile">
1923+
<img class="tile-image" src="demo-files/avatar.jpg"/>
1924+
<div class="tile-footer">
1925+
<span class="item-text">
1926+
Larry Page
1927+
<span class="secondary-text">
1928+
I love your Material design framework !
1929+
</span>
1930+
</span>
1931+
<i class="icon-star item-action"></i>
1932+
</div>
1933+
</div>
1934+
<div class="tile">
1935+
<img class="tile-image" src="demo-files/avatar.jpg"/>
1936+
<div class="tile-footer">
1937+
<span class="item-text">
1938+
Larry Page
1939+
<span class="secondary-text">
1940+
I love your Material design framework !
1941+
</span>
1942+
</span>
1943+
<i class="icon-star item-action"></i>
1944+
</div>
1945+
</div>
1946+
</div>
1947+
1948+
<div class="divider"></div>
1949+
<h2>Example</h2>
1950+
<code class="prettyprint">
1951+
&lt;div class=&quot;grid-list&quot;&gt;
1952+
&lt;div class=&quot;tile&quot;&gt;
1953+
&lt;img class=&quot;tile-image&quot; src=&quot;demo-files/avatar.jpg&quot;/&gt;
1954+
&lt;div class=&quot;tile-footer&quot;&gt;
1955+
&lt;span class=&quot;item-text&quot;&gt;
1956+
Larry Page
1957+
&lt;span class=&quot;secondary-text&quot;&gt;
1958+
I love your Material design framework !
1959+
&lt;/span&gt;
1960+
&lt;/span&gt;
1961+
&lt;i class=&quot;icon-star item-action&quot;&gt;&lt;/i&gt;
1962+
&lt;/div&gt;
1963+
&lt;/div&gt;
1964+
&lt;/div&gt;
1965+
</code>
1966+
<p>
1967+
If the tile image does not fit the size of the tile background, you will want to use background images instead to avoid stretching the image.
1968+
</p>
1969+
<code class="prettyprint">
1970+
&lt;div class=&quot;tile-image&quot; style=&quot;background-image:url(demo-files/avatar.jpg)&quot;&gt;&lt;/div&gt;
1971+
</code>
18931972
</div>
18941973

18951974
<div class="navigation-section" id="menus">

0 commit comments

Comments
 (0)