Skip to content

Commit

Permalink
Merge branch '06_10'
Browse files Browse the repository at this point in the history
# Conflicts:
#	sass/maps/style.css.map
  • Loading branch information
mor10 committed Dec 15, 2016
2 parents dbe80c8 + e827034 commit 1595cba
Show file tree
Hide file tree
Showing 3 changed files with 87 additions and 27 deletions.
2 changes: 1 addition & 1 deletion sass/maps/style.css.map

Large diffs are not rendered by default.

82 changes: 57 additions & 25 deletions sass/media/_galleries.scss
Original file line number Diff line number Diff line change
@@ -1,46 +1,78 @@


.gallery {
margin-bottom: 1.5em;
margin: 1.5em 0;
}

.gallery-item {
display: inline-block;
text-align: center;
vertical-align: top;
width: 100%;

.gallery-columns-2 & {
max-width: 50%;
padding: 1em;

img {
display: block;
}

.gallery-columns-3 & {
max-width: 33.33%;

a {
display: inline-block;
border-bottom: none;

&:hover,
&:focus {
border-bottom: none;
box-shadow: none;

img {
border-color: $color__interactive;
}
}

img {
padding: .5em;
margin: 0 auto;
border: 1px solid #fff;
}
}
}

.gallery-columns-4 & {
max-width: 25%;
}
.gallery-columns-2 .gallery-item {
max-width: 50%;
}

.gallery-columns-5 & {
max-width: 20%;
}

.gallery-columns-6 & {
max-width: 16.66%;
}
.gallery-columns-3 .gallery-item {
max-width: 33.33%;
}

.gallery-columns-7 & {
max-width: 14.28%;
}
.gallery-columns-4 .gallery-item {
max-width: 25%;
}

.gallery-columns-8 & {
max-width: 12.5%;
}
.gallery-columns-5 .gallery-item {
max-width: 20%;
}

.gallery-columns-9 & {
max-width: 11.11%;
}
.gallery-columns-6 .gallery-item {
max-width: 16.66%;
}

.gallery-columns-7 .gallery-item {
max-width: 14.28%;
}

.gallery-columns-8 .gallery-item {
max-width: 12.5%;
}

.gallery-columns-9 .gallery-item {
max-width: 11.11%;
}

.gallery-caption {
display: block;
margin: 0;
font-family: $font__sans;
border: none;
}
30 changes: 29 additions & 1 deletion style.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 1595cba

Please sign in to comment.