Cleanup styling. Use bootstrap classes instead
This commit is contained in:
@@ -33,7 +33,7 @@
|
|||||||
|
|
||||||
section.dashboard-main,
|
section.dashboard-main,
|
||||||
section.dashboard-secondary
|
section.dashboard-secondary
|
||||||
h4
|
.section-title
|
||||||
padding-bottom: 5px
|
padding-bottom: 5px
|
||||||
margin-bottom: 20px
|
margin-bottom: 20px
|
||||||
position: relative
|
position: relative
|
||||||
@@ -139,11 +139,8 @@
|
|||||||
border-bottom: thin solid $color-background-dark
|
border-bottom: thin solid $color-background-dark
|
||||||
|
|
||||||
ul.activity-stream__list
|
ul.activity-stream__list
|
||||||
list-style: none
|
|
||||||
margin: 0
|
|
||||||
padding: 0
|
|
||||||
|
|
||||||
$activity-stream-thumbnail-size: 110px
|
$activity-stream-thumbnail-size: 110px
|
||||||
|
|
||||||
> li
|
> li
|
||||||
position: relative
|
position: relative
|
||||||
display: flex
|
display: flex
|
||||||
@@ -180,17 +177,6 @@
|
|||||||
transition: font-size 100ms ease-in-out
|
transition: font-size 100ms ease-in-out
|
||||||
|
|
||||||
&.comment
|
&.comment
|
||||||
.activity-stream__list-thumbnail
|
|
||||||
background: transparent
|
|
||||||
color: $node-type-comment
|
|
||||||
font-size: 1.2em
|
|
||||||
box-shadow: none
|
|
||||||
|
|
||||||
i
|
|
||||||
+position-center-translate
|
|
||||||
left: 22px
|
|
||||||
top: 19px
|
|
||||||
|
|
||||||
.activity-stream__list-details
|
.activity-stream__list-details
|
||||||
padding: 0
|
padding: 0
|
||||||
.title
|
.title
|
||||||
@@ -300,7 +286,6 @@
|
|||||||
overflow: hidden
|
overflow: hidden
|
||||||
position: relative
|
position: relative
|
||||||
max-width: 100%
|
max-width: 100%
|
||||||
margin-right: auto
|
|
||||||
padding: 10px 0
|
padding: 10px 0
|
||||||
|
|
||||||
+media-xs
|
+media-xs
|
||||||
@@ -310,18 +295,14 @@
|
|||||||
+ribbon
|
+ribbon
|
||||||
right: -47px
|
right: -47px
|
||||||
top: 5px
|
top: 5px
|
||||||
font:
|
font-size: 12px
|
||||||
size: 12px
|
|
||||||
weight: 500
|
|
||||||
|
|
||||||
span
|
span
|
||||||
padding: 1px 50px
|
padding: 1px 50px
|
||||||
|
|
||||||
.title
|
.title
|
||||||
display: inline-block
|
|
||||||
padding: 0 10px
|
padding: 0 10px
|
||||||
color: $color-text-dark
|
color: $color-text-dark
|
||||||
font-size: 1.1em
|
|
||||||
|
|
||||||
span
|
span
|
||||||
@include badge(hsl(hue($color-success), 60%, 45%), 3px)
|
@include badge(hsl(hue($color-success), 60%, 45%), 3px)
|
||||||
@@ -653,10 +634,6 @@ section.announcement
|
|||||||
|
|
||||||
.title
|
.title
|
||||||
padding-bottom: 10px
|
padding-bottom: 10px
|
||||||
font:
|
|
||||||
family: $font-body
|
|
||||||
size: 1.4em
|
|
||||||
weight: 300
|
|
||||||
|
|
||||||
+media-xs
|
+media-xs
|
||||||
font-size: 1.4em
|
font-size: 1.4em
|
||||||
|
@@ -334,9 +334,7 @@ section.pricing
|
|||||||
+button($color-primary, 3px, true)
|
+button($color-primary, 3px, true)
|
||||||
|
|
||||||
h3
|
h3
|
||||||
font:
|
font-size: 1.8em
|
||||||
size: 1.8em
|
|
||||||
family: $font-body
|
|
||||||
padding-bottom: 0
|
padding-bottom: 0
|
||||||
margin: 25px 0 0 10px
|
margin: 25px 0 0 10px
|
||||||
|
|
||||||
|
@@ -57,11 +57,11 @@ nav.navbar
|
|||||||
|
|
||||||
.node-details-container
|
.node-details-container
|
||||||
max-width: 620px
|
max-width: 620px
|
||||||
font-family: $font-body
|
|
||||||
font-size: 1.3em
|
font-size: 1.3em
|
||||||
line-height: 1.5em
|
line-height: 1.5em
|
||||||
margin: 0 auto 40px auto
|
margin: 0 auto 40px auto
|
||||||
padding-bottom: 40px
|
padding-bottom: 40px
|
||||||
|
|
||||||
+media-xs
|
+media-xs
|
||||||
padding-left: 10px
|
padding-left: 10px
|
||||||
padding-right: 10px
|
padding-right: 10px
|
||||||
|
@@ -51,7 +51,7 @@ meta(name="twitter:image", content="{% if main_project.picture_header %}{{ main_
|
|||||||
| {{ navigation_tabs(title) }}
|
| {{ navigation_tabs(title) }}
|
||||||
|
|
||||||
section.dashboard-in-production
|
section.dashboard-in-production
|
||||||
h4 In Production
|
h6.section-title In Production
|
||||||
span.section-lead.
|
span.section-lead.
|
||||||
Check out these projects currently in production!
|
Check out these projects currently in production!
|
||||||
|
|
||||||
@@ -68,9 +68,9 @@ meta(name="twitter:image", content="{% if main_project.picture_header %}{{ main_
|
|||||||
|
|
||||||
section.stream
|
section.stream
|
||||||
|
|
||||||
h4 Latest Assets
|
h6.section-title Latest Assets
|
||||||
|
|
||||||
ul.activity-stream__list
|
ul.activity-stream__list.list-unstyled
|
||||||
| {% for n in activity_stream %}
|
| {% for n in activity_stream %}
|
||||||
li(
|
li(
|
||||||
class="{{ n.node_type }} {{ n.properties.content_type }} {% if n.picture %}with-picture{% endif %}",
|
class="{{ n.node_type }} {{ n.properties.content_type }} {% if n.picture %}with-picture{% endif %}",
|
||||||
@@ -135,11 +135,11 @@ meta(name="twitter:image", content="{% if main_project.picture_header %}{{ main_
|
|||||||
|
|
||||||
|
|
||||||
section.random-asset
|
section.random-asset
|
||||||
h4
|
h6.section-title
|
||||||
a(href="/search") Explore the Cloud
|
a(href="/search") Explore the Cloud
|
||||||
span.section-lead Random selection of the best assets & tutorials
|
span.section-lead Random selection of the best assets & tutorials
|
||||||
|
|
||||||
ul.random-asset__list
|
ul.random-asset__list.list-unstyled
|
||||||
| {% for n in random_featured %}
|
| {% for n in random_featured %}
|
||||||
| {% if n.picture and loop.first %}
|
| {% if n.picture and loop.first %}
|
||||||
li.random-asset__list-item.project
|
li.random-asset__list-item.project
|
||||||
@@ -220,9 +220,9 @@ meta(name="twitter:image", content="{% if main_project.picture_header %}{{ main_
|
|||||||
|
|
||||||
section.comments
|
section.comments
|
||||||
|
|
||||||
h4 Latest Comments
|
h6.section-title Latest Comments
|
||||||
|
|
||||||
ul
|
ul.list-unstyled
|
||||||
| {% if latest_comments %}
|
| {% if latest_comments %}
|
||||||
| {% for n in latest_comments %}
|
| {% for n in latest_comments %}
|
||||||
li(
|
li(
|
||||||
|
@@ -3,7 +3,7 @@ html(lang="en")
|
|||||||
head
|
head
|
||||||
meta(charset="utf-8")
|
meta(charset="utf-8")
|
||||||
title {% if self.page_title() %}{% block page_title %}{% endblock %} — {% endif %}Blender Cloud
|
title {% if self.page_title() %}{% block page_title %}{% endblock %} — {% endif %}Blender Cloud
|
||||||
meta(name="viewport", content="width=device-width, initial-scale=1.0")
|
meta(name="viewport", content="width=device-width, initial-scale=1, shrink-to-fit=no")
|
||||||
meta(name="description", content="Blender Cloud is a web based service developed by Blender Institute that allows people to access the training videos and all the data from the open projects.")
|
meta(name="description", content="Blender Cloud is a web based service developed by Blender Institute that allows people to access the training videos and all the data from the open projects.")
|
||||||
meta(name="author", content="Blender Institute")
|
meta(name="author", content="Blender Institute")
|
||||||
meta(name="theme-color", content="#3e92aa")
|
meta(name="theme-color", content="#3e92aa")
|
||||||
@@ -50,7 +50,6 @@ html(lang="en")
|
|||||||
|
|
||||||
| {% block css %}
|
| {% block css %}
|
||||||
link(href="{{ url_for('static_pillar', filename='assets/css/font-pillar.css') }}", rel="stylesheet")
|
link(href="{{ url_for('static_pillar', filename='assets/css/font-pillar.css') }}", rel="stylesheet")
|
||||||
link(href="{{ url_for('static_pillar', filename='assets/css/base.css') }}", rel="stylesheet")
|
|
||||||
| {% if title == 'blog' %}
|
| {% if title == 'blog' %}
|
||||||
link(href="{{ url_for('static_pillar', filename='assets/css/blog.css') }}", rel="stylesheet")
|
link(href="{{ url_for('static_pillar', filename='assets/css/blog.css') }}", rel="stylesheet")
|
||||||
| {% else %}
|
| {% else %}
|
||||||
@@ -58,14 +57,11 @@ html(lang="en")
|
|||||||
| {% endif %}
|
| {% endif %}
|
||||||
| {% endblock css %}
|
| {% endblock css %}
|
||||||
|
|
||||||
|
|
||||||
| {% if not title %}{% set title="default" %}{% endif %}
|
| {% if not title %}{% set title="default" %}{% endif %}
|
||||||
|
|
||||||
body(class="{{ title }}")
|
body(class="{{ title }}")
|
||||||
.container-page
|
.container-page
|
||||||
| {% with messages = get_flashed_messages(with_categories=True) %}
|
| {% with messages = get_flashed_messages(with_categories=True) %}
|
||||||
| {% if messages %}
|
| {% if messages %}
|
||||||
|
|
||||||
| {% for (category, message) in messages %}
|
| {% for (category, message) in messages %}
|
||||||
.alert(role="alert", class="alert-{{ category }}")
|
.alert(role="alert", class="alert-{{ category }}")
|
||||||
i.alert-icon(class="{{ category }}")
|
i.alert-icon(class="{{ category }}")
|
||||||
@@ -73,21 +69,25 @@ html(lang="en")
|
|||||||
button.close(type="button", data-dismiss="alert")
|
button.close(type="button", data-dismiss="alert")
|
||||||
i.pi-cancel
|
i.pi-cancel
|
||||||
| {% endfor %}
|
| {% endfor %}
|
||||||
|
|
||||||
| {% endif %}
|
| {% endif %}
|
||||||
| {% endwith %}
|
| {% endwith %}
|
||||||
|
|
||||||
nav.navbar
|
nav.navbar.navbar-expand-md
|
||||||
.navbar-container
|
.navbar-container
|
||||||
header.navbar-header
|
//- header.navbar-header
|
||||||
button.navbar-toggle(data-target=".navbar-collapse", data-toggle="collapse", type="button")
|
|
||||||
span.sr-only Toggle navigation
|
|
||||||
i.pi-menu
|
|
||||||
a.navbar-brand(
|
a.navbar-brand(
|
||||||
href="{{ url_for('main.homepage') }}",
|
href="{{ url_for('main.homepage') }}",
|
||||||
title="Blender Cloud")
|
title="Blender Cloud")
|
||||||
span.app-logo
|
span.app-logo
|
||||||
i.pi-blender-cloud
|
i.pi-blender-cloud-logo
|
||||||
|
|
||||||
|
button.navbar-toggler.text-light(
|
||||||
|
data-target=".navbar-collapse",
|
||||||
|
data-toggle="collapse",
|
||||||
|
type="button")
|
||||||
|
span.sr-only Toggle navigation
|
||||||
|
span.navbar-toggler-icon.d-flex.align-items-center
|
||||||
|
i.pi-menu
|
||||||
|
|
||||||
| {% block navigation_search %}
|
| {% block navigation_search %}
|
||||||
.search-input
|
.search-input
|
||||||
@@ -97,8 +97,8 @@ html(lang="en")
|
|||||||
i.search-icon.pi-search
|
i.search-icon.pi-search
|
||||||
| {% endblock navigation_search %}
|
| {% endblock navigation_search %}
|
||||||
|
|
||||||
nav.collapse.navbar-collapse
|
.collapse.navbar-collapse
|
||||||
ul.nav.navbar-nav.navbar-right
|
ul.nav.navbar-nav.ml-auto
|
||||||
| {% if node and node.properties and node.properties.category %}
|
| {% if node and node.properties and node.properties.category %}
|
||||||
| {% set category = node.properties.category %}
|
| {% set category = node.properties.category %}
|
||||||
| {% else %}
|
| {% else %}
|
||||||
@@ -234,40 +234,95 @@ html(lang="en")
|
|||||||
.container
|
.container
|
||||||
.row
|
.row
|
||||||
.col-md-4.col-xs-6
|
.col-md-4.col-xs-6
|
||||||
.footer-support
|
h4
|
||||||
h4 Support & Feedback
|
a(href="{{ url_for('main.homepage') }}")
|
||||||
p.
|
i.pi-blender-cloud-logo
|
||||||
Let us know what you think or if you have any issues
|
|
||||||
just write to cloudsupport at blender dot org
|
|
||||||
|
|
||||||
.col-md-2.col-xs-6
|
p.pl-2.
|
||||||
ul.footer-social
|
Blender Cloud is the creative hub for your projects,
|
||||||
li
|
powered by Free and Open Source Software.
|
||||||
a(href="https://www.facebook.com/BlenderCloudOfficial/",
|
|
||||||
title="Follow us on Facebook")
|
h5.d-flex
|
||||||
i.pi-social-facebook
|
a.px-2(href="https://twitter.com/Blender_Cloud",
|
||||||
li
|
title="Follow us on Twitter")
|
||||||
a(href="https://twitter.com/Blender_Cloud",
|
i.pi-social-youtube
|
||||||
|
|
||||||
|
a.px-2(href="https://twitter.com/Blender_Cloud",
|
||||||
title="Follow us on Twitter")
|
title="Follow us on Twitter")
|
||||||
i.pi-social-twitter
|
i.pi-social-twitter
|
||||||
|
|
||||||
|
a.px-2(href="https://www.facebook.com/BlenderCloudOfficial/",
|
||||||
|
title="Follow us on Facebook")
|
||||||
|
i.pi-social-facebook
|
||||||
|
|
||||||
.col-md-2.col-xs-6
|
.col-md-2.col-xs-6
|
||||||
h4
|
h7.font-weight-bold
|
||||||
a(href="{{ url_for('main.homepage') }}")
|
| TRAINING
|
||||||
| Blender Cloud
|
|
||||||
ul.footer-links
|
ul.list-unstyled
|
||||||
|
li
|
||||||
|
a(href="{{ url_for('cloud.courses') }}")
|
||||||
|
| Courses
|
||||||
|
li
|
||||||
|
a(href="{{ url_for('cloud.workshops') }}")
|
||||||
|
| Workshops
|
||||||
|
li
|
||||||
|
a(href="{{ url_for('projects.view', project_url='gallery') }}")
|
||||||
|
| Art Gallery
|
||||||
|
|
||||||
|
.col-md-2.col-xs-6
|
||||||
|
h7.font-weight-bold
|
||||||
|
| LIBRARIES
|
||||||
|
|
||||||
|
ul.list-unstyled
|
||||||
li
|
li
|
||||||
a(href="{{ url_for('main.main_blog') }}",
|
a(href="{{ url_for('main.main_blog') }}",
|
||||||
title="Blender Cloud Blog")
|
title="Blender Cloud Blog")
|
||||||
| Blog
|
| HDRIs
|
||||||
li
|
li
|
||||||
a(href="{{ url_for('cloud.services') }}",
|
a(href="{{ url_for('cloud.services') }}",
|
||||||
title="Blender Cloud Services")
|
title="Blender Cloud Services")
|
||||||
| Services
|
| Textures
|
||||||
li
|
li
|
||||||
a(href="{{ url_for('cloud.about') }}",
|
a(href="{{ url_for('cloud.about') }}",
|
||||||
title="About Blender Cloud")
|
title="About Blender Cloud")
|
||||||
| About
|
| Characters
|
||||||
|
|
||||||
|
.col-md-2.col-xs-6
|
||||||
|
h7.font-weight-bold
|
||||||
|
a(href="{{ url_for('cloud.services') }}")
|
||||||
|
| SERVICES
|
||||||
|
|
||||||
|
ul.list-unstyled
|
||||||
|
li
|
||||||
|
a(href="{{ url_for('main.main_blog') }}",
|
||||||
|
title="Blender Cloud Blog")
|
||||||
|
| Add-on
|
||||||
|
li
|
||||||
|
a(href="{{ url_for('main.main_blog') }}",
|
||||||
|
title="Blender Cloud Blog")
|
||||||
|
| Blender Sync
|
||||||
|
li
|
||||||
|
a(href="{{ url_for('cloud.services') }}",
|
||||||
|
title="Blender Cloud Services")
|
||||||
|
| Attract
|
||||||
|
li
|
||||||
|
a(href="{{ url_for('cloud.about') }}",
|
||||||
|
title="About Blender Cloud")
|
||||||
|
| Flamenco
|
||||||
|
li
|
||||||
|
a(href="{{ url_for('cloud.about') }}",
|
||||||
|
title="About Blender Cloud")
|
||||||
|
| Image Sharing
|
||||||
|
|
||||||
|
.col-md-2.col-xs-6
|
||||||
|
h7.font-weight-bold
|
||||||
|
| BLENDER
|
||||||
|
ul.list-unstyled
|
||||||
|
li
|
||||||
|
a(href="{{ url_for('main.main_blog') }}",
|
||||||
|
title="Blender Cloud Blog")
|
||||||
|
| blender.org
|
||||||
li
|
li
|
||||||
a(href="{{ url_for('cloud.terms_and_conditions') }}",
|
a(href="{{ url_for('cloud.terms_and_conditions') }}",
|
||||||
title="Terms and Conditions")
|
title="Terms and Conditions")
|
||||||
@@ -276,26 +331,6 @@ html(lang="en")
|
|||||||
a(href="{{ url_for('cloud.privacy') }}",
|
a(href="{{ url_for('cloud.privacy') }}",
|
||||||
title="Privacy")
|
title="Privacy")
|
||||||
| Privacy
|
| Privacy
|
||||||
|
|
||||||
.col-md-2.col-xs-6
|
|
||||||
h4
|
|
||||||
a(href="https://www.blender.org",
|
|
||||||
title="Blender official Website")
|
|
||||||
| Blender
|
|
||||||
ul.footer-links
|
|
||||||
li
|
|
||||||
a(href="https://www.blender.org",
|
|
||||||
title="Blender official Website")
|
|
||||||
| Blender.org
|
|
||||||
li
|
|
||||||
a(href="https://store.blender.org/",
|
|
||||||
title="The official Blender Store")
|
|
||||||
| Blender Store
|
|
||||||
|
|
||||||
.col-md-2.col-xs-6.special
|
|
||||||
| With the support of the <br/> MEDIA Programme of the European Union<br/><br/>
|
|
||||||
img(alt="MEDIA Programme of the European Union",
|
|
||||||
src="https://gooseberry.blender.org/wp-content/uploads/2014/01/media_programme.png")
|
|
||||||
| {% endblock footer_navigation %}
|
| {% endblock footer_navigation %}
|
||||||
|
|
||||||
| {% block footer %}
|
| {% block footer %}
|
||||||
|
Reference in New Issue
Block a user