diff --git a/core/modules/views/css/views.module.css b/core/modules/views/css/views.module.css
index 7ca2f49..9fe9191 100644
--- a/core/modules/views/css/views.module.css
+++ b/core/modules/views/css/views.module.css
@@ -22,3 +22,12 @@
.view .progress-disabled {
float: none;
}
+
+.views-view-grid > div{
+ clear:both;
+ width:100%;
+}
+
+.views-view-grid > div > div{
+ float:left;
+}
\ No newline at end of file
diff --git a/core/modules/views/templates/views-view-grid.html.twig b/core/modules/views/templates/views-view-grid.html.twig
index 8b63792..8fbedb2 100644
--- a/core/modules/views/templates/views-view-grid.html.twig
+++ b/core/modules/views/templates/views-view-grid.html.twig
@@ -7,10 +7,6 @@
* - attributes: HTML attributes for the table element.
* - title: The title of this group of rows.
* - rows: A list of rows. Each row contains a list of columns.
- * - row_classes: HTML classes for each row including the row number and first
- * or last.
- * - column_classes: HTML classes for each column including the row number and
- * first or last.
*
* @see template_preprocess_views_view_grid()
*
@@ -20,16 +16,10 @@
{% if title %}
{{ title }}
{% endif %}
-
-
+
{% for row_number, columns in rows %}
-
{% for column_number, item in columns %}
-
{{ item }}
- |
{% endfor %}
-
{% endfor %}
-
-
+
\ No newline at end of file
diff --git a/core/modules/views/views.theme.inc b/core/modules/views/views.theme.inc
index 627e8ed..1c15395 100644
--- a/core/modules/views/views.theme.inc
+++ b/core/modules/views/views.theme.inc
@@ -780,11 +780,12 @@ function template_preprocess_views_view_grid(&$vars) {
$view = $vars['view'];
$options = $view->style_plugin->options;
$handler = $view->style_plugin;
- $default_row_class = isset($options['default_row_class']) ? $options['default_row_class'] : TRUE;
- $row_class_special = isset($options['row_class_special']) ? $options['row_class_special'] : TRUE;
+
+ drupal_add_js('core/modules/views/js/masonry.pkgd.min.js');
$columns = $options['columns'];
$vars['attributes']['class'][] = 'views-view-grid cols-' . $columns;
+ $vars['attributes']['class'][] = 'js-masonry';
$rows = array();
$row_indexes = array();
@@ -847,40 +848,10 @@ function template_preprocess_views_view_grid(&$vars) {
// Apply the row classes.
foreach ($rows as $row_number => $row) {
- $row_classes = array();
- if ($default_row_class) {
- $row_classes['class'][] = 'row-' . ($row_number + 1);
- }
- if ($row_class_special) {
- if ($row_number == 0) {
- $row_classes['class'][] = 'row-first';
- }
- if (count($rows) == ($row_number + 1)) {
- $row_classes['class'][] = 'row-last';
- }
- }
- $row_classes = new Attribute($row_classes);
-
- foreach ($rows[$row_number] as $column_number => $item) {
- $vars['column_classes'][$row_number][$column_number] = array();
- if ($default_row_class) {
- $vars['column_classes'][$row_number][$column_number]['class'][] = 'col-' . ($column_number + 1);
- }
- if ($row_class_special) {
- if ($column_number == 0) {
- $vars['column_classes'][$row_number][$column_number]['class'][] = 'col-first';
- }
- elseif (count($rows[$row_number]) == ($column_number + 1)) {
- $vars['column_classes'][$row_number][$column_number]['class'][] = 'col-last';
- }
- }
- if (isset($row_indexes[$row_number][$column_number]) && $column_class = $view->style_plugin->getRowClass($row_indexes[$row_number][$column_number])) {
- $vars['column_classes'][$row_number][$column_number]['class'][] = $column_class;
- }
- $vars['column_classes'][$row_number][$column_number] = new Attribute($vars['column_classes'][$row_number][$column_number]);
- }
}
$vars['rows'] = $rows;
+ $vars['style'] = 'width: ' . (100/$columns) . '%;';
+
if (!empty($handler->options['summary'])) {
$vars['attributes']['summary'] = $handler->options['summary'];
}