From 373be03c80360646d11d682688f732dcd26a9602 Mon Sep 17 00:00:00 2001 From: Pablo Vazquez Date: Thu, 23 Mar 2017 18:53:24 +0100 Subject: [PATCH] Groups: browse type list tweaks to match browse as icons --- src/styles/_config.sass | 2 +- src/styles/_project.sass | 21 +++++++----- .../nodes/custom/group/view_embed.jade | 33 ++++++++++++------- 3 files changed, 35 insertions(+), 21 deletions(-) diff --git a/src/styles/_config.sass b/src/styles/_config.sass index ab14b408..08be4178 100644 --- a/src/styles/_config.sass +++ b/src/styles/_config.sass @@ -113,7 +113,7 @@ $node-type-group: #c3a280 $node-type-post: #647bce $list-node-children-item-width: 200px -$list-node-children-item-width_list: 48px +$list-node-children-item-width_list: 60px $list-node-children-item-width_square: 160px $z-index-base: 13 diff --git a/src/styles/_project.sass b/src/styles/_project.sass index b167c7b2..42595460 100644 --- a/src/styles/_project.sass +++ b/src/styles/_project.sass @@ -1864,6 +1864,12 @@ section.node-children +clearfix clear: none + .cloud-logo + font-size: 2em + color: darken($color-background, 60%) + +position-center-translate + left: $list-node-children-item-width_list / 1.3 + &:hover opacity: 1 text-decoration: none @@ -1886,8 +1892,9 @@ section.node-children min-width: $list-node-children-item-width_list * 1.69 max-width: $list-node-children-item-width_list * 1.69 height: $list-node-children-item-width_list - border-radius: 3px - background: $color-background + background-color: darken($color-background, 55%) + box-shadow: inset 0 0 1px darken($color-background, 65%) + img height: $list-node-children-item-width_list width: auto @@ -1896,11 +1903,6 @@ section.node-children font-size: 1.2em transition: none - .dark - text-shadow: none - color: $color-text-dark-secondary - font-size: 1.3em - .list-node-children-item-ribbon +ribbon right: -30px @@ -1917,8 +1919,9 @@ section.node-children top: 0 left: 15px font: - size: 1.2em - color: darken($color-primary, 15%) + size: 1.15em + color: $color-text-dark-primary + text-shadow: none background-color: initial width: initial diff --git a/src/templates/nodes/custom/group/view_embed.jade b/src/templates/nodes/custom/group/view_embed.jade index 3a432181..cf06be31 100644 --- a/src/templates/nodes/custom/group/view_embed.jade +++ b/src/templates/nodes/custom/group/view_embed.jade @@ -51,6 +51,9 @@ | {% if child.picture %} img( src="{{ child.picture.thumbnail('t', api=api)}} ") + | {% else %} + .cloud-logo + i.pi-blender-cloud | {% endif %} | {% if child.permissions.world %} @@ -58,6 +61,17 @@ span free | {% endif %} + .list-node-children-item-thumbnail-icon + | {% if child.properties.content_type and child.properties.content_type == 'video' %} + i.pi-play + | {% elif child.properties.content_type and child.properties.content_type == 'image' %} + i.pi-image + | {% elif child.properties.content_type and child.properties.content_type == 'file' %} + i.pi-file-archive + | {% else %} + i.pi-folder + | {% endif %} + .list-node-children-item-name {{ child.name }} .list-node-children-item-meta @@ -65,17 +79,14 @@ span.status {{ child.properties.status }} | {% endif %} - | {% if child.properties.content_type == 'video' %} - span Video · - | {% elif child.properties.content_type == 'image' %} - span Image · - | {% elif child.properties.content_type == 'file' %} - span File · - | {% else %} - | {% if child.picture %} - span Folder · - | {% endif %} - | {% endif %} + span.type + | {% if child.properties.content_type %} + | {{ child.properties.content_type | undertitle }} · + | {% elif child.node_type == 'group' %} + | Folder · + | {% else %} + | {{ child.node_type | undertitle }} · + | {% endif %} span(title="Created on {{ child._created }}") {{ child._created | pretty_date }}