Skip to content

Commit

Permalink
Merge pull request #530 from DFurnes/gallery-heading
Browse files Browse the repository at this point in the history
Gallery heading
  • Loading branch information
DFurnes committed Oct 20, 2015
2 parents 29a36c0 + 6aab4b7 commit ebc8b51
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 5 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"grunt-express-server": "^0.4.19",
"grunt-modernizr": "metaloha/grunt-modernizr#d6657bf302bd9288e25a513197fb0e30c64ce677",
"grunt-postcss": "^0.2.0",
"grunt-sass": "^0.18.0",
"grunt-sass": "^1.0.0",
"grunt-sasslint": "0.0.5",
"grunt-webpack": "^1.0.8",
"highlight.js": "^8.4.0",
Expand Down
25 changes: 21 additions & 4 deletions scss/_modules/_gallery.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,17 @@
//
// Styleguide Gallery
.gallery {
@include clearfix;
list-style-type: none;
margin: 0;
padding: 0;

@include clearfix();
// Optional gallery heading container
.gallery__heading {
@include span(100%);
}

// Gallery items
> li {
margin: gutter() 0;
padding: 0 gutter();
Expand All @@ -20,10 +25,14 @@
// Gallery - Quartet
//
// A "quartet" gallery shows four items per row. Galleries can contain items of
// any type but work particularly well with __Figures__ and __Tiles__.
// any type but work particularly well with __Figures__ and __Tiles__. May optionally
// include a heading within `.gallery__heading`.
//
// Markup:
// <ul class="gallery -quartet">
// <div class="gallery__heading">
// <h2>Gallery Heading</h2>
// </div>
// <li>
// <article class="tile">
// <a class="wrapper" href="#">
Expand Down Expand Up @@ -82,7 +91,8 @@
// Gallery - Triad
//
// A "triad" gallery shows three items per row. Galleries can contain items of
// any type but work particularly well with __Figures__ and __Tiles__.
// any type but work particularly well with __Figures__ and __Tiles__. May optionally
// include a heading within `.gallery__heading`.
//
// .-aligned - Tiles with image flushed to top and minimum
// height to force content below to line up with adjacent tiles
Expand All @@ -91,6 +101,9 @@
//
// Markup:
// <ul class="gallery -triad {{modifier_class}}">
// <div class="gallery__heading">
// <h2>Gallery Heading</h2>
// </div>
// <li>
// <div class="figure">
// <div class="figure__media">
Expand Down Expand Up @@ -158,10 +171,14 @@
// Gallery - Duo
//
// A "duo" gallery shows two items per row. Galleries can contain items of
// any type but work particularly well with __Figures__ and __Tiles__.
// any type but work particularly well with __Figures__ and __Tiles__. May optionally
// include a heading within `.gallery__heading`.
//
// Markup:
// <ul class="gallery -duo">
// <div class="gallery__heading">
// <h2>Gallery Heading</h2>
// </div>
// <li>
// <article class="figure -left">
// <div class="figure__media">
Expand Down

0 comments on commit ebc8b51

Please sign in to comment.