diff --git a/.gitignore b/.gitignore
index b9623fc..0aacd71 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,9 +3,12 @@
.coverage
*.pyc
__pycache__
+*.js.map
+*.css.map
/cloud/templates/
/cloud/static/assets/css/
+/cloud/static/assets/js/bootstrap.min.js
node_modules/
/config_local.py
diff --git a/gulpfile.js b/gulpfile.js
index 0245b31..5d2c110 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1,5 +1,6 @@
var argv = require('minimist')(process.argv.slice(2));
var autoprefixer = require('gulp-autoprefixer');
+var cache = require('gulp-cached');
var chmod = require('gulp-chmod');
var concat = require('gulp-concat');
var git = require('gulp-git');
@@ -11,16 +12,16 @@ var plumber = require('gulp-plumber');
var rename = require('gulp-rename');
var sass = require('gulp-sass');
var sourcemaps = require('gulp-sourcemaps');
-var uglify = require('gulp-uglify');
-var cache = require('gulp-cached');
+var uglify = require('gulp-uglify-es').default;
var enabled = {
uglify: argv.production,
- maps: argv.production,
+ maps: !argv.production,
failCheck: !argv.production,
prettyPug: !argv.production,
cachify: !argv.production,
cleanup: argv.production,
+ chmod: argv.production,
};
var destination = {
@@ -29,6 +30,12 @@ var destination = {
js: 'cloud/static/assets/js',
}
+var source = {
+ pillar: '../pillar/',
+ bootstrap: 'node_modules/bootstrap/',
+ popper: 'node_modules/popper.js/'
+}
+
/* CSS */
gulp.task('styles', function() {
@@ -73,7 +80,7 @@ gulp.task('scripts', function() {
.pipe(gulpif(enabled.uglify, uglify()))
.pipe(rename({suffix: '.min'}))
.pipe(gulpif(enabled.maps, sourcemaps.write(".")))
- .pipe(chmod(644))
+ .pipe(gulpif(enabled.chmod, chmod(644)))
.pipe(gulp.dest(destination.js))
.pipe(gulpif(argv.livereload, livereload()));
});
@@ -88,12 +95,34 @@ gulp.task('scripts_concat_tutti', function() {
.pipe(concat("tutti.min.js"))
.pipe(gulpif(enabled.uglify, uglify()))
.pipe(gulpif(enabled.maps, sourcemaps.write(".")))
- .pipe(chmod(644))
+ .pipe(gulpif(enabled.chmod, chmod(644)))
.pipe(gulp.dest(destination.js))
.pipe(gulpif(argv.livereload, livereload()));
});
+// Combine all needed Bootstrap JavaScript into a single file.
+gulp.task('scripts_concat_bootstrap', function() {
+
+ toUglify = [
+ source.popper + 'dist/umd/popper.min.js',
+ source.bootstrap + 'js/dist/index.js',
+ source.bootstrap + 'js/dist/util.js',
+ source.bootstrap + 'js/dist/tooltip.js',
+ source.bootstrap + 'js/dist/dropdown.js',
+ ];
+
+ gulp.src(toUglify)
+ .pipe(gulpif(enabled.failCheck, plumber()))
+ .pipe(gulpif(enabled.maps, sourcemaps.init()))
+ .pipe(concat("bootstrap.min.js"))
+ .pipe(gulpif(enabled.uglify, uglify()))
+ .pipe(gulpif(enabled.maps, sourcemaps.write(".")))
+ .pipe(gulpif(enabled.chmod, chmod(644)))
+ .pipe(gulp.dest(destination.js))
+ .pipe(gulpif(argv.livereload, livereload()));
+});
+
// While developing, run 'gulp watch'
gulp.task('watch',function() {
@@ -103,6 +132,8 @@ gulp.task('watch',function() {
}
gulp.watch('src/styles/**/*.sass',['styles']);
+ gulp.watch(source.pillar + 'src/styles/**/*.sass',['styles']);
+
gulp.watch('src/templates/**/*.pug',['templates']);
gulp.watch('src/scripts/*.js',['scripts']);
gulp.watch('src/scripts/tutti/**/*.js',['scripts_concat_tutti']);
@@ -125,4 +156,5 @@ gulp.task('cleanup', function() {
// Run 'gulp' to build everything at once
var tasks = [];
if (enabled.cleanup) tasks.push('cleanup');
-gulp.task('default', tasks.concat(['styles', 'templates', 'scripts', 'scripts_concat_tutti']));
+
+gulp.task('default', tasks.concat(['styles', 'templates', 'scripts', 'scripts_concat_tutti', 'scripts_concat_bootstrap']));
diff --git a/package.json b/package.json
index f988f0b..1894f5d 100644
--- a/package.json
+++ b/package.json
@@ -8,20 +8,24 @@
},
"devDependencies": {
"gulp": "~3.9.1",
- "gulp-autoprefixer": "~2.3.1",
- "gulp-cached": "~1.1.0",
- "gulp-chmod": "~1.3.0",
- "gulp-concat": "~2.6.0",
- "gulp-if": "^2.0.1",
- "gulp-git": "~2.4.2",
- "gulp-pug": "~3.2.0",
- "gulp-jade": "~1.1.0",
- "gulp-livereload": "~3.8.1",
- "gulp-plumber": "~1.1.0",
- "gulp-rename": "~1.2.2",
- "gulp-sass": "~2.3.1",
- "gulp-sourcemaps": "~1.6.0",
- "gulp-uglify": "~1.5.3",
+ "gulp-autoprefixer": "~6.0.0",
+ "gulp-cached": "~1.1.1",
+ "gulp-chmod": "~2.0.0",
+ "gulp-concat": "~2.6.1",
+ "gulp-if": "^2.0.2",
+ "gulp-git": "~2.8.0",
+ "gulp-livereload": "~4.0.0",
+ "gulp-plumber": "~1.2.0",
+ "gulp-pug": "~4.0.1",
+ "gulp-rename": "~1.4.0",
+ "gulp-sass": "~4.0.1",
+ "gulp-sourcemaps": "~2.6.4",
+ "gulp-uglify-es": "^1.0.4",
"minimist": "^1.2.0"
+ },
+ "dependencies": {
+ "bootstrap": "^4.1.3",
+ "jquery": "^3.3.1",
+ "popper.js": "^1.14.4"
}
}
diff --git a/src/styles/_homepage.sass b/src/styles/_homepage.sass
index ece9b66..0109102 100644
--- a/src/styles/_homepage.sass
+++ b/src/styles/_homepage.sass
@@ -1,613 +1,406 @@
-.dashboard-container
- +container-behavior
- +media-xs
- flex-direction: column
- align-content: center
- align-items: flex-start
- display: flex
- justify-content: space-around
- word-break: break-word
- section.dashboard-main,
- section.dashboard-secondary
- +media-xs
- width: 100%
- margin: 20px auto
- img
- max-width: 100%
+.title-underline
+ padding-bottom: 5px
+ position: relative
+ margin-bottom: 20px
- section.dashboard-main
- +container-box
- width: 52%
-
- section.dashboard-secondary
- width: 46%
- flex-direction: column
- margin-right: auto
-
- span.section-lead
+ &:before
+ background-color: $primary
+ content: ' '
display: block
- padding: 10px 0
- color: $color-text-dark-secondary
+ height: 2px
+ top: 125%
+ position: absolute
+ width: 50px
- section.dashboard-main,
- section.dashboard-secondary
- h4
- padding-bottom: 5px
- margin-bottom: 20px
- position: relative
- &:before
- position: absolute
- width: 50px
- height: 2px
- top: 125%
- content: ' '
- display: block
- background-color: $color-primary
+nav#nav-tabs,
+nav#sub-nav-tabs
+ ul#nav-tabs__list,
+ ul#sub-nav-tabs__list
+ margin: 0
+ padding: 0
+ list-style: none
+ border-bottom: thin solid $color-background
+ +clearfix
+
+ li.nav-tabs__list-tab
+ float: left
+ border: none
+ border-bottom: 3px solid transparent
+ color: $color-text-dark-primary
+ user-select: none
+
+ &:hover
+ border-color: rgba($color-secondary, .3)
+ cursor: pointer
+ color: $color-text-dark
+ a
+ color: $color-text-dark
a
- color: $color-text
-
- &:hover
- color: $color-primary
- cursor: pointer
-
- nav#nav-tabs,
- nav#sub-nav-tabs
- ul#nav-tabs__list,
- ul#sub-nav-tabs__list
- margin: 0
- padding: 0
- list-style: none
- border-bottom: thin solid $color-background
- +clearfix
-
- li.nav-tabs__list-tab
- float: left
- border: none
- border-bottom: 3px solid transparent
+ display: block
+ text-decoration: none
+ padding: 10px 15px 5px
color: $color-text-dark-primary
- user-select: none
- &:hover
- border-color: rgba($color-secondary, .3)
- cursor: pointer
- color: $color-text-dark
- a
- color: $color-text-dark
+ i
+ margin-right: 5px
+ color: $color-text-dark-secondary
+ font-size: .9em
- a
- display: block
- text-decoration: none
- padding: 10px 15px 5px
- color: $color-text-dark-primary
+ &.pi-blender
+ margin-right: 10px
- i
- margin-right: 5px
- color: $color-text-dark-secondary
- font-size: .9em
+ span
+ color: $color-text-dark-hint
+ margin-left: 5px
- &.pi-blender
- margin-right: 10px
-
- span
- color: $color-text-dark-hint
- margin-left: 5px
-
- &.active
- border-color: $color-secondary
+ &.active
+ border-color: $color-secondary
+ color: $color-secondary-dark
+ a, i
color: $color-secondary-dark
- a, i
- color: $color-secondary-dark
- &.disabled
- border-color: $color-background-light
+ &.disabled
+ border-color: $color-background-light
+ color: $color-text-dark-hint
+ cursor: default
+ a, i
color: $color-text-dark-hint
- cursor: default
- a, i
- color: $color-text-dark-hint
-
- &:hover
- border-color: $color-background-light
- pointer-events: none
-
- li.create
- cursor: pointer
- display: inline-block
- float: right
- font:
- size: 1.2em
- weight: 400
- padding: 5px 10px
- margin-top: 3px
-
- a
- color: $color-success
- text-decoration: none
-
- &.disabled
- cursor: wait
- border-color: $color-success
- opacity: .8
- a
- cursor: wait
-
- section.stream
- background-color: white
- border-bottom: thin solid $color-background-dark
-
- ul.activity-stream__list
- list-style: none
- margin: 0
- padding: 0
-
- $activity-stream-thumbnail-size: 110px
- > li
- position: relative
- display: flex
- padding: 10px 0
- overflow: hidden
- border-top: thin solid $color-background-dark
-
- &:first-child
- border: none
-
- &.active .activity-stream__list-details .title
- color: $color-primary
&:hover
- .title
- text-decoration: underline
- &.video
- a.image
- &:hover
- i
- font-size: 3.5em
- img
- opacity: .9
- img
- opacity: .7
- z-index: 0
- transition: opacity 150ms ease-in-out
+ border-color: $color-background-light
+ pointer-events: none
+.dashboard-container
+ word-break: break-word
+
+section.stream
+ ul.activity-stream__list
+ $activity-stream-thumbnail-size: 110px
+
+ > li
+ position: relative
+ display: flex
+ padding: 10px 0
+ overflow: hidden
+ border-top: thin solid $color-background-dark
+
+ &:first-child
+ border: none
+
+ &.active .activity-stream__list-details .title
+ color: $color-primary
+
+ &:hover
+ .title
+ text-decoration: underline
+ &.video
+ a.image
+ &:hover
i
- +position-center-translate
- z-index: 1
- color: rgba(white, .6)
- font-size: 3em
- transition: font-size 100ms ease-in-out
-
- &.comment
- .activity-stream__list-thumbnail
- background: transparent
- color: $node-type-comment
- font-size: 1.2em
- box-shadow: none
+ font-size: 3.5em
+ img
+ opacity: .9
+ img
+ opacity: .7
+ z-index: 0
+ transition: opacity 150ms ease-in-out
i
+position-center-translate
- left: 22px
- top: 19px
+ z-index: 1
+ color: rgba(white, .6)
+ font-size: 3em
+ transition: font-size 100ms ease-in-out
- .activity-stream__list-details
- padding: 0
- .title
- color: $color-text-dark
- padding: 7px 10px 2px 10px
- font-size: 1em
- margin: 0
+ &.comment
+ .activity-stream__list-details
+ padding: 0
+ .title
+ color: $color-text-dark
+ padding: 7px 10px 2px 10px
+ font-size: 1em
+ margin: 0
- ul.meta
- padding: 0 10px 7px 10px
+ ul.meta
+ +list-meta
+ font-size: .9em
+ padding: 0 10px 7px 10px
- li
- &.where-parent:before
- content: '\e83a'
- font-family: 'pillar-font'
+ li
+ &.where-parent:before
+ content: '\e83a'
+ font-family: 'pillar-font'
- &.what:before
- display: none
+ &.what:before
+ display: none
- &.post
- .activity-stream__list-thumbnail
- border-color: $node-type-post
- background-color: $node-type-post
- .activity-stream__list-details .title
- color: darken($node-type-post, 15%)
- font:
- size: 1.3em
- weight: 500
+ &.post
+ .activity-stream__list-thumbnail
+ border-color: $node-type-post
+ background-color: $node-type-post
+ .activity-stream__list-details .title
+ color: darken($node-type-post, 15%)
+ font:
+ size: 1.3em
+ weight: 500
- &.asset, &.comment, &.post
+ &.asset, &.comment, &.post
+ &:hover
+ cursor: pointer
+ &.empty
+ display: none
+ color: $color-text-dark-primary
+ padding: 20px
+ text-align: center
+ span
+ color: $color-primary
&:hover
+ text-decoration: underline
cursor: pointer
- &.empty
- display: none
- color: $color-text-dark-primary
- padding: 20px
- text-align: center
- span
- color: $color-primary
- &:hover
- text-decoration: underline
- cursor: pointer
- &.with-picture
- min-height: $activity-stream-thumbnail-size
-
- .activity-stream__list-thumbnail
- background-color: black
- width: $activity-stream-thumbnail-size * 1.69
- min-width: $activity-stream-thumbnail-size * 1.69
-
- .activity-stream__list-thumbnail-icon
- position: absolute
- top: 0
- left: 0
- right: 0
- bottom: 0
- font-size: 1.3em
- text-shadow: 1px 1px 0 rgba(black, .2)
- background-image: linear-gradient(10deg, rgba(black, .5) 0%, transparent 40%)
-
- i
- position: absolute
- bottom: -8px
- left: 20px
- top: initial
- right: initial
- color: white
+ &.with-picture
+ min-height: $activity-stream-thumbnail-size
.activity-stream__list-thumbnail
- position: relative
- display: flex
- justify-content: center
- align-items: center
- overflow: hidden
- width: 35px
- height: auto
- min-width: 35px
- min-height: auto
+ background-color: black
+ width: $activity-stream-thumbnail-size * 1.69
+ min-width: $activity-stream-thumbnail-size * 1.69
- +media-xs
- display: none
+ .activity-stream__list-thumbnail-icon
+ position: absolute
+ top: 0
+ left: 0
+ right: 0
+ bottom: 0
+ font-size: 1.3em
+ text-shadow: 1px 1px 0 rgba(black, .2)
+ background-image: linear-gradient(10deg, rgba(black, .5) 0%, transparent 40%)
+
+ i
+ position: absolute
+ bottom: -8px
+ left: 20px
+ top: initial
+ right: initial
+ color: white
+
+ .activity-stream__list-thumbnail
+ position: relative
+ display: flex
+ justify-content: center
+ align-items: center
+ overflow: hidden
+ width: 35px
+ height: auto
+ min-width: 35px
+ min-height: auto
+
+ +media-xs
+ display: none
- &.image i
- color: $node-type-asset_image
- &.file i
- color: $node-type-asset_file
- &.video i
- color: $node-type-asset_video
+ &.image i
+ color: $node-type-asset_image
+ &.file i
+ color: $node-type-asset_file
+ &.video i
+ color: $node-type-asset_video
- i
- +position-center-translate
- left: 23px
- top: 21px
- font-size: 1.1em
+ i
+ +position-center-translate
+ left: 23px
+ top: 21px
+ font-size: 1.1em
- img
- max-height: $activity-stream-thumbnail-size
- +position-center-translate
+ img
+ max-height: $activity-stream-thumbnail-size
+ +position-center-translate
- .activity-stream__list-details
- display: flex
- flex-direction: column
- justify-content: space-around
- flex: 1
- overflow: hidden
- position: relative
- max-width: 100%
- margin-right: auto
- padding: 10px 0
-
- +media-xs
- margin-left: 0
-
- .ribbon
- +ribbon
- right: -47px
- top: 5px
- font:
- size: 12px
- weight: 500
-
- span
- padding: 1px 50px
-
- .title
- display: inline-block
- padding: 0 10px
- color: $color-text-dark
- font-size: 1.1em
-
- span
- @include badge(hsl(hue($color-success), 60%, 45%), 3px)
- font-size: .7em
- padding: 1px 5px
- margin-right: 5px
-
- ul.meta
- +list-meta
- padding: 5px 10px 0 10px
- font-size: .85em
- color: $color-text-dark-secondary
- display: flex
- white-space: nowrap
-
- &.extra
- margin-top: auto
-
- li
- padding-left: 10px
- &:before
- left: -5px
- &.where-project
- +text-overflow-ellipsis
-
- section.comments
- padding: 0 15px 5px
-
- ul
- padding: 0
-
- > ul
- list-style-type: none
- margin: 10px 0 0
-
- > li
- +text-overflow-ellipsis
- border-top: thin solid $color-background-dark
- padding: 10px 0
-
- &:first-child
- border: none
-
- > a
- +text-overflow-ellipsis
- color: $color-text
- display: block
- padding-bottom: 5px
-
- section.blog-stream
- +media-md
- padding-left: 10px
- +media-sm
- padding-left: 10px
- position: relative
-
- .feed
- position: absolute
- top: 10px
- right: 10px
- font-size: 1.4em
- color: lighten($color-text-dark-hint, 10%)
-
- &:hover
- color: $color-primary
-
- > ul
- margin: 0
- padding: 0
- list-style: none
- border-top: thin solid $color-background
-
- .blog_index-item
- +container-box
+ .activity-stream__list-details
display: flex
flex-direction: column
- margin-bottom: 50px
+ justify-content: space-around
+ flex: 1
+ overflow: hidden
+ position: relative
+ max-width: 100%
+ padding: 10px 0
- &:before
- height: 1px
- background-color: $color-background-dark
- position: absolute
- bottom: -26px
- left: 25px
- right: 25px
- content: ' '
+ +media-xs
+ margin-left: 0
- &:last-child
- margin-bottom: 0
+ .ribbon
+ +ribbon
+ right: -47px
+ top: 5px
+ font-size: 12px
- &:before
- display: none
+ span
+ padding: 1px 50px
- video
- max-width: 100%
+ .title
+ padding: 0 10px
+ color: $color-text-dark
- a.item-title
+ span
+ @include badge(hsl(hue($color-success), 60%, 45%), 3px)
+ font-size: .7em
+ padding: 1px 5px
+ margin-right: 5px
+
+section.comments
+ padding: 0 15px 5px
+
+ ul
+ padding: 0
+
+ > ul
+ list-style-type: none
+ margin: 10px 0 0
+
+ > li
+ +text-overflow-ellipsis
+ border-top: thin solid $color-background-dark
+ padding: 10px 0
+
+ &:first-child
+ border: none
+
+ > a
+ +text-overflow-ellipsis
+ color: $color-text
+ display: block
+ padding-bottom: 5px
+
+section.random-asset
+ border-bottom: thin solid $color-background-dark
+
+ ul.random-asset__list
+ list-style: none
+ padding: 0
+
+ > li
+ align-items: center
+ border-top: thin solid $color-background
+ display: flex
+ padding: 7px 0
+ position: relative
+ overflow: hidden
+
+ &:first-child
+ border-top: none
+
+ .ribbon
+ +ribbon
+ right: -47px
+ top: 5px
+ font:
+ size: 12px
+ weight: 500
+
+ z-index: 1
+
+ span
+ padding: 1px 50px
+
+ .random-asset__list-thumbnail
+ background-color: $color-background
+ display: block
+ height: 50px
+ margin-right: 15px
+ min-height: 50px
+ min-width: 50px
+ overflow: hidden
+ position: relative
+ width: 50px
+
+ img
+ width: 100%
+
+ i
+ +position-center-translate
font-size: 1.6em
- padding: 5px 15px
+ color: $color-text-light
+
+ &.image
+ background-color: $node-type-asset_image
+ &.file
+ background-color: $node-type-asset_file
+ font-size: .8em
+ &.video
+ background-color: $node-type-asset_video
+ font-size: .8em
+ &.None
+ background-color: $node-type-group
+
+ .random-asset__list-details
+ .title
display: block
- color: $color-text
+ font-size: 1em
+ color: $color-text-dark-primary
&:hover
color: $color-primary
ul.meta
+list-meta
+ padding-top: 5px
font-size: .9em
- padding: 15px 15px 5px
+ li
+ &:before
+ left: -5px
+ &.what
+ text-transform: capitalize
- &.blog-non-featured
- border-radius: 0
- margin: 0
+ &.featured
+ align-items: flex-start
+ flex-direction: column
+ padding: 0
- .item-content
- +node-details-description
- padding: 10px 15px
-
- .blog-stream__list-details
- .title
- color: $color-text-dark-primary
- display: block
- font-size: 1.3em
-
- &:hover
- color: $color-primary
-
- ul.meta
- +list-meta
- padding-top: 5px
- font-size: .9em
- color: $color-text-dark-secondary
-
- li
- padding-left: 10px
- &:before
- left: -5px
-
- .blog_index-header
- display: block
- position: relative
-
- img
- border-top-left-radius: 3px
- border-top-right-radius: 3px
- width: 100%
-
- .more
- text-align: center
-
- a
- color: $color-text
- display: block
- padding: 25px 0
- text-decoration: underline
- width: 100%
-
- &:hover
- color: $color-primary
-
- section.random-asset
- border-bottom: thin solid $color-background-dark
-
- ul.random-asset__list
- list-style: none
- padding: 0
-
- > li
- align-items: center
- border-top: thin solid $color-background
- display: flex
- padding: 7px 0
- position: relative
- overflow: hidden
-
- &:first-child
- border-top: none
-
- .ribbon
- +ribbon
- right: -47px
- top: 5px
- font:
- size: 12px
- weight: 500
-
- z-index: 1
-
- span
- padding: 1px 50px
-
- .random-asset__list-thumbnail
- background-color: $color-background
+ a.title
+ font-size: 1.1em
+ padding: 10px 0 5px
+ display: block
+ color: $color-text
+
+ &:hover
+ color: $color-primary
+
+ a.random-asset__thumbnail
display: block
- height: 50px
- margin-right: 15px
- min-height: 50px
- min-width: 50px
- overflow: hidden
position: relative
- width: 50px
+
+ &.video
+ background-color: black
+ img
+ opacity: .7
img
+ transition: opacity 150ms ease-in-out
width: 100%
+ max-width: 100%
i
+position-center-translate
- font-size: 1.6em
- color: $color-text-light
-
- &.image
- background-color: $node-type-asset_image
- &.file
- background-color: $node-type-asset_file
- font-size: .8em
- &.video
- background-color: $node-type-asset_video
- font-size: .8em
- &.None
- background-color: $node-type-group
-
- .random-asset__list-details
- .title
- display: block
- font-size: 1em
- color: $color-text-dark-primary
-
- &:hover
- color: $color-primary
-
- ul.meta
- +list-meta
- padding-top: 5px
- font-size: .9em
-
- li
- &:before
- left: -5px
- &.what
- text-transform: capitalize
-
- &.featured
- align-items: flex-start
- flex-direction: column
- padding: 0
-
- a.title
- font-size: 1.1em
- padding: 10px 0 5px
- display: block
- color: $color-text
-
- &:hover
- color: $color-primary
-
- a.random-asset__thumbnail
- display: block
- position: relative
-
- &.video
- background-color: black
- img
- opacity: .7
-
- img
- transition: opacity 150ms ease-in-out
- width: 100%
- max-width: 100%
+ color: white
+ font-size: 3em
+ text-shadow: 0 0 25px black
+ transition: font-size 150ms ease-in-out
+ &:hover
i
- +position-center-translate
- color: white
- font-size: 3em
- text-shadow: 0 0 25px black
- transition: font-size 150ms ease-in-out
+ font-size: 3.5em
+ img
+ opacity: .85
- &:hover
- i
- font-size: 3.5em
- img
- opacity: .85
-
- ul.meta
- +list-meta
- padding-bottom: 10px
+ ul.meta
+ +list-meta
+ padding-bottom: 10px
section.announcement
@@ -653,10 +446,6 @@ section.announcement
.title
padding-bottom: 10px
- font:
- family: $font-body
- size: 1.4em
- weight: 300
+media-xs
font-size: 1.4em
@@ -693,60 +482,21 @@ section.announcement
justify-content: space-around
flex-wrap: wrap
- a
- +button($color-text-light, 3px)
- padding: 5px 0
- margin:
- bottom: 5px
- right: auto
- left: auto
- font-size: .9em
- opacity: 1
- flex: 1
-
- +media-xs
- margin: 10px auto
- width: 100%
-
- &:first-child
- margin-right: 15px
-
- &.blue
- +button(hsl(hue($color-info), 60%, 45%), 3px)
-
- &.orange
- +button(hsl(hue($color-secondary), 50%, 50%), 3px)
- padding: 5px 15px
-
- &.green
- +button(hsl(hue($color-success), 60%, 40%), 3px, true)
-
-
-section.dashboard-in-production
- .in-production-project
- border-bottom: thin solid $color-background-dark
- color: $color-text-dark-primary
- display: block
- font-size: 1.1em
- margin-bottom: 15px
-
- > img
- margin-bottom: 15px
body.homepage
- .dashboard-container
- .dashboard-main
- +media-xs
- width: 100%
- background-color: transparent
- box-shadow: none
- width: 60%
+ .blog
+ // Custom tweak to Bootstrap grid for the only case when
+ // the post is inside a column (it's usually centered in the page).
+ .col-md-9
+ flex: 1
+ max-width: 100%
- .dashboard-secondary
- +container-box
- +media-xs
- width: 100%
- width: 38%
+ .jumbotron
+ padding-top: 6em
+ padding-bottom: 6em
- > section
- padding: 15px
+ *
+ font-size: $h1-font-size
+
+ .lead
+ font-size: $font-size-base
diff --git a/src/styles/_welcome.sass b/src/styles/_welcome.sass
index 99f92c5..ae4f5df 100644
--- a/src/styles/_welcome.sass
+++ b/src/styles/_welcome.sass
@@ -10,9 +10,6 @@
li a.navbar-item
color: $color-text
- .navbar-container
- +container-behavior
-
.navbar-toggle
border: 2px solid $color-text-dark-primary
color: $color-text
@@ -267,22 +264,6 @@
+media-xs
margin-top: 20px
- .navbar
- .nav-item-sign-in
- a.navbar-item
- background-color: $color-primary
- border: none
- border-radius: 3px
- color: white
- height: auto
- font-weight: bold
- margin-top: 5px
- margin-left: 10px
- padding: 10px 20px
-
- &:hover
- background-color: lighten($color-primary, 10%)
- box-shadow: none
.container.wide-on-sm
+media-sm
@@ -334,9 +315,7 @@ section.pricing
+button($color-primary, 3px, true)
h3
- font:
- size: 1.8em
- family: $font-body
+ font-size: 1.8em
padding-bottom: 0
margin: 25px 0 0 10px
diff --git a/src/styles/main.sass b/src/styles/main.sass
index 6d2da95..d7524a5 100644
--- a/src/styles/main.sass
+++ b/src/styles/main.sass
@@ -1,26 +1,99 @@
-@import ../../../pillar/src/styles/_normalize
-@import ../../../pillar/src/styles/_config
-@import ../../../pillar/src/styles/_utils
+// Bootstrap variables and utilities.
+@import "../../node_modules/bootstrap/scss/functions"
+@import "../../node_modules/bootstrap/scss/variables"
+@import "../../node_modules/bootstrap/scss/mixins"
-/* Generic styles (comments, notifications, etc) come from base.css */
+// Pillar variables and utilities.
+@import "../../../pillar/src/styles/config"
+@import "../../../pillar/src/styles/utils"
+
+
+// Bootstrap components.
+@import "../../node_modules/bootstrap/scss/root"
+@import "../../node_modules/bootstrap/scss/reboot"
+
+@import "../../node_modules/bootstrap/scss/type"
+@import "../../node_modules/bootstrap/scss/images"
+
+@import "../../node_modules/bootstrap/scss/code"
+@import "../../node_modules/bootstrap/scss/grid"
+@import "../../node_modules/bootstrap/scss/tables"
+@import "../../node_modules/bootstrap/scss/forms"
+@import "../../node_modules/bootstrap/scss/buttons"
+@import "../../node_modules/bootstrap/scss/transitions"
+@import "../../node_modules/bootstrap/scss/dropdown"
+@import "../../node_modules/bootstrap/scss/button-group"
+@import "../../node_modules/bootstrap/scss/input-group"
+@import "../../node_modules/bootstrap/scss/custom-forms"
+
+@import "../../node_modules/bootstrap/scss/nav"
+@import "../../node_modules/bootstrap/scss/navbar"
+
+@import "../../node_modules/bootstrap/scss/card"
+@import "../../node_modules/bootstrap/scss/breadcrumb"
+@import "../../node_modules/bootstrap/scss/pagination"
+@import "../../node_modules/bootstrap/scss/badge"
+@import "../../node_modules/bootstrap/scss/jumbotron"
+@import "../../node_modules/bootstrap/scss/alert"
+@import "../../node_modules/bootstrap/scss/progress"
+@import "../../node_modules/bootstrap/scss/media"
+@import "../../node_modules/bootstrap/scss/list-group"
+@import "../../node_modules/bootstrap/scss/close"
+@import "../../node_modules/bootstrap/scss/modal"
+@import "../../node_modules/bootstrap/scss/tooltip"
+@import "../../node_modules/bootstrap/scss/popover"
+@import "../../node_modules/bootstrap/scss/carousel"
+
+@import "../../node_modules/bootstrap/scss/utilities"
+@import "../../node_modules/bootstrap/scss/print"
+
+
+// Pillar components.
+@import "../../../pillar/src/styles/apps_base"
+@import "../../../pillar/src/styles/error"
+
+@import "../../../pillar/src/styles/components/base"
+
+@import "../../../pillar/src/styles/components/jumbotron"
+@import "../../../pillar/src/styles/components/alerts"
+@import "../../../pillar/src/styles/components/navbar"
+@import "../../../pillar/src/styles/components/dropdown"
+@import "../../../pillar/src/styles/components/footer"
+@import "../../../pillar/src/styles/components/shortcode"
+@import "../../../pillar/src/styles/components/statusbar"
+@import "../../../pillar/src/styles/components/search"
+
+@import "../../../pillar/src/styles/components/flyout"
+@import "../../../pillar/src/styles/components/forms"
+@import "../../../pillar/src/styles/components/inputs"
+@import "../../../pillar/src/styles/components/buttons"
+@import "../../../pillar/src/styles/components/popover"
+@import "../../../pillar/src/styles/components/tooltip"
+@import "../../../pillar/src/styles/components/checkbox"
+@import "../../../pillar/src/styles/components/overlay"
+@import "../../../pillar/src/styles/components/card"
+
+@import "../../../pillar/src/styles/comments"
+@import "../../../pillar/src/styles/notifications"
/* Blender Cloud specific styles */
-@import ../../../pillar/src/styles/_project
-@import ../../../pillar/src/styles/_project-sharing
-@import ../../../pillar/src/styles/_project-dashboard
-@import ../../../pillar/src/styles/_user
+@import "../../../pillar/src/styles/_project"
+@import "../../../pillar/src/styles/_project-sharing"
+@import "../../../pillar/src/styles/_project-dashboard"
+@import "../../../pillar/src/styles/_user"
+
@import _welcome
@import _homepage
@import _services
@import _about
-@import ../../../pillar/src/styles/_search
-@import ../../../pillar/src/styles/_organizations
+@import "../../../pillar/src/styles/_search"
+@import "../../../pillar/src/styles/_organizations"
/* services, about, etc */
-@import ../../../pillar/src/styles/_pages
+@import "../../../pillar/src/styles/_pages"
/* plugins are included here, don't include in base unless needed by other pillar apps */
-@import ../../../pillar/src/styles/plugins/_jstree
-@import ../../../pillar/src/styles/plugins/_js_select2
+@import "../../../pillar/src/styles/plugins/_jstree"
+@import "../../../pillar/src/styles/plugins/_js_select2"
/* CSS for pillar-font comes from fontello.com using static/assets/font/config.json */
diff --git a/src/styles/project-landing.sass b/src/styles/project-landing.sass
index 7eaa671..3d65012 100644
--- a/src/styles/project-landing.sass
+++ b/src/styles/project-landing.sass
@@ -1,47 +1,88 @@
-@import ../../../pillar/src/styles/_config
-@import ../../../pillar/src/styles/_utils
+// Bootstrap variables and utilities.
+@import "../../node_modules/bootstrap/scss/functions"
+@import "../../node_modules/bootstrap/scss/variables"
+@import "../../node_modules/bootstrap/scss/mixins"
+
+// Pillar variables and utilities.
+@import "../../../pillar/src/styles/config"
+@import "../../../pillar/src/styles/utils"
+
+// Bootstrap components.
+@import "../../node_modules/bootstrap/scss/root"
+@import "../../node_modules/bootstrap/scss/reboot"
+
+@import "../../node_modules/bootstrap/scss/type"
+@import "../../node_modules/bootstrap/scss/images"
+
+@import "../../node_modules/bootstrap/scss/code"
+@import "../../node_modules/bootstrap/scss/grid"
+@import "../../node_modules/bootstrap/scss/tables"
+@import "../../node_modules/bootstrap/scss/forms"
+@import "../../node_modules/bootstrap/scss/buttons"
+@import "../../node_modules/bootstrap/scss/transitions"
+@import "../../node_modules/bootstrap/scss/dropdown"
+@import "../../node_modules/bootstrap/scss/button-group"
+@import "../../node_modules/bootstrap/scss/input-group"
+@import "../../node_modules/bootstrap/scss/custom-forms"
+
+@import "../../node_modules/bootstrap/scss/nav"
+@import "../../node_modules/bootstrap/scss/navbar"
+
+@import "../../node_modules/bootstrap/scss/card"
+@import "../../node_modules/bootstrap/scss/breadcrumb"
+@import "../../node_modules/bootstrap/scss/pagination"
+@import "../../node_modules/bootstrap/scss/badge"
+@import "../../node_modules/bootstrap/scss/jumbotron"
+@import "../../node_modules/bootstrap/scss/alert"
+@import "../../node_modules/bootstrap/scss/progress"
+@import "../../node_modules/bootstrap/scss/media"
+@import "../../node_modules/bootstrap/scss/list-group"
+@import "../../node_modules/bootstrap/scss/close"
+@import "../../node_modules/bootstrap/scss/modal"
+@import "../../node_modules/bootstrap/scss/tooltip"
+@import "../../node_modules/bootstrap/scss/popover"
+@import "../../node_modules/bootstrap/scss/carousel"
+
+@import "../../node_modules/bootstrap/scss/utilities"
+@import "../../node_modules/bootstrap/scss/print"
+
+
+// Pillar components.
+@import "../../../pillar/src/styles/apps_base"
+@import "../../../pillar/src/styles/error"
+
+@import "../../../pillar/src/styles/components/base"
+
+@import "../../../pillar/src/styles/components/jumbotron"
+@import "../../../pillar/src/styles/components/alerts"
+@import "../../../pillar/src/styles/components/navbar"
+@import "../../../pillar/src/styles/components/dropdown"
+@import "../../../pillar/src/styles/components/footer"
+@import "../../../pillar/src/styles/components/shortcode"
+@import "../../../pillar/src/styles/components/statusbar"
+@import "../../../pillar/src/styles/components/search"
+
+@import "../../../pillar/src/styles/components/flyout"
+@import "../../../pillar/src/styles/components/inputs"
+@import "../../../pillar/src/styles/components/buttons"
+@import "../../../pillar/src/styles/components/popover"
+@import "../../../pillar/src/styles/components/tooltip"
+@import "../../../pillar/src/styles/components/checkbox"
+@import "../../../pillar/src/styles/components/overlay"
+@import "../../../pillar/src/styles/components/card"
+
+@import "../../../pillar/src/styles/notifications"
+
+@import "../../../pillar/src/styles/_search"
$node-latest-thumbnail-size: 160px
$node-latest-gallery-thumbnail-size: 200px
-body
- background-color: white
-.page-body
- background-color: white
nav.navbar
- background-color: white
.navbar-header
+media-xs
width: 100%
- .navbar-brand
- color: $color-text
-
- li a.navbar-item
- color: $color-text
- &:hover
- color: black
- &:focus
- color: black
- &.active
- color: black
- .dropdown.open
- a
- background-color: white
- .dropdown.libraries
- &:hover
- background: none
- ul.dropdown-menu
- background-color: white
- li
- a
- color: $color-text
- &:hover
- color: black
- background-color: white
- .navbar-container
- +container-behavior
-
.navbar-toggle
border: none
color: $color-text
@@ -57,11 +98,11 @@ nav.navbar
.node-details-container
max-width: 620px
- font-family: $font-body
font-size: 1.3em
line-height: 1.5em
margin: 0 auto 40px auto
padding-bottom: 40px
+
+media-xs
padding-left: 10px
padding-right: 10px
@@ -106,20 +147,10 @@ section
border-top: thin solid $color-background
margin: 0 auto
-a.btn
- margin: 20px auto
- font-size: 1.3em
- padding: 9px 18px
- border-radius: 8px
- color: $color-text-dark
-
.navbar-secondary
max-width: 620px
margin: 0 auto
- .navbar-container
- border-bottom: 1px solid #dddddd
-
.navbar-collapse
padding-left: 0
diff --git a/src/templates/_macros/_navigation.pug b/src/templates/_macros/_navigation.pug
new file mode 100644
index 0000000..46290fe
--- /dev/null
+++ b/src/templates/_macros/_navigation.pug
@@ -0,0 +1,26 @@
+include ../mixins/components
+
+| {% macro navigation_tabs(title) %}
++nav-secondary()
+ +nav-secondary-link(
+ class="{% if title == 'homepage' %}active{% endif %}",
+ href="{{ url_for('main.homepage') }}")
+ | Activity
+
+ +nav-secondary-link(
+ class="{% if title == 'home' %}active{% endif %}",
+ href="{{ url_for('projects.home_project') }}")
+ | Home
+
+ +nav-secondary-link(
+ class="{% if title == 'dashboard' %}active{% endif %}",
+ href="{{ url_for('projects.index') }}")
+ | My Projects
+
+ | {% if current_user.has_organizations() %}
+ +nav-secondary-link(
+ class="{% if title == 'organizations' %}active{% endif %}",
+ href="{{ url_for('pillar.web.organizations.index') }}")
+ | My Organizations
+ | {% endif %}
+| {% endmacro %}
diff --git a/src/templates/homepage.pug b/src/templates/homepage.pug
index 485255c..ca4eba8 100644
--- a/src/templates/homepage.pug
+++ b/src/templates/homepage.pug
@@ -18,238 +18,229 @@ meta(property="og:image", content="{% if main_project.picture_header %}{{ main_p
meta(name="twitter:image", content="{% if main_project.picture_header %}{{ main_project.picture_header.thumbnail('l', api=api) }}{% else %}{{ url_for('static', filename='assets/img/backgrounds/background_agent327_04.jpg')}}{% endif %}")
| {% endblock %}
+| {% block navigation_tabs %}
+| {{ navigation_tabs(title) }}
+| {% endblock navigation_tabs %}
+
| {% block body %}
-.dashboard-container
- section.dashboard-main
+.container-fluid.dashboard-container.imgs-fluid
+ .row
+ .col-md-8
+ section.blog
+ ul.list-unstyled
+ | {% if latest_posts %}
+ | {% for node in latest_posts %}
+ | {{ render_blog_post(node) }}
+ | {% endfor %}
+ | {% else %}
+ li
+ | No blog entries... yet!
+ | {% endif %}
- section.blog-stream
- ul.blog-stream__list
- | {% if latest_posts %}
- | {% for node in latest_posts %}
- | {{ render_blog_post(node) }}
- | {% endfor %}
- | {% else %}
- li
- .blog-stream__list-details
- ul.meta
- li.when No blog entries... yet!
- | {% endif %}
+ .d-block.text-center
+ a.d-inline-block.p-3.text-muted(href="{{ url_for('main.main_blog') }}")
+ | See All Blog Posts
- .more
- a(href="{{ url_for('main.main_blog') }}")
- | See All Blog Posts
+ a.d-inline-block.p-3.text-muted(
+ href="{{ url_for('main.feeds_blogs') }}",
+ title="Blogs Feed",
+ data-toggle="tooltip",
+ data-placement="left")
+ i.pi-rss
+ | RSS Feed
- a.feed(
- href="{{ url_for('main.feeds_blogs') }}",
- title="Blogs Feed",
- data-toggle="tooltip",
- data-placement="left")
- i.pi-rss
+ .col-md-4
+ .dashboard-sidebar
+ section.pt-3
+ h6.title-underline In Production
+ a(href="/p/spring/")
+ img(src="{{ url_for('static', filename='assets/img/projects/spring_450x150.jpg')}}")
+ p.text-muted.pt-2.
+ A poetic short film about a mountain spirit and her wise little dog. #[a(href="/p/spring/") Check it out].
- section.dashboard-secondary
- | {{ navigation_tabs(title) }}
+ section.stream.py-3
+ h6.title-underline Latest Assets
- section.dashboard-in-production
- h4 In Production
- span.section-lead.
- Check out these projects currently in production!
-
- a.in-production-project(href="/p/spring/")
- img(src="{{ url_for('static', filename='assets/img/projects/spring_450x150.jpg')}}")
- p.
- #[strong Spring] - A poetic short film about a mountain spirit and her wise little dog.
-
- a.in-production-project(href="/p/hero/")
- img(src="{{ url_for('static', filename='assets/img/projects/hero_450x150.jpg')}}")
- p.
- #[strong Hero] - A '2D' trailer-style movie focused on getting grease pencil
- production ready for Blender 2.8.
-
- section.stream
-
- h4 Latest Assets
-
- ul.activity-stream__list
- | {% for n in activity_stream %}
- li(
- class="{{ n.node_type }} {{ n.properties.content_type }} {% if n.picture %}with-picture{% endif %}",
- data-url="{{ n.url }}")
- a.activity-stream__list-thumbnail(
- class="{{ n.properties.content_type }}",
- href="{{ n.url }}")
- | {% if n.picture %}
- img(src="{{ n.picture.thumbnail('m', api=api) }}")
- | {% endif %}
-
- .activity-stream__list-thumbnail-icon
- | {% if n.node_type == 'asset' %}
- | {% if n.properties.content_type == 'video' %}
- i.pi-play
- | {% elif n.properties.content_type == 'image' %}
- i.pi-picture
- | {% elif n.properties.content_type == 'file' %}
- i.pi-file-archive
- | {% else %}
- i.pi-folder
- | {% endif %}
- | {% endif %}
-
-
- .activity-stream__list-details
- a.title(href="{{ n.url }}")
- | {{ n.name }}
-
- | {% if n.permissions.world %}
- .ribbon
- span free
- | {% endif %}
- ul.meta
- | {% if not n.picture %}
- li.when
- a(href="{{ n.url }}", title="{{ n._created }}") {{ n._created | pretty_date_time }}
- li.who {{ n.user.full_name }}
- | {% endif %}
-
- | {% if n.attached_to %}
- li.where-parent
- a(href="{{ n.attached_to.url }}") {{ n.attached_to.name }}
- | {% endif %}
- li.where-project
- a.project(href="{{ url_for('projects.view', project_url=n.project.url) }}") {{ n.project.name }}
- li.what
- | {% if n.node_type == 'asset' %}
- | {{ n.properties.content_type | undertitle }}
+ ul.activity-stream__list.list-unstyled
+ | {% for n in activity_stream %}
+ li(
+ class="{{ n.node_type }} {{ n.properties.content_type }} {% if n.picture %}with-picture{% endif %}",
+ data-url="{{ n.url }}")
+ a.activity-stream__list-thumbnail(
+ class="{{ n.properties.content_type }}",
+ href="{{ n.url }}")
+ | {% if n.picture %}
+ img(src="{{ n.picture.thumbnail('m', api=api) }}")
| {% endif %}
- | {% if n.picture %}
- ul.meta.extra
- li.when
- a(href="{{ n.url }}", title="{{ n._created }}") {{ n._created | pretty_date_time }}
- li.who {{ n.user.full_name }}
- | {% endif %}
- | {% endfor %}
-
- li.activity-stream__list-item.empty#activity-stream__empty
- | No items to list.
+ .activity-stream__list-thumbnail-icon
+ | {% if n.node_type == 'asset' %}
+ | {% if n.properties.content_type == 'video' %}
+ i.pi-play
+ | {% elif n.properties.content_type == 'image' %}
+ i.pi-picture
+ | {% elif n.properties.content_type == 'file' %}
+ i.pi-file-archive
+ | {% else %}
+ i.pi-folder
+ | {% endif %}
+ | {% endif %}
- section.random-asset
- h4
- a(href="/search") Explore the Cloud
- span.section-lead Random selection of the best assets & tutorials
+ .activity-stream__list-details
+ a.title(href="{{ n.url }}")
+ | {{ n.name }}
- ul.random-asset__list
- | {% for n in random_featured %}
- | {% if n.picture and loop.first %}
- li.random-asset__list-item.project
- | {% if n.project.picture_square %}
- a.random-asset__list-thumbnail(
- href="{{ n.project.url }}")
- img.image(src="{{ n.project.picture_square.thumbnail('s', api=api) }}")
- | {% endif %}
- .random-asset__list-details
- a.title(href="{{ n.project.url }}") {{ n.project.name }}
- | {% if n.project.summary %}
- ul.meta
- li.what
- a(href="{{ n.project.url }}") {{ n.project.summary }}
- | {% endif %}
+ | {% if n.permissions.world %}
+ .ribbon
+ span free
+ | {% endif %}
+ ul.list-unstyled.d-flex.text-muted
+ | {% if not n.picture %}
+ li.when
+ a(href="{{ n.url }}", title="{{ n._created }}") {{ n._created | pretty_date_time }}
+ li.who {{ n.user.full_name }}
+ | {% endif %}
- li.random-asset__list-item.featured
- | {% if n.permissions.world %}
- .ribbon
- span free
- | {% endif %}
- a.random-asset__thumbnail(
- href="{{ n.url }}",
- class="{{ n.properties.content_type }}")
- | {% if n.picture %}
- img(src="{{ n.picture.thumbnail('l', api=api) }}")
+ | {% if n.attached_to %}
+ li.where-parent
+ a(href="{{ n.attached_to.url }}") {{ n.attached_to.name }}
+ | {% endif %}
+ li.where-project
+ a.project(href="{{ url_for('projects.view', project_url=n.project.url) }}") {{ n.project.name }}
+ li.what
+ | {% if n.node_type == 'asset' %}
+ | {{ n.properties.content_type | undertitle }}
+ | {% endif %}
- | {% if n.properties.content_type == 'video' %}
- i.pi-play
- | {% endif %}
+ | {% if n.picture %}
+ ul.list-unstyled.d-flex.text-muted.extra
+ li.when
+ a(href="{{ n.url }}", title="{{ n._created }}") {{ n._created | pretty_date_time }}
+ li.who {{ n.user.full_name }}
+ | {% endif %}
+ | {% endfor %}
- | {% endif %}
+ li.activity-stream__list-item.empty#activity-stream__empty
+ | No items to list.
- a.title(href="{{ n.url }}")
- | {{ n.name }}
- ul.meta
- li.what
- a(href="{{ n.url }}")
- | {% if n.properties.content_type %}{{ n.properties.content_type | undertitle }}{% else %}Folder{% endif %}
- li.where
- a(href="{{ n.project.url }}")
- | {{ n.project.name }}
- | {% else %}
- li
- | {% if n.permissions.world %}
- .ribbon
- span free
- | {% endif %}
- a.random-asset__list-thumbnail(
- href="{{ n.url }}",
- class="{{ n.properties.content_type }}")
- | {% if n.picture %}
- img.image(src="{{ n.picture.thumbnail('s', api=api) }}")
+ section.random-asset.py-3
+ h6.title-underline
+ a(href="/search") Explore the Cloud
+ .pb-3.text-muted Random selection of the best assets & tutorials
+
+ ul.random-asset__list.list-unstyled
+ | {% for n in random_featured %}
+ | {% if n.picture and loop.first %}
+ li.random-asset__list-item.project
+ | {% if n.project.picture_square %}
+ a.random-asset__list-thumbnail(
+ href="{{ n.project.url }}")
+ img.image(src="{{ n.project.picture_square.thumbnail('s', api=api) }}")
+ | {% endif %}
+ .random-asset__list-details
+ a.title(href="{{ n.project.url }}") {{ n.project.name }}
+ | {% if n.project.summary %}
+ ul.list-unstyled.d-flex.text-muted
+ li.what
+ a(href="{{ n.project.url }}") {{ n.project.summary }}
+ | {% endif %}
+
+ li.random-asset__list-item.featured
+ | {% if n.permissions.world %}
+ .ribbon
+ span free
+ | {% endif %}
+ a.random-asset__thumbnail(
+ href="{{ n.url }}",
+ class="{{ n.properties.content_type }}")
+ | {% if n.picture %}
+ img(src="{{ n.picture.thumbnail('l', api=api) }}")
+
+ | {% if n.properties.content_type == 'video' %}
+ i.pi-play
+ | {% endif %}
+
+ | {% endif %}
+
+ a.title(href="{{ n.url }}")
+ | {{ n.name }}
+ ul.list-unstyled.d-flex.text-muted
+ li.what
+ a(href="{{ n.url }}")
+ | {% if n.properties.content_type %}{{ n.properties.content_type | undertitle }}{% else %}Folder{% endif %}
+ li.where
+ a(href="{{ n.project.url }}")
+ | {{ n.project.name }}
| {% else %}
- | {% if n.properties.content_type == 'video' %}
- i.pi-film-thick
- | {% elif n.properties.content_type == 'image' %}
- i.pi-picture
- | {% elif n.properties.content_type == 'file' %}
- i.pi-file-archive
+
+ li
+ | {% if n.permissions.world %}
+ .ribbon
+ span free
+ | {% endif %}
+ a.random-asset__list-thumbnail(
+ href="{{ n.url }}",
+ class="{{ n.properties.content_type }}")
+ | {% if n.picture %}
+ img.image(src="{{ n.picture.thumbnail('s', api=api) }}")
+ | {% else %}
+ | {% if n.properties.content_type == 'video' %}
+ i.pi-film-thick
+ | {% elif n.properties.content_type == 'image' %}
+ i.pi-picture
+ | {% elif n.properties.content_type == 'file' %}
+ i.pi-file-archive
+ | {% else %}
+ i.pi-folder
+ | {% endif %}
+ | {% endif %}
+ .random-asset__list-details
+ a.title(href="{{ n.url }}") {{ n.name }}
+ ul.list-unstyled.d-flex.text-muted
+ li.what
+ a(href="{{ n.url }}")
+ | {% if n.properties.content_type %}{{ n.properties.content_type }}{% else %}Folder{% endif %}
+ li.where
+ a(href="{{ n.project.url }}") {{ n.project.name }}
+
+ | {% endif %}
+ | {% endfor %}
+
+
+ section.comments.py-3
+ h6.title-underline Latest Comments
+
+ ul.list-unstyled
+ | {% if latest_comments %}
+ | {% for n in latest_comments %}
+ li(
+ class="{{ n.node_type }}",
+ data-url="{{ n.url }}")
+
+ a.comment-content(href="{{ n.url }}")
+ | {{ n.properties.content | striptags | truncate(200) }}
+
+ ul.list-unstyled.d-flex.text-muted
+ li.who {{ n.user.full_name }}
+ | {% if n.attached_to %}
+
+ li.where-parent
+ a(href="{{ n.attached_to.url }}") {{ n.attached_to.name }}
+ | {% endif %}
+
+ li.when
+ a(href="{{ n.url }}", title="{{ n._created }}")
+ | {{ n._created | pretty_date_time }}
+ | {% endfor %}
+
| {% else %}
- i.pi-folder
+ li.activity-stream__list-item.empty#activity-stream__empty
+ | No comments... yet!
+
| {% endif %}
- | {% endif %}
- .random-asset__list-details
- a.title(href="{{ n.url }}") {{ n.name }}
- ul.meta
- li.what
- a(href="{{ n.url }}")
- | {% if n.properties.content_type %}{{ n.properties.content_type }}{% else %}Folder{% endif %}
- li.where
- a(href="{{ n.project.url }}") {{ n.project.name }}
-
- | {% endif %}
- | {% endfor %}
-
-
- section.comments
-
- h4 Latest Comments
-
- ul
- | {% if latest_comments %}
- | {% for n in latest_comments %}
- li(
- class="{{ n.node_type }}",
- data-url="{{ n.url }}")
-
- a.comment-content(href="{{ n.url }}")
- | {{ n.properties.content | striptags | truncate(200) }}
-
- ul.meta
- li.who {{ n.user.full_name }}
- | {% if n.attached_to %}
-
- li.where-parent
- a(href="{{ n.attached_to.url }}") {{ n.attached_to.name }}
- | {% endif %}
-
- li.when
- a(href="{{ n.url }}", title="{{ n._created }}")
- | {{ n._created | pretty_date_time }}
- | {% endfor %}
-
- | {% else %}
- li.activity-stream__list-item.empty#activity-stream__empty
- | No comments... yet!
-
- | {% endif %}
| {% endblock %}
diff --git a/src/templates/layout.pug b/src/templates/layout.pug
index 82c69ed..5281f75 100644
--- a/src/templates/layout.pug
+++ b/src/templates/layout.pug
@@ -3,7 +3,7 @@ html(lang="en")
head
meta(charset="utf-8")
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="author", content="Blender Institute")
meta(name="theme-color", content="#3e92aa")
@@ -46,14 +46,10 @@ html(lang="en")
link(href="{{ url_for('static', filename='assets/img/favicon.png') }}", rel="shortcut icon")
link(href="{{ url_for('static', filename='assets/img/apple-touch-icon-precomposed.png') }}", rel="icon apple-touch-icon-precomposed", sizes="192x192")
- link(href="{{ url_for('static_pillar', filename='assets/css/vendor/bootstrap.min.css') }}", rel="stylesheet")
- link(href="{{ url_for('static', filename='assets/google-font-roboto/roboto.css') }}", rel="stylesheet")
-
| {% block head %}{% endblock %}
| {% 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/base.css') }}", rel="stylesheet")
| {% if title == 'blog' %}
link(href="{{ url_for('static_pillar', filename='assets/css/blog.css') }}", rel="stylesheet")
| {% else %}
@@ -61,216 +57,331 @@ html(lang="en")
| {% endif %}
| {% endblock css %}
-
- | {% if not title %}{% set title="default" %}{% endif %}
-
+ | {% if not title %}{% set title="default" %}{% endif %}
body(class="{{ title }}")
- .container-page
- | {% with messages = get_flashed_messages(with_categories=True) %}
- | {% if messages %}
+ | {% with messages = get_flashed_messages(with_categories=True) %}
+ | {% if messages %}
+ | {% for (category, message) in messages %}
+ .alert(role="alert", class="alert-{{ category }}")
+ i.alert-icon(class="{{ category }}")
+ span {{ message }}
+ button.close(type="button", data-dismiss="alert")
+ i.pi-cancel
+ | {% endfor %}
+ | {% endif %}
+ | {% endwith %}
- | {% for (category, message) in messages %}
- .alert(role="alert", class="alert-{{ category }}")
- i.alert-icon(class="{{ category }}")
- span {{ message }}
- button.close(type="button", data-dismiss="alert")
- i.pi-cancel
- | {% endfor %}
+ nav.navbar.navbar-expand-md.fixed-top.bg-white
+ a.navbar-brand(
+ href="{{ url_for('main.homepage') }}",
+ title="Blender Cloud")
+ span.app-logo
+ i.pi-blender-cloud
- | {% endif %}
- | {% endwith %}
+ 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
- nav.navbar
- .navbar-container
- 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(
- href="{{ url_for('main.homepage') }}",
- title="Blender Cloud")
- span.app-logo
- i.pi-blender-cloud
+ | {% block navigation_tabs %}
+ | {% endblock navigation_tabs %}
- | {% block navigation_search %}
- .search-input
- input#cloud-search(
- type="text",
- placeholder="Search assets, tutorials...")
- i.search-icon.pi-search
- | {% endblock navigation_search %}
+ | {% block navigation_search %}
+ // TODO (pablo) - bring it back asap
+ .search-input
+ input#cloud-search(
+ type="text",
+ placeholder="Search assets, tutorials...")
+ i.search-icon.pi-search
+ | {% endblock navigation_search %}
- nav.collapse.navbar-collapse
- ul.nav.navbar-nav.navbar-right
- | {% if node and node.properties and node.properties.category %}
- | {% set category = node.properties.category %}
- | {% else %}
- | {% set category = title %}
- | {% endif %}
+ .collapse.navbar-collapse
+ ul.navbar-nav.ml-auto
+ | {% if node and node.properties and node.properties.category %}
+ | {% set category = node.properties.category %}
+ | {% else %}
+ | {% set category = title %}
+ | {% endif %}
- | {% block navigation_sections %}
+ | {% block navigation_sections %}
+ li
+ a.navbar-item(
+ href="{{ url_for('main.main_blog') }}",
+ title="Blender Cloud Blog",
+ data-toggle="tooltip",
+ data-placement="bottom",
+ class="{% if category == 'blog' %}active{% endif %}")
+ span Blog
+
+ li.dropdown
+ a.navbar-item.dropdown-toggle(
+ href="",
+ data-toggle="dropdown",
+ title="Libraries")
+ span Libraries
+ i.pi-angle-down
+
+ ul.dropdown-menu.p-0
li
a.navbar-item(
- href="{{ url_for('main.main_blog') }}",
- title="Blender Cloud Blog",
+ href="{{ url_for('projects.view', project_url='hdri') }}",
+ title="HDRI Library",
data-toggle="tooltip",
- data-placement="bottom",
- class="{% if category == 'blog' %}active{% endif %}")
- span Blog
-
- li(class="dropdown libraries")
- a.navbar-item.dropdown-toggle(
- href="",
- data-toggle="dropdown",
- title="Libraries")
- span Libraries
- i.pi-angle-down
-
- ul.dropdown-menu
- li
- a.navbar-item(
- href="{{ url_for('projects.view', project_url='hdri') }}",
- title="HDRI Library",
- data-toggle="tooltip",
- data-placement="left")
- i.pi-globe
- | HDRI
- li
- a.navbar-item(
- href="{{ url_for('projects.view', project_url='textures') }}",
- title="Textures Library",
- data-toggle="tooltip",
- data-placement="left")
- i.pi-folder-texture
- | Textures
- li
- a.navbar-item(
- href="{{ url_for('projects.view', project_url='characters') }}",
- title="Character Library",
- data-toggle="tooltip",
- data-placement="left")
- i.pi-character
- | Characters
-
-
- li(class="dropdown libraries")
- a.navbar-item.dropdown-toggle(
- href="",
- data-toggle="dropdown",
- title="Training")
- span Training
- i.pi-angle-down
-
- ul.dropdown-menu
- li
- a.navbar-item(
- href="{{ url_for('cloud.courses') }}",
- title="Courses",
- data-toggle="tooltip",
- data-placement="left")
- i.pi-graduation-cap
- | Courses
- li
- a.navbar-item(
- href="{{ url_for('cloud.workshops') }}",
- title="Workshops",
- data-toggle="tooltip",
- data-placement="left")
- i.pi-lightbulb
- | Workshops
- li
- a.navbar-item(
- href="{{ url_for('projects.view', project_url='gallery') }}",
- title="Curated artwork collection",
- data-toggle="tooltip",
- data-placement="left")
- i.pi-image
- | Art Gallery
-
+ data-placement="left")
+ i.pi-globe
+ | HDRI
li
a.navbar-item(
- href="{{ url_for('cloud.open_projects') }}",
- title="Browse all the Open Projects",
+ href="{{ url_for('projects.view', project_url='textures') }}",
+ title="Textures Library",
data-toggle="tooltip",
- data-placement="bottom",
- class="{% if category in ['open-projects', 'film'] %}active{% endif %}")
- span Open Projects
+ data-placement="left")
+ i.pi-folder-texture
+ | Textures
li
a.navbar-item(
- href="{{ url_for('cloud.services') }}",
- title="Blender Cloud Services",
+ href="{{ url_for('projects.view', project_url='characters') }}",
+ title="Character Library",
data-toggle="tooltip",
- data-placement="bottom",
- class="{% if category == 'services' %}active{% endif %}")
- span Services
- | {% endblock navigation_sections %}
+ data-placement="left")
+ i.pi-character
+ | Characters
- | {% if current_user.is_anonymous %}
+ li(class="dropdown")
+ a.navbar-item.dropdown-toggle(
+ href="{{ url_for('cloud.workshops') }}"
+ data-toggle="dropdown",
+ title="Training")
+ span Training
+ i.pi-angle-down
+
+ ul.dropdown-menu
li
a.navbar-item(
- href="https://store.blender.org/product/membership/",
- title="Sign up") Sign up
- | {% endif %}
+ href="{{ url_for('cloud.courses') }}",
+ title="Courses",
+ data-toggle="tooltip",
+ data-placement="left")
+ i.pi-graduation-cap
+ | Courses
+ li
+ a.navbar-item(
+ href="{{ url_for('cloud.workshops') }}",
+ title="Workshops",
+ data-toggle="tooltip",
+ data-placement="left")
+ i.pi-lightbulb
+ | Workshops
+ li
+ a.navbar-item(
+ href="{{ url_for('projects.view', project_url='gallery') }}",
+ title="Curated artwork collection",
+ data-toggle="tooltip",
+ data-placement="left")
+ i.pi-image
+ | Art Gallery
+ li(class="dropdown")
+ a.navbar-item.dropdown-toggle(
+ href="{{ url_for('cloud.open_projects') }}",
+ title="Browse all the Open Projects",
+ data-toggle="dropdown",
+ class="{% if category in ['open-projects', 'film'] %}active{% endif %}")
+ span Open Projects
+ i.pi-angle-down
- | {% block navigation_user %}
+ ul.dropdown-menu
+ li
+ a.navbar-item(href="/p/spring")
+ span.px-2 Spring
+ li
+ a.navbar-item(href="/p/hero")
+ span.px-2 Hero
+ li
+ a.navbar-item(href="/p/dailydweebs")
+ span.px-2 The Daily Dweebs
+ li
+ a.navbar-item(href="/p/agent-327")
+ span.px-2 Agent 327
+ li
+ a.navbar-item(href="/p/caminandes-3")
+ span.px-2 Caminandes: Llamigos
- | {% include 'menus/notifications.html' %}
- | {% include 'menus/user.html' %}
+ li.dropdown-divider
- | {% endblock navigation_user %}
+ li
+ a.navbar-item(href="{{ url_for('cloud.open_projects') }}")
+ span.pl-2 All Open Projects
+ li(class="dropdown")
+ a.navbar-item.dropdown-toggle(
+ href="{{ url_for('cloud.services') }}",
+ title="Blender Cloud Services",
+ data-toggle="dropdown",
+ class="{% if category == 'services' %}active{% endif %}")
+ span Services
+ i.pi-angle-down
- .page-content
- #search-overlay
- | {% block page_overlay %}
- #page-overlay
- | {% endblock page_overlay %}
- .page-body
- | {% block body %}{% endblock %}
+ ul.dropdown-menu
+ li
+ a.navbar-item(
+ href="/attract",
+ title="Production Management",
+ data-toggle="tooltip",
+ data-placement="left")
+ i.pi-attract
+ | Attract
+ li
+ a.navbar-item(
+ href="/flamenco",
+ title="Render Management",
+ data-toggle="tooltip",
+ data-placement="left")
+ i.pi-flamenco
+ | Flamenco
+
+ li
+ a.navbar-item(
+ href="/services#blender-cloud-add-on",
+ title="Blender Sync, Texture Browser and more",
+ data-toggle="tooltip",
+ data-placement="left")
+ i.pi-blender
+ | Blender Cloud Add-on
+
+ li.dropdown-divider
+
+ li
+ a.navbar-item(
+ href="{{ url_for('cloud.services') }}",
+ title="All Blender Cloud services",
+ data-toggle="tooltip",
+ data-placement="left")
+ i.pi-list
+ | All Services
+
+ | {% endblock navigation_sections %}
+
+ | {% block navigation_user %}
+ | {% include 'menus/notifications.html' %}
+ | {% include 'menus/user.html' %}
+ | {% endblock navigation_user %}
+
+ | {% if current_user.is_anonymous %}
+ li.pt-1
+ a.btn.btn-sm.btn-primary.px-3.mx-1(
+ href="https://store.blender.org/product/membership/",
+ title="Sign up") Sign up
+ | {% endif %}
+
+ .page-content
+ #search-overlay
+ | {% block page_overlay %}
+ #page-overlay
+ | {% endblock page_overlay %}
+ .page-body
+ | {% block body %}{% endblock %}
| {% block footer_container %}
- #footer-container
+ .footer-wrapper
| {% block footer_navigation %}
- #footer-navigation
+ .footer-navigation
.container
.row
.col-md-4.col-xs-6
- .footer-support
- h4 Support & Feedback
- p.
- 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
- ul.footer-social
- li
- a(href="https://www.facebook.com/BlenderCloudOfficial/",
- title="Follow us on Facebook")
- i.pi-social-facebook
- li
- a(href="https://twitter.com/Blender_Cloud",
- title="Follow us on Twitter")
- i.pi-social-twitter
-
- .col-md-2.col-xs-6
h4
a(href="{{ url_for('main.homepage') }}")
- | Blender Cloud
- ul.footer-links
+ i.pi-blender-cloud-logo
+
+ p.pl-2.
+ Blender Cloud is the creative hub for your projects,
+ powered by Free and Open Source Software.
+
+ h5.d-flex
+ a.px-2(href="https://twitter.com/Blender_Cloud",
+ title="Follow us on Twitter")
+ i.pi-social-youtube
+
+ a.px-2(href="https://twitter.com/Blender_Cloud",
+ title="Follow us on 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
+ h7.font-weight-bold
+ | TRAINING
+
+ 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
a(href="{{ url_for('main.main_blog') }}",
title="Blender Cloud Blog")
- | Blog
+ | HDRIs
li
a(href="{{ url_for('cloud.services') }}",
title="Blender Cloud Services")
- | Services
+ | Textures
li
a(href="{{ url_for('cloud.about') }}",
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
a(href="{{ url_for('cloud.terms_and_conditions') }}",
title="Terms and Conditions")
@@ -279,33 +390,11 @@ html(lang="en")
a(href="{{ url_for('cloud.privacy') }}",
title="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 Opening ' + item_type + ' failed. There possibly was ' +
+ 'an error connecting to the server. Please check your network connection and ' +
+ 'try again.
');
+ }
+ });
+
+ // Determine whether we should push the new state or not.
+ pushState = (typeof pushState !== 'undefined') ? pushState : true;
+ if (!pushState) return;
+
+ // Push the correct URL onto the history.
+ var push_state = {itemId: item_id};
+
+ window.history.pushState(
+ push_state,
+ 'Organization: ' + item_id,
+ item_url
+ );
+ }
+
+ $('li.projects__list-item').click(function(e){
+ url = $(this).data('url');
+ if (typeof url === 'undefined') return;
+
+ window.location.href = url;
+ if (console) console.log(url);
+
+ $(this).addClass('active');
+ $(this).find('.projects__list-thumbnail i')
+ .removeAttr('class')
+ .addClass('pi-spin spin');
+ });
+
+
+ {% if open_organization_id %}
+ $(function() { item_open('{{ open_organization_id }}', false); });
+ {% endif %}
+
+ {% if can_create_organization %}
+ function createNewOrganization(button) {
+ $(button)
+ .attr('disabled', 'disabled')
+ .fadeTo(200, 0.1);
+ $('#create_organization_result_panel').html('');
+
+ // TODO: create a form to get the initial info from the user.
+ $.post(
+ '{{ url_for('pillar.web.organizations.create_new') }}',
+ {
+ name: 'New Organization',
+ seat_count: 1,
+ }
+ )
+ .done(function(result) {
+ var $p = $('').text('organization created, reloading list.')
+ $('#create_organization_result_panel').html($p);
+
+ window.location.href = result.location;
+ })
+ .fail(function(err) {
+ var msg = xhrErrorResponseMessage(err);
+ $('#create_organization_result_panel').html('Error creating organization: ' + msg);
+
+ $(button)
+ .fadeTo(1000, 1.0)
+ .queue(function() {
+ $(this)
+ .removeAttr('disabled')
+ .dequeue()
+ ;
+ })
+ })
+ ;
+ return false;
+ }
+ {% endif %}
+| {% endblock %}
diff --git a/src/templates/projects/home_index.pug b/src/templates/projects/home_index.pug
new file mode 100644
index 0000000..610ff0d
--- /dev/null
+++ b/src/templates/projects/home_index.pug
@@ -0,0 +1,59 @@
+| {% extends 'projects/home_layout.html' %}
+| {% set subtab = 'blender_sync' %}
+| {% set learn_more_btn_url = '/blog/introducing-blender-sync' %}
+| {% block currenttab %}
+.container-fluid
+ section.nav-tabs__tab.active#tab-blender_sync
+ .tab_header-container
+ .tab_header-intro(
+ style="background-image: url({{ url_for('static', filename='assets/img/backgrounds/pattern_01.jpg')}})")
+ .tab_header-intro_text
+ h2 Connect Blender with the Cloud
+ p
+ | Save your Blender preferences and keymaps once, load them anywhere.
+ v {{ config.BLENDER_CLOUD_ADDON_VERSION }}
+ .col-md-6
+ a.btn.btn-link(
+ href="{{ learn_more_btn_url }}")
+ | Learn More
+ i.pi-angle-right
+ | {% endif %}
+
+ .tab_header-intro_icons
+ i.pi-blender
+ i.pi-heart-filled
+ i.pi-blender-cloud
+
+ | {% for version in synced_versions %}
+ .blender_sync-main
+ .blender_sync-main-header
+ h5.blender_sync-main-title
+ i.pi-blender
+ | Blender {{ version.version }}
+ .blender_sync-main-last
+ | Last synced on: {{ version.date|pretty_date }}
+ | {% else %}
+ .blender_sync-main.empty
+ .blender_sync-main-header
+ span.blender_sync-main-title
+ | No settings synced yet
+
folder where you want to move it
+ .buttons
+ button#item_move_accept.move.disabled
+ | Select a Folder
+ button#item_move_cancel.cancel
+ i.pi-cancel
+ | Cancel
+
+| {% endblock %}
+
+| {% block footer_container %}{% endblock %}
+
+| {% block footer_scripts_pre %}
+
+| {% if project.has_method('PUT') %}
+| {# JS containing the Edit, Add, Featured, and Move functions #}
+script(type="text/javascript", src="{{ url_for('static_pillar', filename='assets/js/project-edit.min.js') }}")
+| {% endif %}
+
+script.
+ function updateToggleProjHeaderMenuItem() {
+ var $toggle_projheader = $('#item_toggle_projheader');
+
+ if (ProjectUtils.isProject()) {
+ $toggle_projheader.hide();
+ return;
+ }
+ if (ProjectUtils.nodeType() == 'asset') {
+ $toggle_projheader.show();
+ } else {
+ $toggle_projheader.hide();
+ }
+ }
+ $(updateToggleProjHeaderMenuItem);
+
+ // Function to update the interface on loadNodeContent, and edit/saving assets
+ function updateUi(nodeId, mode) {
+
+ if (mode === 'view') {
+ $('.project-mode-view').displayAs('inline-block');
+ $('.project-mode-edit').hide();
+
+ $("#node-edit-form").unbind("submit");
+ $("#item_save").unbind("click");
+ $("#item_cancel").unbind("click");
+ } else if (mode === 'edit') {
+ $('.project-mode-view').hide();
+ $('.project-mode-edit').displayAs('inline-block');
+ } else {
+ if (console) console.log('Invalid mode:', mode);
+ }
+
+ // Prevent flicker by scrolling to top.
+ $("#project_context-container").scrollTop(0);
+
+ // Enable specific items under the Add New dropdown
+ if (ProjectUtils.nodeType() === 'group') {
+ addMenuEnable(['asset', 'group']);
+
+ } else if (ProjectUtils.nodeType() === 'group_texture') {
+ addMenuEnable(['group_texture', 'texture']);
+
+ } else if (ProjectUtils.nodeType() === 'group_hdri') {
+ addMenuEnable(['group_hdri', 'hdri']);
+
+ } else if (!ProjectUtils.isProject()) {
+ addMenuEnable(false);
+ }
+
+ updateToggleProjHeaderMenuItem();
+
+ // Set the page title on the document
+ var page_title = $('#node-title').text() + " - {{ project.name }} — Blender Cloud";
+ DocumentTitleAPI.set_page_title(page_title);
+
+ // TODO: Maybe remove this, now it's also in loadNodeContent(), but double-check
+ // it's done like that in all users of updateUi().
+ $('#project-loading').removeAttr('class');
+ }
+| {% endblock %}
+
+| {% block footer_scripts %}
+script(src="{{ url_for('static_pillar', filename='assets/jstree/jstree.min.js') }}")
+
+script.
+ {% if show_project %}
+ ProjectUtils.setProjectAttributes({projectId: "{{project._id}}", isProject: true, nodeId: ''});
+ {% else %}
+ {% if node %}
+ ProjectUtils.setProjectAttributes({projectId: "{{project._id}}", isProject: false, nodeId: '{{node._id}}'});
+ {% endif %}
+ {% endif %}
+
+ var projectTree = document.getElementById('project_tree');
+
+ var urlNodeMove = "{{url_for('projects.move_node')}}";
+ var urlNodeFeature = "{{url_for('projects.add_featured_node')}}";
+ var urlNodeDelete = "{{url_for('projects.delete_node')}}";
+ var urlNodeTogglePublic = "{{url_for('projects.toggle_node_public')}}";
+ var urlNodeToggleProjHeader = "{{url_for('projects.toggle_node_project_header')}}";
+ var urlProjectDelete = "{{url_for('projects.delete')}}";
+ var urlProjectEdit = "{{url_for('projects.edit', project_url=project.url)}}";
+
+
+ function loadNodeContent(url, nodeId) {
+ $('#project-loading').addClass('active');
+ $.get(url, function(dataHtml) {
+ // Update the DOM injecting the generate HTML into the page
+ $('#project_context').html(dataHtml);
+ })
+ .done(function(){
+ updateUi(nodeId, 'view');
+ })
+ .fail(function(dataResponse) {
+ $('#project_context').html($(''));
+ $('#server_error').attr('src', url);
+ })
+ .always(function(){
+ $('#project-loading').removeAttr('class');
+ $('.button-edit-icon').addClass('pi-edit').removeClass('pi-spin spin');
+ });
+ }
+
+
+ function loadProjectContent(url) {
+ $('#project-loading').addClass('active');
+
+ $.get(url, function(dataHtml) {
+ // Update the DOM injecting the generated HTML into the page
+ $('#project_context').html(dataHtml);
+ })
+ .done(function() {
+ updateUi('', 'view');
+ addMenuEnable();
+ addMenuDisable(['texture']);
+ })
+ .fail(function(dataResponse) {
+ $('#project_context').html($(''));
+ $('#server_error').attr('src', url);
+ })
+ .always(function(){
+ $('#project-loading').removeAttr('class');
+ $('.button-edit-icon').addClass('pi-edit').removeClass('pi-spin spin');
+ });
+ }
+
+
+ function displayStorage(storageNodeId, path) {
+ var url = '/nodes/' + storageNodeId + '/view?path=' + path;
+ loadNodeContent(url);
+ }
+
+
+ function displayNode(nodeId, pushState) {
+ // Remove the 'n_' suffix from the id
+ if (nodeId.substring(0, 2) == 'n_') {
+ nodeId = nodeId.substr(2);
+ }
+
+ var url = '/nodes/' + nodeId + '/view';
+ loadNodeContent(url, nodeId);
+
+ // Determine whether we should push the new state or not.
+ pushState = (typeof pushState !== 'undefined') ? pushState : true;
+ if (!pushState) return;
+
+ // Push the correct URL onto the history.
+ var push_state = {nodeId: nodeId, url: url};
+ var push_url = '{{url_for("projects.view", project_url=project.url)}}' + nodeId;
+ // console.log('Pushing state ', push_state, ' with URL ', push_url);
+ window.history.pushState(
+ push_state,
+ 'Node ' + nodeId, // TODO: use sensible title
+ push_url
+ );
+ }
+
+ function redirectToNode(nodeId) {
+ var generic_url = '{{ url_for("projects.view_node", project_url=project.url, node_id="theNodeId") }}';
+ var node_url = generic_url.replace('theNodeId', nodeId);
+
+ // This makes the user skip the current page when using the 'back' button,
+ // i.e. it works as a proper redirect.
+ location.replace(node_url);
+ }
+
+ window.onpopstate = function(event) {
+ var state = event.state;
+ // console.log('State popped. location:', document.location, 'state:', state);
+
+ // Deselect any selected node. We'll select the visited node (if any) later on.
+ var jstreeAPI = $(projectTree).jstree(true);
+ jstreeAPI.deselect_all(true);
+
+ if (state == null) {
+ // Went back to the project.
+ displayProject();
+ return;
+ }
+
+ // Went back to a node.
+ loadNodeContent(state.url, state.nodeId);
+
+ // Annoying hack because jstreeAPI.select_node() can only suppress the
+ // changed.jstree event, and NOT the selected_node.jstree event.
+ projectTree.dataset.ignoreSelectNode = true;
+ jstreeAPI.select_node('n_' + state.nodeId, true);
+ delete projectTree.dataset.ignoreSelectNode;
+ };
+
+ function displayProject() {
+ var url = "{{url_for('projects.view', project_url=project.url, embed=1)}}";
+ loadProjectContent(url);
+ }
+
+
+ function getHashId() {
+ if (console)
+ console.log('getHashId() should not be used any more!');
+ }
+
+ /* Loaded once, on page load */
+ function loadContent() {
+
+ var nodeId = ProjectUtils.nodeId();
+ var isProject = ProjectUtils.isProject();
+ if (isProject) {
+ // No need to asynchronously load the project, as it's embedded by Jinja.
+ // displayProject() is still needed, though, when people use 'back' to go there.
+ if (location.hash) {
+ // Handle old-style /p/{url}/#node-ID links, and redirect them to the correct spot.
+ redirectToNode(location.hash.substr(1));
+ }
+ $('.project-mode-view').displayAs('inline-block');
+ $('.project-mode-edit').hide();
+ } else {
+ displayNode(nodeId, false);
+ }
+
+ $(projectTree).jstree({
+ 'core': {
+ 'data': function (obj, callback) {
+ if(obj.id === '#') { //tree root
+ if (isProject) {
+ $.getJSON("{{url_for('projects.jstree', project_url=project.url)}}", function (jsonObject) {
+ callback.call(this, jsonObject['items']);
+ });
+ } else {
+ $.getJSON('/nodes/' + nodeId + '/jstree', function(jsonObject) {
+ callback.call(this, jsonObject['items']);
+ });
+ }
+ } else { //normal node
+ var childNodeId;
+ if (obj.original.type == 'group_storage') {
+ childNodeId = obj.original.storage_node;
+ $.getJSON('/nodes/' + childNodeId + '/jstree?children=1&path=' + obj.original.path, function(jsonObject) {
+ callback.call(this, jsonObject.children);
+ });
+ } else {
+ // Remove the 'n_' suffix from the id
+ childNodeId = obj.id.substring(2);
+ $.getJSON('/nodes/' + childNodeId + '/jstree?children=1', function(jsonObject) {
+ callback.call(this, jsonObject.children);
+ });
+ }
+ }
+ }
+ },
+ "types" : {
+ "#": {"valid_children": ["collection"]},
+ "chapter" : {"icon": "pi-folder"},
+ "group" : {"icon": "pi-folder"},
+ "group_texture" : {"icon": "pi-folder-texture"},
+ "group_hdri" : {"icon": "pi-folder-texture", "max_children": 0},
+ "group_storage" : {"icon": "pi-folder"},
+ "filesystem_node" : {"icon": "pi-folder"},
+ "file" : {"icon": "pi-document", "max_children": 0},
+ "filesystem_file" : {"icon": "pi-document", "max_children": 0},
+ "image" : {"icon": "pi-image", "max_children": 0},
+ "hdri" : {"icon": "pi-globe", "max_children": 0},
+ "texture" : {"icon": "pi-texture", "max_children": 0},
+ "video" : {"icon": "pi-play", "max_children": 0},
+ "blog" : {"icon": "pi-newspaper", "max_children": 0},
+ "page" : {"icon": "pi-document-text", "max_children": 0},
+ "default" : {"icon": "pi-document"}
+ },
+ "plugins": ["types",] //, "state", "sort"
+ });
+
+
+ var jstreeAPI = $(projectTree).jstree(true);
+
+ $(projectTree).on("select_node.jstree", function (e, data) {
+ var selectedNodeId = data.node.id.substr(2);
+
+ // Ignore events that can't be suppressed otherwise.
+ // This can be removed if jstreeAPI.select_node() allows suppressing
+ // the select_node.jstree event.
+ if (e.target.dataset.ignoreSelectNode === 'true') return;
+
+ if (typeof(data.node.original.path) === 'undefined') {
+ var movingMode = Cookies.getJSON('bcloud_moving_node');
+
+ // Check if we are in the process of moving a node
+ if (movingMode) {
+ // Allow moving nodes only inside of node_type group
+ if (data.node.original.type != 'group' || movingMode.node_id === selectedNodeId || movingMode.node_id === ProjectUtils.parentNodeId()) {
+
+ if (movingMode.node_type === 'texture') {
+
+ if (data.node.original.type === 'group_texture') {
+ $('#item_move_accept').html('Blender Cloud add-on ';
+section#blender-cloud-add-on.page-card
+ .page-card-side
+ h2.page-card-title
+ | Blender Cloud add-on
+ .page-card-summary
+ p.
+ The Blender Cloud add-on provides access to most of our services directly within Blender.
+ p.
+ Use the add-on to share images online, submit renders to Flamenco or browse textures and HDRI libraries!
- .navbar-backdrop-overlay
+ hr
- - var addon_text = 'Available through the Blender Cloud add-on '
+ small Blender Cloud add-on requires Blender 2.78 or newer
- #page-content
+ a.btn.btn-outline-success(
+ href="https://cloud.blender.org/r/downloads/blender_cloud-latest-addon.zip")
+ i.pi-download
+ | Download add-on v {{ config.BLENDER_CLOUD_ADDON_VERSION }}
- section#blender-cloud-add-on.page-card
- .page-card-side
- h2.page-card-title
- | Blender Cloud add-on
- .page-card-summary
- p.
- The Blender Cloud add-on provides access to most of our services directly within Blender.
- p.
- Use the add-on to share images online, submit renders to Flamenco or browse textures and HDRI libraries!
+ .page-card-side
+ img(
+ src="{{ url_for('static', filename='assets/img/features/blender_cloud_addon_thumbnail.png')}}")
- hr
+section#blender-sync.page-card.right
+ .page-card-side
+ h2.page-card-title Blender Sync
+ .page-card-summary
+ | Save your settings once. Use them anywhere.
+ | Carry your Blender configuration with you,
+ | use our add-on to sync your keymaps and preferences.
+ hr
+ small Blender Sync is free for everyone! No subscription required.
+ small This add-on requires Blender 2.78 or newer.
- small Blender Cloud add-on requires Blender 2.78 or newer
+ .tip !{addon_text}
a.page-card-cta.download(
- href="/r/downloads/blender_cloud-latest-addon.zip")
+ href="https://cloud.blender.org/r/downloads/blender_cloud-latest-addon.zip")
i.pi-download
| Download add-on v {{ config.BLENDER_CLOUD_ADDON_VERSION }}
- .page-card-side
- img(
- src="{{ url_for('static', filename='assets/img/features/blender_cloud_addon_thumbnail.png')}}")
+ a.page-card-cta(
+ href="https://cloud.blender.org/blog/introducing-blender-sync")
+ | Learn More
- section#blender-sync.page-card.right
- .page-card-side
- h2.page-card-title Blender Sync
- .page-card-summary
- | Save your settings once. Use them anywhere.
- | Carry your Blender configuration with you,
- | use our add-on to sync your keymaps and preferences.
- hr
- small Blender Sync is free for everyone! No subscription required.
- small This add-on requires Blender 2.78 or newer.
+ .page-card-side
+ img(
+ src="{{ url_for('static', filename='assets/img/features/sync_thumbnail.jpg')}}")
- .tip !{addon_text}
+ .tip !{addon_text}
+section#texture-browser.page-card.right
+ .page-card-side
+ h2.page-card-title Texture & HDRI Browser
+ .page-card-summary
+ p.
+ Access the Blender Cloud Textures
+ library from within Blender using our exclusive add-on.
+ Create, manage and share your own texture libraries!
- a.page-card-cta(
- href="/blog/introducing-blender-sync")
- | Learn More
+ .tip !{addon_text}
- .page-card-side
- img(
- src="{{ url_for('static', filename='assets/img/features/sync_thumbnail.jpg')}}")
+ a.btn.btn-outline-success.js-watch-video(
+ href="https://www.youtube.com/watch?v=-srXYv2Osjw",
+ data-youtube-id="-srXYv2Osjw")
+ i.pi-play
+ | Watch Video
+ .page-card-side
+ img(
+ src="{{ url_for('static', filename='assets/img/features/tex_library_thumbnail.jpg')}}")
section#texture-browser.page-card.right
.page-card-side
h2.page-card-title Texture & HDRI Browser
.page-card-summary
p.
- Access the Blender Cloud Textures
+ Access the Blender Cloud Textures
library from within Blender using our exclusive add-on.
Create, manage and share your own texture libraries!
- .tip !{addon_text}
+section#image-sharing.page-card.right
+ .page-card-side
+ h2.page-card-title Image Sharing
+ .page-card-summary
+ | Got a nice render, a Blender oddity, a cool screenshot?
+ | Share it instantly from within Blender to the Cloud, to the world!
- a.page-card-cta.js-watch-video.download(
- href="https://www.youtube.com/watch?v=-srXYv2Osjw",
- data-youtube-id="-srXYv2Osjw")
- i.pi-play
- | Watch Video
+ .tip !{addon_text}
- .page-card-side
- img(
- src="{{ url_for('static', filename='assets/img/features/tex_library_thumbnail.jpg')}}")
+ a.btn.btn-outline-success.js-watch-video(
+ href="https://www.youtube.com/watch?v=yvtqeMBOAyk",
+ data-youtube-id="yvtqeMBOAyk")
+ i.pi-play
+ | Watch Video
+
+ a.page-card-cta.outline(
+ href="https://cloud.blender.org/blog/introducing-image-sharing")
+ | Learn More
+
+ .page-card-side
+ img(
+ src="{{ url_for('static', filename='assets/img/features/image_sharing_thumbnail.jpg')}}")
+
+ .tip !{addon_text}
+
+section#projects.page-card.right
+ .page-card-side
+ h2.page-card-title Private Projects
+ .page-card-summary.
+ Create and manage your own personal projects.
+ Upload assets and collaborate with other Blender Cloud members.
+
+ a.page-card-cta(
+ href="https://cloud.blender.org/blog/introducing-private-projects")
+ | Learn More
+
+ .page-card-side
+ img(
+ src="{{ url_for('static', filename='assets/img/features/projects_thumbnail.jpg')}}")
- section#image-sharing.page-card.right
- .page-card-side
- h2.page-card-title Image Sharing
- .page-card-summary
- | Got a nice render, a Blender oddity, a cool screenshot?
- | Share it instantly from within Blender to the Cloud, to the world!
+section#attract.page-card.right
+ .page-card-side
+ h2.page-card-title
+ | Attract
+ .page-card-summary.
+ Production-management software for your film, game, or commercial projects.
- .tip !{addon_text}
+ a.btn.btn-outline-success.js-watch-video(
+ href="https://www.youtube.com/watch?v=b9x1rlyyt_o",
+ data-youtube-id="b9x1rlyyt_o")
+ i.pi-play
+ | Watch Video
- a.page-card-cta.download.js-watch-video(
- href="https://www.youtube.com/watch?v=yvtqeMBOAyk",
- data-youtube-id="yvtqeMBOAyk")
- i.pi-play
- | Watch Video
-
- a.page-card-cta.outline(
- href="/blog/introducing-image-sharing")
- | Learn More
-
- .page-card-side
- img(
- src="{{ url_for('static', filename='assets/img/features/image_sharing_thumbnail.jpg')}}")
-
-
- section#projects.page-card.right
- .page-card-side
- h2.page-card-title Private Projects
- .page-card-summary.
- Create and manage your own personal projects.
- Upload assets and collaborate with other Blender Cloud members.
-
- a.page-card-cta(
- href="/blog/introducing-private-projects")
- | Learn More
-
- .page-card-side
- img(
- src="{{ url_for('static', filename='assets/img/features/projects_thumbnail.jpg')}}")
+ a.page-card-cta(
+ href="https://cloud.blender.org/blog/attract-and-flamenco-public-beta",
+ title="Learn more about Attract")
+ | Learn More
+ .page-card-side
+ img(
+ src="{{ url_for('static', filename='assets/img/features/attract_thumbnail.jpg')}}")
section#attract.page-card.right
.page-card-side
@@ -155,21 +176,27 @@ meta(name="twitter:image", content="{{ url_for('static', filename='assets/img/ba
.page-card-summary.
Production-management software for your film, game, or commercial projects.
- a.page-card-cta.download.js-watch-video(
- href="https://www.youtube.com/watch?v=b9x1rlyyt_o",
- data-youtube-id="b9x1rlyyt_o")
- i.pi-play
- | Watch Video
+section#flamenco.page-card.right
+ .page-card-side
+ h2.page-card-title
+ | Flamenco
+ .page-card-summary.
+ Take control of your computing infrastructure and get things done.
- a.page-card-cta(
- href="/blog/attract-and-flamenco-public-beta",
- title="Learn more about Attract")
- | Learn More
+ a.btn.btn-outline-success.js-watch-video(
+ href="https://www.youtube.com/watch?v=7cnFKhsM67Q",
+ data-youtube-id="7cnFKhsM67Q")
+ i.pi-play
+ | Watch Video
- .page-card-side
- img(
- src="{{ url_for('static', filename='assets/img/features/attract_thumbnail.jpg')}}")
+ a.page-card-cta(
+ href="https://flamenco.io",
+ title="Learn more about Flamenco")
+ | Learn More
+ .page-card-side
+ img(
+ src="{{ url_for('static', filename='assets/img/features/flamenco_thumbnail.jpg')}}")
section#flamenco.page-card.right
.page-card-side
@@ -178,46 +205,33 @@ meta(name="twitter:image", content="{{ url_for('static', filename='assets/img/ba
.page-card-summary.
Take control of your computing infrastructure and get things done.
- a.page-card-cta.download.js-watch-video(
- href="https://www.youtube.com/watch?v=7cnFKhsM67Q",
- data-youtube-id="7cnFKhsM67Q")
- i.pi-play
- | Watch Video
+| {% if not current_user.has_role('subscriber') %}
+section.page-card(
+ style="background-image: url({{ url_for('static', filename='assets/img/backgrounds/pattern_01.jpg')}})")
+ .page-card-side
- a.page-card-cta(
- href="https://flamenco.io",
- title="Learn more about Flamenco")
- | Learn More
+ h2.page-card-title
+ | All of this, plus hours of training and production assets.
- .page-card-side
- img(
- src="{{ url_for('static', filename='assets/img/features/flamenco_thumbnail.jpg')}}")
+ .page-card-summary.text-white
+ | Join us for only $9.90/month!
-
- | {% if not current_user.has_role('subscriber') %}
- section.page-card.subscribe(
- style="background-image: url({{ url_for('static', filename='assets/img/backgrounds/pattern_01.jpg')}})")
- .page-card-side
- h2.page-card-title
- | All of this, plus hours of training and production assets.
- .page-card-summary
- | Join us for only $9.90/month!
- a.page-card-cta(
- href="https://store.blender.org/product/membership/")
- | Subscribe Now
- | {% endif %}
+ a.page-card-cta(href="https://store.blender.org/product/membership/")
+ | Subscribe Now
+| {% endif %}
| {% endblock %}
| {% block footer_scripts %}
script.
- // Click anywhere in the page to hide the overlay
+ // Hide the video overlay.
function hideOverlay() {
$('#page-overlay.video').removeClass('active');
$('#page-overlay.video .video-embed').html('');
}
+ // Click anywhere in the page or hit Esc to hide the overlay.
$(document).click(function() {
hideOverlay();
});
@@ -229,12 +243,12 @@ script.
});
$('a.js-watch-video').click(function(e){
+ var videoId = $(this).attr('data-youtube-id');
+
e.preventDefault();
e.stopPropagation();
$('#page-overlay.video').addClass('active');
-
- var videoId = $(this).attr('data-youtube-id');
$('#page-overlay .video-embed').html('VIDEO ')
});
diff --git a/src/templates/users/settings/billing.pug b/src/templates/users/settings/billing.pug
index befe663..2c50f16 100644
--- a/src/templates/users/settings/billing.pug
+++ b/src/templates/users/settings/billing.pug
@@ -65,7 +65,7 @@ p Your organisation provides you with your subscription.
hr
p
- button#recheck_subscription.btn.btn-default(onclick="javascript:recheck_subscription(this)") Re-check my subscription
+ button#recheck_subscription.btn.btn-outline-secondary(onclick="javascript:recheck_subscription(this)") Re-check my subscription
hr
diff --git a/src/templates/users/settings/emails.pug b/src/templates/users/settings/emails.pug
index 2411997..cf91972 100644
--- a/src/templates/users/settings/emails.pug
+++ b/src/templates/users/settings/emails.pug
@@ -11,7 +11,7 @@
| {% endfor %}
.buttons
- button.btn.btn-default.button-submit(type='submit')
+ button.btn.btn-outline-success.button-submit(type='submit')
i.pi-check
| Save Changes
| {% endblock %}
diff --git a/src/templates/welcome.pug b/src/templates/welcome.pug
index 62a125d..d9f5ecb 100644
--- a/src/templates/welcome.pug
+++ b/src/templates/welcome.pug
@@ -28,12 +28,12 @@ li
| {% endblock navigation_sections %}
| {% block navigation_user %}
-li.nav-item-sign-in
+li.pt-1.pr-1
| {% if current_user.is_anonymous %}
- a.navbar-item(href="{{ url_for('users.login', next='/') }}")
+ a.btn.btn-outline-success(href="{{ url_for('users.login', next='/') }}")
| Log in and Explore
| {% else %}
- a.navbar-item(href="{{ url_for('main.homepage') }}")
+ a.btn.btn-outline-success(href="{{ url_for('main.homepage') }}")
| Explore
| {% endif %}
| {% endblock navigation_user %}
diff --git a/static/assets/google-font-roboto/-2n2p-_Y08sg57CNWQfKNvesZW2xOQ-xsNqO47m55DA.woff2 b/static/assets/google-font-roboto/-2n2p-_Y08sg57CNWQfKNvesZW2xOQ-xsNqO47m55DA.woff2
deleted file mode 100644
index 870072d..0000000
Binary files a/static/assets/google-font-roboto/-2n2p-_Y08sg57CNWQfKNvesZW2xOQ-xsNqO47m55DA.woff2 and /dev/null differ
diff --git a/static/assets/google-font-roboto/-L14Jk06m6pUHB-5mXQQnRJtnKITppOI_IvcXXDNrsc.woff2 b/static/assets/google-font-roboto/-L14Jk06m6pUHB-5mXQQnRJtnKITppOI_IvcXXDNrsc.woff2
deleted file mode 100644
index 471b519..0000000
Binary files a/static/assets/google-font-roboto/-L14Jk06m6pUHB-5mXQQnRJtnKITppOI_IvcXXDNrsc.woff2 and /dev/null differ
diff --git a/static/assets/google-font-roboto/0eC6fl06luXEYWpBSJvXCBJtnKITppOI_IvcXXDNrsc.woff2 b/static/assets/google-font-roboto/0eC6fl06luXEYWpBSJvXCBJtnKITppOI_IvcXXDNrsc.woff2
deleted file mode 100644
index 83e3cea..0000000
Binary files a/static/assets/google-font-roboto/0eC6fl06luXEYWpBSJvXCBJtnKITppOI_IvcXXDNrsc.woff2 and /dev/null differ
diff --git a/static/assets/google-font-roboto/CWB0XYA8bzo0kSThX0UTuA.woff2 b/static/assets/google-font-roboto/CWB0XYA8bzo0kSThX0UTuA.woff2
deleted file mode 100644
index e44dd20..0000000
Binary files a/static/assets/google-font-roboto/CWB0XYA8bzo0kSThX0UTuA.woff2 and /dev/null differ
diff --git a/static/assets/google-font-roboto/Fcx7Wwv8OzT71A3E1XOAjvesZW2xOQ-xsNqO47m55DA.woff2 b/static/assets/google-font-roboto/Fcx7Wwv8OzT71A3E1XOAjvesZW2xOQ-xsNqO47m55DA.woff2
deleted file mode 100644
index 719f810..0000000
Binary files a/static/assets/google-font-roboto/Fcx7Wwv8OzT71A3E1XOAjvesZW2xOQ-xsNqO47m55DA.woff2 and /dev/null differ
diff --git a/static/assets/google-font-roboto/Fl4y0QdOxyyTHEGMXX8kcRJtnKITppOI_IvcXXDNrsc.woff2 b/static/assets/google-font-roboto/Fl4y0QdOxyyTHEGMXX8kcRJtnKITppOI_IvcXXDNrsc.woff2
deleted file mode 100644
index 2885a7f..0000000
Binary files a/static/assets/google-font-roboto/Fl4y0QdOxyyTHEGMXX8kcRJtnKITppOI_IvcXXDNrsc.woff2 and /dev/null differ
diff --git a/static/assets/google-font-roboto/Hgo13k-tfSpn0qi1SFdUfVtXRa8TVwTICgirnJhmVJw.woff2 b/static/assets/google-font-roboto/Hgo13k-tfSpn0qi1SFdUfVtXRa8TVwTICgirnJhmVJw.woff2
deleted file mode 100644
index 6c94818..0000000
Binary files a/static/assets/google-font-roboto/Hgo13k-tfSpn0qi1SFdUfVtXRa8TVwTICgirnJhmVJw.woff2 and /dev/null differ
diff --git a/static/assets/google-font-roboto/I3S1wsgSg9YCurV6PUkTORJtnKITppOI_IvcXXDNrsc.woff2 b/static/assets/google-font-roboto/I3S1wsgSg9YCurV6PUkTORJtnKITppOI_IvcXXDNrsc.woff2
deleted file mode 100644
index f85eac4..0000000
Binary files a/static/assets/google-font-roboto/I3S1wsgSg9YCurV6PUkTORJtnKITppOI_IvcXXDNrsc.woff2 and /dev/null differ
diff --git a/static/assets/google-font-roboto/NYDWBdD4gIq26G5XYbHsFBJtnKITppOI_IvcXXDNrsc.woff2 b/static/assets/google-font-roboto/NYDWBdD4gIq26G5XYbHsFBJtnKITppOI_IvcXXDNrsc.woff2
deleted file mode 100644
index 83bd25a..0000000
Binary files a/static/assets/google-font-roboto/NYDWBdD4gIq26G5XYbHsFBJtnKITppOI_IvcXXDNrsc.woff2 and /dev/null differ
diff --git a/static/assets/google-font-roboto/NdF9MtnOpLzo-noMoG0miPesZW2xOQ-xsNqO47m55DA.woff2 b/static/assets/google-font-roboto/NdF9MtnOpLzo-noMoG0miPesZW2xOQ-xsNqO47m55DA.woff2
deleted file mode 100644
index 8857742..0000000
Binary files a/static/assets/google-font-roboto/NdF9MtnOpLzo-noMoG0miPesZW2xOQ-xsNqO47m55DA.woff2 and /dev/null differ
diff --git a/static/assets/google-font-roboto/Pru33qjShpZSmG3z6VYwnRJtnKITppOI_IvcXXDNrsc.woff2 b/static/assets/google-font-roboto/Pru33qjShpZSmG3z6VYwnRJtnKITppOI_IvcXXDNrsc.woff2
deleted file mode 100644
index 397bac3..0000000
Binary files a/static/assets/google-font-roboto/Pru33qjShpZSmG3z6VYwnRJtnKITppOI_IvcXXDNrsc.woff2 and /dev/null differ
diff --git a/static/assets/google-font-roboto/ek4gzZ-GeXAPcSbHtCeQI_esZW2xOQ-xsNqO47m55DA.woff2 b/static/assets/google-font-roboto/ek4gzZ-GeXAPcSbHtCeQI_esZW2xOQ-xsNqO47m55DA.woff2
deleted file mode 100644
index e7d54f2..0000000
Binary files a/static/assets/google-font-roboto/ek4gzZ-GeXAPcSbHtCeQI_esZW2xOQ-xsNqO47m55DA.woff2 and /dev/null differ
diff --git a/static/assets/google-font-roboto/mErvLBYg_cXG3rLvUsKT_fesZW2xOQ-xsNqO47m55DA.woff2 b/static/assets/google-font-roboto/mErvLBYg_cXG3rLvUsKT_fesZW2xOQ-xsNqO47m55DA.woff2
deleted file mode 100644
index ee9f1a4..0000000
Binary files a/static/assets/google-font-roboto/mErvLBYg_cXG3rLvUsKT_fesZW2xOQ-xsNqO47m55DA.woff2 and /dev/null differ
diff --git a/static/assets/google-font-roboto/roboto.css b/static/assets/google-font-roboto/roboto.css
deleted file mode 100644
index 56bf7b9..0000000
--- a/static/assets/google-font-roboto/roboto.css
+++ /dev/null
@@ -1,112 +0,0 @@
-/* cyrillic-ext */
-@font-face {
- font-family: 'Roboto';
- font-style: normal;
- font-weight: 300;
- src: local('Roboto Light'), local('Roboto-Light'), url(0eC6fl06luXEYWpBSJvXCBJtnKITppOI_IvcXXDNrsc.woff2) format('woff2');
- unicode-range: U+0460-052F, U+20B4, U+2DE0-2DFF, U+A640-A69F;
-}
-/* cyrillic */
-@font-face {
- font-family: 'Roboto';
- font-style: normal;
- font-weight: 300;
- src: local('Roboto Light'), local('Roboto-Light'), url(Fl4y0QdOxyyTHEGMXX8kcRJtnKITppOI_IvcXXDNrsc.woff2) format('woff2');
- unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
-}
-/* greek-ext */
-@font-face {
- font-family: 'Roboto';
- font-style: normal;
- font-weight: 300;
- src: local('Roboto Light'), local('Roboto-Light'), url(-L14Jk06m6pUHB-5mXQQnRJtnKITppOI_IvcXXDNrsc.woff2) format('woff2');
- unicode-range: U+1F00-1FFF;
-}
-/* greek */
-@font-face {
- font-family: 'Roboto';
- font-style: normal;
- font-weight: 300;
- src: local('Roboto Light'), local('Roboto-Light'), url(I3S1wsgSg9YCurV6PUkTORJtnKITppOI_IvcXXDNrsc.woff2) format('woff2');
- unicode-range: U+0370-03FF;
-}
-/* vietnamese */
-@font-face {
- font-family: 'Roboto';
- font-style: normal;
- font-weight: 300;
- src: local('Roboto Light'), local('Roboto-Light'), url(NYDWBdD4gIq26G5XYbHsFBJtnKITppOI_IvcXXDNrsc.woff2) format('woff2');
- unicode-range: U+0102-0103, U+1EA0-1EF9, U+20AB;
-}
-/* latin-ext */
-@font-face {
- font-family: 'Roboto';
- font-style: normal;
- font-weight: 300;
- src: local('Roboto Light'), local('Roboto-Light'), url(Pru33qjShpZSmG3z6VYwnRJtnKITppOI_IvcXXDNrsc.woff2) format('woff2');
- unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
-}
-/* latin */
-@font-face {
- font-family: 'Roboto';
- font-style: normal;
- font-weight: 300;
- src: local('Roboto Light'), local('Roboto-Light'), url(Hgo13k-tfSpn0qi1SFdUfVtXRa8TVwTICgirnJhmVJw.woff2) format('woff2');
- unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215;
-}
-/* cyrillic-ext */
-@font-face {
- font-family: 'Roboto';
- font-style: normal;
- font-weight: 400;
- src: local('Roboto'), local('Roboto-Regular'), url(ek4gzZ-GeXAPcSbHtCeQI_esZW2xOQ-xsNqO47m55DA.woff2) format('woff2');
- unicode-range: U+0460-052F, U+20B4, U+2DE0-2DFF, U+A640-A69F;
-}
-/* cyrillic */
-@font-face {
- font-family: 'Roboto';
- font-style: normal;
- font-weight: 400;
- src: local('Roboto'), local('Roboto-Regular'), url(mErvLBYg_cXG3rLvUsKT_fesZW2xOQ-xsNqO47m55DA.woff2) format('woff2');
- unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
-}
-/* greek-ext */
-@font-face {
- font-family: 'Roboto';
- font-style: normal;
- font-weight: 400;
- src: local('Roboto'), local('Roboto-Regular'), url(-2n2p-_Y08sg57CNWQfKNvesZW2xOQ-xsNqO47m55DA.woff2) format('woff2');
- unicode-range: U+1F00-1FFF;
-}
-/* greek */
-@font-face {
- font-family: 'Roboto';
- font-style: normal;
- font-weight: 400;
- src: local('Roboto'), local('Roboto-Regular'), url(u0TOpm082MNkS5K0Q4rhqvesZW2xOQ-xsNqO47m55DA.woff2) format('woff2');
- unicode-range: U+0370-03FF;
-}
-/* vietnamese */
-@font-face {
- font-family: 'Roboto';
- font-style: normal;
- font-weight: 400;
- src: local('Roboto'), local('Roboto-Regular'), url(NdF9MtnOpLzo-noMoG0miPesZW2xOQ-xsNqO47m55DA.woff2) format('woff2');
- unicode-range: U+0102-0103, U+1EA0-1EF9, U+20AB;
-}
-/* latin-ext */
-@font-face {
- font-family: 'Roboto';
- font-style: normal;
- font-weight: 400;
- src: local('Roboto'), local('Roboto-Regular'), url(Fcx7Wwv8OzT71A3E1XOAjvesZW2xOQ-xsNqO47m55DA.woff2) format('woff2');
- unicode-range: U+0100-024F, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF;
-}
-/* latin */
-@font-face {
- font-family: 'Roboto';
- font-style: normal;
- font-weight: 400;
- src: local('Roboto'), local('Roboto-Regular'), url(CWB0XYA8bzo0kSThX0UTuA.woff2) format('woff2');
- unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215;
-}
diff --git a/static/assets/google-font-roboto/u0TOpm082MNkS5K0Q4rhqvesZW2xOQ-xsNqO47m55DA.woff2 b/static/assets/google-font-roboto/u0TOpm082MNkS5K0Q4rhqvesZW2xOQ-xsNqO47m55DA.woff2
deleted file mode 100644
index e1b700c..0000000
Binary files a/static/assets/google-font-roboto/u0TOpm082MNkS5K0Q4rhqvesZW2xOQ-xsNqO47m55DA.woff2 and /dev/null differ