archive/blender-cloud
0
1
Fork 1
Code Issues 24 Pull Requests Projects Releases Wiki Activity

Fix user dropdown and mobile nav

Browse Source
This commit is contained in:
Sam Lu
2018-07-18 16:22:36 -05:00
parent 1342ed2601
commit 97c74f3267
6 changed files with 44 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gulpfile.js
View File

@@ -9,7 +9,7 @@ let livereload = require('gulp-livereload');
let plumber = require('gulp-plumber');
let rename = require('gulp-rename');
let sass = require('gulp-sass');
//let sourcemaps = require('gulp-sourcemaps');
let sourcemaps = require('gulp-sourcemaps');
let uglify = require('gulp-uglify');
let enabled = {
@@ -30,10 +30,10 @@ gulp.task('styles', function(done) {
gulp
.src('src/styles/**/*.sass')
.pipe(gulpif(enabled.failCheck, plumber()))
//.pipe(gulpif(enabled.maps, sourcemaps.init()))
.pipe(gulpif(enabled.maps, sourcemaps.init()))
.pipe(sass({outputStyle: 'compressed'}))
.pipe(autoprefixer("last 3 versions"))
//.pipe(gulpif(enabled.maps, sourcemaps.write(".")))
.pipe(gulpif(enabled.maps, sourcemaps.write(".")))
.pipe(gulp.dest(destination.css))
.pipe(gulpif(argv.livereload, livereload()));
done();
@@ -59,10 +59,10 @@ gulp.task('scripts', function(done) {
gulp.src('src/scripts/*.js')
.pipe(gulpif(enabled.failCheck, plumber()))
.pipe(cache('scripting'))
//.pipe(gulpif(enabled.maps, sourcemaps.init()))
.pipe(gulpif(enabled.maps, sourcemaps.init()))
.pipe(gulpif(enabled.uglify, uglify()))
.pipe(rename({suffix: '.min'}))
//.pipe(gulpif(enabled.maps, sourcemaps.write(".")))
.pipe(gulpif(enabled.maps, sourcemaps.write(".")))
.pipe(gulp.dest(destination.js))
.pipe(gulpif(argv.livereload, livereload()));
done();
@@ -74,10 +74,10 @@ gulp.task('scripts', function(done) {
gulp.task('scripts_tutti', function(done) {
gulp.src('src/scripts/tutti/**/*.js')
.pipe(gulpif(enabled.failCheck, plumber()))
//.pipe(gulpif(enabled.maps, sourcemaps.init()))
.pipe(gulpif(enabled.maps, sourcemaps.init()))
.pipe(concat("tutti.min.js"))
.pipe(gulpif(enabled.uglify, uglify()))
//.pipe(gulpif(enabled.maps, sourcemaps.write(".")))
.pipe(gulpif(enabled.maps, sourcemaps.write(".")))
.pipe(gulp.dest(destination.js))
.pipe(gulpif(argv.livereload, livereload()));
done();

25
src/styles/_navbar.sass
View File

@@ -2,7 +2,6 @@
background: #fff
height: auto
min-height: 48px
// height: 48px
+media-breakpoint-up(md)
height: 56px
.logo
@@ -10,22 +9,20 @@
justify-content: center
.navbar-toggler
padding: 0
border-radius: 0
.navbar-nav
margin-bottom: 15px;
margin-top: 15px;
margin-bottom: 15px
margin-top: 15px
+media-breakpoint-up(md)
margin: 0
.nav-item .nav-link
font-size: 18px
color: $dark
// padding: 16px 8px 16px 34px
padding: 3vh 8px 3vh 34px
+media-breakpoint-up(lg)
padding: 6px 18px
&:hover
color: $muted
.dropdown-toggle::after
display:none
.navbar-toggler
border: 0
outline: none
@@ -40,5 +37,17 @@
.collapsing
transition: none
display: none
.show
padding-bottom: 75vh
#navbarNav
.dropdown-toggle::after
display:none !important
&.show
padding-bottom: 75vh
.gravatar
width: 32px
border-radius: 50%
#userDropdown
.nav-link
padding-top: 4px;
padding-bottom: 0;
padding-right: 0;
outline: none;

18
src/templates/layout.pug
View File

@@ -45,7 +45,6 @@ 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(rel="stylesheet", href="{{ url_for('static', filename='assets/bootstrap/css/bootstrap.min.css') }}")
link(rel="stylesheet", href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,600")
link(href="{{ url_for('static', filename='assets/google-font-roboto/roboto.css') }}", rel="stylesheet")
@@ -82,7 +81,6 @@ html(lang="en")
| {% endwith %}
//- Navigation Bar
//- nav.navbar.navbar-expand-md.navbar-light.sticky-top.bg-white
nav.navbar.navbar-expand-md.navbar-light.fixed-top
//- Logo
a.navbar-brand(href="#")
@@ -114,8 +112,9 @@ html(lang="en")
li.nav-item
a.nav-link(href="{{ url_for('cloud.services') }}",
class="{% if category == 'services' %}active{% endif %}") Services
li.nav-item
i.search-icon.pi-search
//- li.nav-item
//- i.search-icon.pi-search
| {% endblock navigation_sections %}
| {% if current_user.is_anonymous %}
@@ -230,9 +229,14 @@ html(lang="en")
link(href='//fonts.googleapis.com/css?family=Roboto:300,400', rel='stylesheet', type='text/css')
//- script(src="{{ url_for('static_pillar', filename='assets/js/vendor/jquery.bootstrap-3.3.7.min.js') }}")
script(src="{{ url_for('static', filename='assets/jquery/jquery.slim.min.js') }}")
script(src="{{ url_for('static', filename='assets/popper.js/popper.min.js') }}")
script(src="{{ url_for('static', filename='assets/bootstrap/js/bootstrap.min.js') }}")
//- local bootstrap js returns error message, investigate later
//- script(src="{{ url_for('static', filename='assets/jquery/jquery.slim.min.js') }}")
//- script(src="{{ url_for('static', filename='assets/popper.js/popper.min.js') }}")
//- script(src="{{ url_for('static', filename='assets/bootstrap/js/bootstrap.min.js') }}")
script(src="https://code.jquery.com/jquery-3.3.1.min.js", integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=", crossorigin="anonymous")
script(src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js", integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49", crossorigin="anonymous")
script(src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.2/js/bootstrap.min.js", integrity="sha384-o+RDsa0aLu++PJvFqy8fFScvbHFLtbvScb8AjopnFD+iEQ7wo/CG0xlczd+2O/em", crossorigin="anonymous")
| {% if current_user.is_authenticated %}
script(src="{{ url_for('static_pillar', filename='assets/js/vendor/jquery.typewatch-3.0.0.min.js') }}")

14
src/templates/menus/user.pug
View File

@@ -9,7 +9,7 @@
| {% endif %}
| {% block menu_avatar %}
a.navbar-item.dropdown-toggle(href="#", data-toggle="dropdown", title="{{ current_user.email }}")
a.nav-link.dropdown-toggle(href="#", data-toggle="dropdown", title="{{ current_user.email }}", aria-haspopup="true", aria-expanded="false")
img.gravatar(
src="{{ current_user.gravatar }}",
class="{{ subscription }}",
@@ -26,26 +26,26 @@ a.navbar-item.dropdown-toggle(href="#", data-toggle="dropdown", title="{{ curren
| {% block menu_list %}
li.subscription-status(class="{{ subscription }}")
.dropdown-menu.subscription-status(class="{{ subscription }}", aria-labelledby="dropdownMenuLink")
| {% if subscription == 'subscriber' %}
a.navbar-item(
a.dropdown-item(
href="{{url_for('settings.billing')}}"
title="View subscription info")
i.pi-grin
span Your subscription is active!
| {% elif subscription == 'demo' %}
a.navbar-item(
a.dropdown-item(
href="{{url_for('settings.billing')}}"
title="View subscription info")
i.pi-heart-filled
span You have a free account.
| {% elif current_user.has_cap('can-renew-subscription') %}
a.navbar-item(target='_blank', href="/renew", title="Renew subscription")
a.dropdown-item(target='_blank', href="/renew", title="Renew subscription")
i.pi-heart
span.info Your subscription is not active.
span.renew Click here to renew.
| {% else %}
a.navbar-item(
a.dropdown-item(
href="https://store.blender.org/product/membership/"
title="Renew subscription")
i.pi-unhappy
@@ -56,7 +56,7 @@ li.subscription-status(class="{{ subscription }}")
| {{ super() }}
li
a.navbar-item(
a.dropdown-item(
href="{{ url_for('settings.billing') }}"
title="Billing")
i.pi-credit-card

1
static/assets/bootstrap/css/bootstrap.min.css.map Normal file
View File

File diff suppressed because one or more lines are too long

1
static/assets/bootstrap/js/bootstrap.min.js.map Normal file
View File

File diff suppressed because one or more lines are too long