diff --git a/css/sass/_768max.scss b/css/sass/_768max.scss index ebf8788..6e90149 100644 --- a/css/sass/_768max.scss +++ b/css/sass/_768max.scss @@ -139,17 +139,27 @@ footer .navigation { /* @end */ -/* @group ----- Collections/Browse ----- */ +/* @group ----- Collections and Exhibits Browse ----- */ -.collection-meta { +.browse .collection h2, +.browse .exhibit h2 { + float: none; + display: block; +} + +.collection-meta, +.browse .exhibit .description { width: 100%; display: inline; float: none; } -.browse .collection .image { - margin: $spacing-unit $spacing-unit $spacing-unit 10px; +.browse .collection .image, +.browse .exhibit .image { + margin: $spacing-unit $spacing-unit (.5 * $spacing-unit) (.5 * $spacing-unit); float: left; + width: auto; + max-width: 50%; } .browse .collection.record .view-items-link, diff --git a/css/sass/_screen.scss b/css/sass/_screen.scss index d932edd..389d6ec 100644 --- a/css/sass/_screen.scss +++ b/css/sass/_screen.scss @@ -965,13 +965,14 @@ ul.title-list { .collection .image, .exhibit .image { display: block; - box-shadow: -5px -5px 0 -1px #f2f2f2, -5px -5px 0 #ccc, -8px -8px 0 -1px #ddd, -8px -8px 0 #CCC; margin: 0 $spacing-unit $spacing-unit 9px; + @include columns(3); + @include omega; } .collection .image img, .exhibit .image img { - height: (7 * $spacing-unit); + box-shadow: -5px -5px 0 -1px #f2f2f2, -5px -5px 0 #ccc, -8px -8px 0 -1px #ddd, -8px -8px 0 #CCC; } .browse .collection h2, @@ -987,11 +988,11 @@ ul.title-list { @include omega; float: right; text-align: right; - height: (7 * $spacing-unit); img { - height: 100%; - width: auto; + max-width: 100%; + height: auto; + float: none; } } diff --git a/css/style.css b/css/style.css index f8a2e75..194e200 100644 --- a/css/style.css +++ b/css/style.css @@ -1342,12 +1342,33 @@ ul.title-list { .collection .image, .exhibit .image { display: block; - box-shadow: -5px -5px 0 -1px #f2f2f2, -5px -5px 0 #ccc, -8px -8px 0 -1px #ddd, -8px -8px 0 #CCC; - margin: 0 18px 18px 9px; } + margin: 0 18px 18px 9px; + float: left; + display: inline; + margin-left: 10px; + margin-right: 10px; + width: 160px; + margin-right: 0; } + @media only screen and (max-width: 767px) { + .collection .image, + .exhibit .image { + margin: 0; } } + @media only screen and (min-width: 768px) and (max-width: 959px) { + .collection .image, + .exhibit .image { + width: 124px; } } + @media only screen and (max-width: 767px) { + .collection .image, + .exhibit .image { + width: 300px; } } + @media only screen and (min-width: 480px) and (max-width: 767px) { + .collection .image, + .exhibit .image { + width: 420px; } } .collection .image img, .exhibit .image img { - height: 126px; } + box-shadow: -5px -5px 0 -1px #f2f2f2, -5px -5px 0 #ccc, -8px -8px 0 -1px #ddd, -8px -8px 0 #CCC; } .browse .collection h2, .browse .exhibit h2 { @@ -1380,12 +1401,12 @@ ul.title-list { .browse .exhibit .image { margin-right: 0; float: right; - text-align: right; - height: 126px; } + text-align: right; } .browse .collection .image img, .browse .exhibit .image img { - height: 100%; - width: auto; } + max-width: 100%; + height: auto; + float: none; } .collection-meta { float: left; @@ -1780,14 +1801,22 @@ footer { #sort-links { float: left; } /* @end */ - /* @group ----- Collections/Browse ----- */ - .collection-meta { + /* @group ----- Collections and Exhibits Browse ----- */ + .browse .collection h2, + .browse .exhibit h2 { + float: none; + display: block; } + .collection-meta, + .browse .exhibit .description { width: 100%; display: inline; float: none; } - .browse .collection .image { - margin: 18px 18px 18px 10px; - float: left; } + .browse .collection .image, + .browse .exhibit .image { + margin: 18px 18px 9px 9px; + float: left; + width: auto; + max-width: 50%; } .browse .collection.record .view-items-link, .browse .exhibit .view-items-link { clear: both; } diff --git a/package.json b/package.json index a22f111..6419bb3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "berlin", - "version": "2.6.0", + "version": "2.6.1, "description": "\"Abstraction of the Making the History of 1989 theme.\"", "main": "gulpfile.js", "dependencies": {}, diff --git a/theme.ini b/theme.ini index 797dc18..e90977b 100644 --- a/theme.ini +++ b/theme.ini @@ -10,4 +10,4 @@ website = "http://omeka.org" support_link = "http://omeka.org/forums/forum/themes-and-public-display" omeka_minimum_version="2.5" omeka_target_version="2.5" -version="2.6" +version="2.6.1"