Move _errors Sass from main to base
That way errors are automatically styled on all other apps (Flamenco, Attract...)
This commit is contained in:
parent
10e14e8c24
commit
de96e8e189
@ -5,9 +5,11 @@
|
|||||||
@import _apps_base
|
@import _apps_base
|
||||||
@import _notifications
|
@import _notifications
|
||||||
@import _comments
|
@import _comments
|
||||||
|
@import _error
|
||||||
|
|
||||||
|
|
||||||
html
|
html
|
||||||
|
height: 100%
|
||||||
-webkit-font-smoothing: antialiased
|
-webkit-font-smoothing: antialiased
|
||||||
-moz-osx-font-smoothing: grayscale
|
-moz-osx-font-smoothing: grayscale
|
||||||
|
|
||||||
|
@ -2,14 +2,15 @@
|
|||||||
@import _config
|
@import _config
|
||||||
@import _utils
|
@import _utils
|
||||||
|
|
||||||
@import _comments
|
/* Generic styles (comments, notifications, etc) come from base.css */
|
||||||
|
|
||||||
|
/* Blender Cloud specific styles */
|
||||||
@import _project
|
@import _project
|
||||||
@import _project-sharing
|
@import _project-sharing
|
||||||
@import _project-dashboard
|
@import _project-dashboard
|
||||||
@import _user
|
@import _user
|
||||||
@import _join
|
@import _join
|
||||||
@import _homepage
|
@import _homepage
|
||||||
@import _error
|
|
||||||
@import _stats
|
@import _stats
|
||||||
@import _search
|
@import _search
|
||||||
|
|
||||||
|
@ -2,26 +2,15 @@ doctype
|
|||||||
html(lang="en")
|
html(lang="en")
|
||||||
head
|
head
|
||||||
meta(charset="utf-8")
|
meta(charset="utf-8")
|
||||||
title Blender Cloud
|
title Error
|
||||||
meta(name="viewport", content="width=device-width, initial-scale=1.0")
|
meta(name="viewport", content="width=device-width, initial-scale=1.0")
|
||||||
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 past open projects.")
|
|
||||||
meta(name="author", content="Blender Institute")
|
|
||||||
meta(name="theme-color", content="#3e92aa")
|
|
||||||
|
|
||||||
script.
|
|
||||||
!function(e){"use strict";e.loadCSS=function(t,n,o){var r,i=e.document,l=i.createElement("link");if(n)r=n;else{var d=(i.body||i.getElementsByTagName("head")[0]).childNodes;r=d[d.length-1]}var a=i.styleSheets;l.rel="stylesheet",l.href=t,l.media="only x",r.parentNode.insertBefore(l,n?r:r.nextSibling);var f=function(e){for(var t=l.href,n=a.length;n--;)if(a[n].href===t)return e();setTimeout(function(){f(e)})};return l.onloadcssdefined=f,f(function(){l.media=o||"all"}),l},"undefined"!=typeof module&&(module.exports=e.loadCSS)}(this);
|
|
||||||
|
|
||||||
loadCSS( "//fonts.googleapis.com/css?family=Roboto:300,400,500" );
|
|
||||||
loadCSS( "//fonts.googleapis.com/css?family=Lato:300,400" );
|
|
||||||
|
|
||||||
link(href="{{ url_for('static_pillar', filename='assets/ico/favicon.png') }}", rel="shortcut icon")
|
link(href="{{ url_for('static_pillar', filename='assets/ico/favicon.png') }}", rel="shortcut icon")
|
||||||
link(href="{{ url_for('static_pillar', filename='assets/ico/apple-touch-icon-precomposed.png') }}", rel="icon apple-touch-icon-precomposed", sizes="192x192")
|
link(href="{{ url_for('static_pillar', filename='assets/ico/apple-touch-icon-precomposed.png') }}", rel="icon apple-touch-icon-precomposed", sizes="192x192")
|
||||||
|
link(href="{{ url_for('static_pillar', filename='assets/css/base.css') }}", rel="stylesheet")
|
||||||
link(href="{{ url_for('static_pillar', filename='assets/css/main.css') }}", rel="stylesheet")
|
link(href="{{ url_for('static_pillar', filename='assets/css/main.css') }}", rel="stylesheet")
|
||||||
|
link(href='//fonts.googleapis.com/css?family=Roboto:300,400', rel='stylesheet', type='text/css')
|
||||||
|
|
||||||
body.error
|
body.error
|
||||||
| {% block body %}{% endblock %}
|
| {% block body %}{% endblock %}
|
||||||
|
|
||||||
noscript
|
|
||||||
link(href='//fonts.googleapis.com/css?family=Roboto:300,400,500', rel='stylesheet', type='text/css')
|
|
||||||
link(href='//fonts.googleapis.com/css?family=Lato:300,400', rel='stylesheet', type='text/css')
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user