Initial UI cleanup
- added assets_shared submodule - added support for grunt - cleanup of layout.html
This commit is contained in:
7
.gitignore
vendored
7
.gitignore
vendored
@@ -10,6 +10,7 @@ __pycache__/
|
|||||||
*.swp
|
*.swp
|
||||||
*.swo
|
*.swo
|
||||||
*#
|
*#
|
||||||
|
*.bak
|
||||||
|
|
||||||
# ms-windows
|
# ms-windows
|
||||||
Thumbs.db
|
Thumbs.db
|
||||||
@@ -28,3 +29,9 @@ http.log
|
|||||||
master_private.py
|
master_private.py
|
||||||
twistd.log
|
twistd.log
|
||||||
linux_glibc211_x86_64_scons/
|
linux_glibc211_x86_64_scons/
|
||||||
|
gitpoller-work/
|
||||||
|
node_modules/
|
||||||
|
*.sqlite-shm
|
||||||
|
*.sqlite-wal
|
||||||
|
*.pid
|
||||||
|
*.map
|
||||||
|
|||||||
3
.gitmodules
vendored
Normal file
3
.gitmodules
vendored
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
[submodule "public_html/assets_shared"]
|
||||||
|
path = public_html/assets_shared
|
||||||
|
url = git://git.blender.org/blender-web-assets.git
|
||||||
31
Gruntfile.js
Normal file
31
Gruntfile.js
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
module.exports = function(grunt) {
|
||||||
|
grunt.initConfig({
|
||||||
|
pkg: grunt.file.readJSON('package.json'),
|
||||||
|
|
||||||
|
sass: {
|
||||||
|
dist: {
|
||||||
|
options: {
|
||||||
|
style: 'compressed'
|
||||||
|
},
|
||||||
|
files: {
|
||||||
|
'public_html/assets/css/main.css': 'public_html/assets/sass/main.sass'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
autoprefixer: {
|
||||||
|
no_dest: { src: 'public_html/assets/css/main.css' }
|
||||||
|
},
|
||||||
|
|
||||||
|
watch: {
|
||||||
|
files: ['public_html/assets/sass/main.sass'],
|
||||||
|
tasks: ['sass', 'autoprefixer'],
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
grunt.loadNpmTasks('grunt-contrib-sass');
|
||||||
|
grunt.loadNpmTasks('grunt-autoprefixer');
|
||||||
|
grunt.loadNpmTasks('grunt-contrib-watch');
|
||||||
|
|
||||||
|
grunt.registerTask('default', ['sass', 'autoprefixer', 'watch']);
|
||||||
|
};
|
||||||
15
package.json
Normal file
15
package.json
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
{
|
||||||
|
"name": "blender-buildbot",
|
||||||
|
"repository": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "git://git.blender.org/blender-buildbot.git"
|
||||||
|
},
|
||||||
|
"author": "Blender Foundation",
|
||||||
|
"license": "GPL",
|
||||||
|
"devDependencies": {
|
||||||
|
"grunt": "^0.4.5",
|
||||||
|
"grunt-autoprefixer": "^1.0.1",
|
||||||
|
"grunt-contrib-sass": "^0.8.1",
|
||||||
|
"grunt-contrib-watch": "~0.6.1"
|
||||||
|
}
|
||||||
|
}
|
||||||
19
public_html/assets/css/main.css
Normal file
19
public_html/assets/css/main.css
Normal file
File diff suppressed because one or more lines are too long
4
public_html/assets/sass/main.sass
Normal file
4
public_html/assets/sass/main.sass
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
@import url(//fonts.googleapis.com/css?family=Open+Sans)
|
||||||
|
@import url(//fonts.googleapis.com/css?family=Open+Sans+Condensed:300)
|
||||||
|
@import url(../../assets_shared/css/font-borg.css)
|
||||||
|
@import ../../assets_shared/sass/main.sass
|
||||||
1
public_html/assets_shared
Submodule
1
public_html/assets_shared
Submodule
Submodule public_html/assets_shared added at 98b8939012
@@ -1,32 +0,0 @@
|
|||||||
@font-face{
|
|
||||||
font-family:'FontBorg';
|
|
||||||
src:url('../fonts/font-borg-webfont.eot');
|
|
||||||
src:url('../fonts/font-borg-webfont.eot?#iefix') format('embedded-opentype'),
|
|
||||||
url('../fonts/font-borg-webfont.woff') format('woff'),
|
|
||||||
url('../fonts/font-borg-webfont.ttf') format('truetype'),
|
|
||||||
url('../fonts/font-borg-webfont.svg#fontborgregular') format('svg');
|
|
||||||
font-weight:normal;
|
|
||||||
font-style:normal;
|
|
||||||
}
|
|
||||||
|
|
||||||
[class^="bf-"],[class*=" bf-"]{
|
|
||||||
font-family:FontBorg;
|
|
||||||
font-weight:normal;
|
|
||||||
font-style:normal;
|
|
||||||
text-decoration:inherit;
|
|
||||||
-webkit-font-smoothing:antialiased;
|
|
||||||
display:inline;
|
|
||||||
width:auto;
|
|
||||||
height:auto;
|
|
||||||
line-height:normal;
|
|
||||||
vertical-align:baseline;
|
|
||||||
background-image:none;
|
|
||||||
background-position:0% 0%;
|
|
||||||
background-repeat:repeat;
|
|
||||||
margin-top:0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.bf-blender:before{content:"\f000";}
|
|
||||||
.bf-cloud:before{content:"\f001";}
|
|
||||||
.bf-network:before{content:"\f002";}
|
|
||||||
.bf-creativecommons:before{content:"\f003";}
|
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -2,104 +2,204 @@
|
|||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
<html lang="en">
|
<html lang="en">
|
||||||
<head>
|
<head>
|
||||||
{% block head %}
|
{% block head %}
|
||||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
||||||
{% if metatags %}
|
{% if metatags %}
|
||||||
{{ metatags }}
|
{{ metatags }}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if refresh %}
|
{% if refresh %}
|
||||||
<meta http-equiv="refresh" content="{{ refresh|e }}"/>
|
<meta http-equiv="refresh" content="{{ refresh|e }}"/>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<title>{{ title|e }}</title>
|
<title>{{ title|e }}</title>
|
||||||
|
|
||||||
<link href="https://netdna.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css" rel="stylesheet">
|
<link href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css" rel="stylesheet">
|
||||||
<link href="https://netdna.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" rel="stylesheet">
|
<link href="//netdna.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
|
||||||
<link href="{{ path_to_root }}css/main.css" rel="stylesheet">
|
<link href="{{ path_to_root }}assets/css/main.css" rel="stylesheet">
|
||||||
|
|
||||||
<link rel="stylesheet" href="{{ stylesheet }}" type="text/css" />
|
<!-- <link rel="stylesheet" href="{{ stylesheet }}" type="text/css" /> -->
|
||||||
<link rel="alternate" type="application/rss+xml" title="RSS" href="{{ path_to_root }}rss">
|
<link rel="alternate" type="application/rss+xml" title="RSS" href="{{ path_to_root }}rss">
|
||||||
|
|
||||||
<link href="{{ path_to_root }}css/font-borg.css" rel="stylesheet">
|
{% endblock %}
|
||||||
<link href='https://fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css'>
|
</head>
|
||||||
<link href='https://fonts.googleapis.com/css?family=Open+Sans+Condensed:300' rel='stylesheet' type='text/css'>
|
<body class="interface" onload="parent.postMessage(document.body.scrollHeight, 'https://developer.blender.org');">
|
||||||
{% endblock %}
|
|
||||||
</head>
|
|
||||||
<body class="interface" onload="parent.postMessage(document.body.scrollHeight, 'https://developer.blender.org');">
|
|
||||||
|
|
||||||
{% block header -%}
|
{% block header -%}
|
||||||
<header class="navbar navbar-default navbar-fixed-top" role="navigation">
|
|
||||||
<div class="container">
|
|
||||||
<div class="navbar-header">
|
|
||||||
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#cloud-navbar-collapse-1">
|
|
||||||
<span class="sr-only">Toggle navigation</span>
|
|
||||||
<i class="fa fa-bars"></i>
|
|
||||||
</button>
|
|
||||||
<a class="logo" href="{{ path_to_root or '.' }}"></a>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Collect the nav links, forms, and other content for toggling -->
|
<a name="hop"></a>
|
||||||
<nav class="collapse navbar-collapse" id="cloud-navbar-collapse-1">
|
|
||||||
<ul class="nav navbar-nav navbar-right">
|
|
||||||
<li class="menu-item menu-item-type-post_type menu-item-object-page"><a href="{{ path_to_root }}download">Download</a></li>
|
|
||||||
<li class="menu-item menu-item-type-post_type menu-item-object-page"><a href="{{ path_to_root }}waterfall">Waterfall</a></li>
|
|
||||||
<li class="menu-item menu-item-type-post_type menu-item-object-page"><a href="{{ path_to_root }}grid">Grid</a></li>
|
|
||||||
<li class="menu-item menu-item-type-post_type menu-item-object-page"><a href="{{ path_to_root }}tgrid">T-Grid</a></li>
|
|
||||||
<li class="menu-item menu-item-type-post_type menu-item-object-page"><a href="{{ path_to_root }}builders">Builders</a></li>
|
|
||||||
<li class="menu-item menu-item-type-post_type menu-item-object-page"><a href="{{ path_to_root }}one_line_per_build">Recent Builds</a></li>
|
|
||||||
<li class="menu-item menu-item-type-post_type menu-item-object-page"><a href="{{ path_to_root }}buildslaves">Buildslaves</a></li>
|
|
||||||
<li class="menu-item menu-item-type-post_type menu-item-object-page"><a href="{{ path_to_root }}about">About</a></li>
|
|
||||||
</ul>
|
|
||||||
</nav><!-- /.navbar-collapse -->
|
|
||||||
|
|
||||||
</div>
|
<header class="navbar navbar-default navbar-fixed-top bright" role="navigation">
|
||||||
</header>
|
<div class="container">
|
||||||
{% endblock %}
|
<div class="navbar-header">
|
||||||
|
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-menu">
|
||||||
|
<span class="sr-only">Toggle navigation</span>
|
||||||
|
<i class="fa fa-bars"></i>
|
||||||
|
</button>
|
||||||
|
<a class="logo" href="http://www.blender.org"></a>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="container-fluid featured featured-xs">
|
<nav class="collapse navbar-collapse" id="navbar-collapse-menu">
|
||||||
<div class="col-md-12 height-full">
|
<ul class="nav navbar-nav navbar-right">
|
||||||
<div class="container vertical-align">
|
<li><a href="http://www.blender.org/features/">Features</a></li>
|
||||||
|
<li><a href="http://www.blender.org/download/">Download</a></li>
|
||||||
|
<li><a href="http://www.blender.org/support/">Support</a></li>
|
||||||
|
<li><a href="http://www.blender.org/get-involved/">Get Involved</a></li>
|
||||||
|
<li><a href="http://www.blender.org/about/">About</a></li>
|
||||||
|
<li><a href="http://www.blender3d.org/e-shop/">Store</a></li>
|
||||||
|
</ul>
|
||||||
|
</nav>
|
||||||
|
</div>
|
||||||
|
</header>
|
||||||
|
|
||||||
|
<div class="container-main">
|
||||||
|
<div class="container-fluid featured featured-xs">
|
||||||
|
<div class="col-md-12">
|
||||||
|
<div class="container">
|
||||||
|
<h1>Blender Builder</h1>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
|
|
||||||
{%- block barecontent -%}
|
<header class="navbar navbar-default navbar-secondlevel navbar-static-top" role="navigation">
|
||||||
<div class="content col-md-12">
|
<div class="container relative">
|
||||||
{%- block content -%}
|
<ul class="nav navbar-nav navbar-left">
|
||||||
{%- endblock -%}
|
{% set title = request.path.split("/")[1] %}
|
||||||
</div>
|
<li class="menu-item menu-item-type-post_type menu-item-object-page {% if title == 'download' %}active{% endif %}"><a href="{{ path_to_root }}download">Download</a></li>
|
||||||
{%- endblock -%}
|
<li class="menu-item menu-item-type-post_type menu-item-object-page {% if title == 'waterfall' %}active{% endif %}"><a href="{{ path_to_root }}waterfall">Waterfall</a></li>
|
||||||
|
<li class="menu-item menu-item-type-post_type menu-item-object-page {% if title == 'grid' %}active{% endif %}"><a href="{{ path_to_root }}grid">Grid</a></li>
|
||||||
|
<li class="menu-item menu-item-type-post_type menu-item-object-page {% if title == 'tgrid' %}active{% endif %}"><a href="{{ path_to_root }}tgrid">T-Grid</a></li>
|
||||||
|
<li class="menu-item menu-item-type-post_type menu-item-object-page {% if title == 'builders' %}active{% endif %}"><a href="{{ path_to_root }}builders">Builders</a></li>
|
||||||
|
<li class="menu-item menu-item-type-post_type menu-item-object-page {% if title == 'one_line_per_build' %}active{% endif %}"><a href="{{ path_to_root }}one_line_per_build">Recent Builds</a></li>
|
||||||
|
<li class="menu-item menu-item-type-post_type menu-item-object-page {% if title == 'buildslaves' %}active{% endif %}"><a href="{{ path_to_root }}buildslaves">Buildslaves</a></li>
|
||||||
|
<li class="menu-item menu-item-type-post_type menu-item-object-page {% if title == 'about' %}active{% endif %}"><a href="{{ path_to_root }}about">About</a></li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</header> <!-- // second level-->
|
||||||
|
|
||||||
{%- block footer -%}
|
{% endblock %}
|
||||||
<footer>
|
|
||||||
<div class="container">
|
|
||||||
<span class="pull-left">
|
|
||||||
<a href="http://buildbot.net/">BuildBot</a> ({{version}})
|
|
||||||
{% if project_name -%}
|
|
||||||
working for the
|
|
||||||
{%- if project_url -%}
|
|
||||||
<a href="{{ project_url }}">{{ project_name }}</a>
|
|
||||||
{%- else -%}
|
|
||||||
{{ project_name }}
|
|
||||||
{%- endif -%}
|
|
||||||
project.
|
|
||||||
{%- endif -%}
|
|
||||||
</span>
|
|
||||||
<span class="pull-right"><p>Page built: {{ time }} ({{ tz }})</p></span>
|
|
||||||
</div>
|
|
||||||
</footer>
|
|
||||||
{% endblock -%}
|
|
||||||
|
|
||||||
<script>
|
{%- block barecontent -%}
|
||||||
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
|
<div class="container">
|
||||||
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
|
<div class="row">
|
||||||
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
|
<div class="col-md-12">
|
||||||
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
|
{%- block content -%}
|
||||||
|
{%- endblock -%}
|
||||||
ga('create', 'UA-1418081-1', 'auto');
|
</div>
|
||||||
ga('send', 'pageview');
|
</div>
|
||||||
|
</div> <!-- /container -->
|
||||||
</script>
|
{%- endblock -%}
|
||||||
</body>
|
</div> <!-- /container-main -->
|
||||||
|
|
||||||
|
{%- block footer -%}
|
||||||
|
<div id="footer-navigation"> <!-- Sitemap -->
|
||||||
|
<div class="container">
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-md-3 col-xs-6 margin-top-1">
|
||||||
|
<h4>Blender</h4>
|
||||||
|
<ul>
|
||||||
|
<a href="http://www.blender.org/download/" title="Download Blender">
|
||||||
|
<li>Download</li>
|
||||||
|
</a>
|
||||||
|
<a href="http://www.blender.org/download/" title="Source Code">
|
||||||
|
<li>Source Code</li>
|
||||||
|
</a>
|
||||||
|
<a href="http://www.blender.org/features/" title="Blender Features">
|
||||||
|
<li>Features</li>
|
||||||
|
</a>
|
||||||
|
<a href="http://wiki.blender.org/index.php/Doc:2.6/Manual" title="Blender Documentation">
|
||||||
|
<li>Documentation</li>
|
||||||
|
</a>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
<div class="col-md-3 col-xs-6 margin-top-1">
|
||||||
|
<h4>Organization</h4>
|
||||||
|
<ul>
|
||||||
|
<a href="http://www.blender.org/foundation/" title="Blender Foundation">
|
||||||
|
<li>Foundation</li>
|
||||||
|
</a>
|
||||||
|
<a href="http://www.blender.org/institute/" title="Blender Institute">
|
||||||
|
<li>Institute</li>
|
||||||
|
</a>
|
||||||
|
<a href="http://www.blender.org/get-involved/developers/" title="Developers">
|
||||||
|
<li>Developers</li>
|
||||||
|
</a>
|
||||||
|
<a href="http://www.blendernetwork.org"
|
||||||
|
title="The Network of Blender Professionals">
|
||||||
|
<li><i class="bf-network"></i> Blender Network</li>
|
||||||
|
</a>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
<div class="col-md-3 col-xs-6 margin-top-1">
|
||||||
|
<h4>Get Involved</h4>
|
||||||
|
<ul>
|
||||||
|
<a href="http://www.blender.org/foundation/donation-payment/" title="Donations">
|
||||||
|
<li>Donations</li>
|
||||||
|
</a>
|
||||||
|
<a href="http://www.blender.org/get-involved/developers/" title="Software">
|
||||||
|
<li>Software</li>
|
||||||
|
</a>
|
||||||
|
<a href="http://www.blender.org/get-involved/" title="Websites and Docs">
|
||||||
|
<li>Websites & Docs</li>
|
||||||
|
</a>
|
||||||
|
<a href="http://www.blender.org/conference/" title="Conferences">
|
||||||
|
<li>Conferences</li>
|
||||||
|
</a>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
<div class="col-md-3 col-xs-12 margin-top-1">
|
||||||
|
<h4>Blender.org</h4>
|
||||||
|
<ul>
|
||||||
|
<a href="http://www.blender.org/news/" title="News">
|
||||||
|
<li>News</li>
|
||||||
|
</a>
|
||||||
|
<a href="http://www.blender.org/foundation/" title="Contact">
|
||||||
|
<li>Contact</li>
|
||||||
|
</a>
|
||||||
|
<a href="http://www.blender.org/about/logo/" title="Trademark and Logo">
|
||||||
|
<li>Trademark & Logo</li>
|
||||||
|
</a>
|
||||||
|
<a href="http://www.blender.org/about/website/" title="Website License">
|
||||||
|
<li>Website License</li>
|
||||||
|
</a>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</div> <!-- footer row -->
|
||||||
|
</div> <!-- footer container -->
|
||||||
|
</div> <!-- footer-navigation -->
|
||||||
|
<footer>
|
||||||
|
<div class="container">
|
||||||
|
<span class="pull-left">
|
||||||
|
<a href="http://buildbot.net/">BuildBot</a> ({{version}}) - Page built: {{ time }} ({{ tz }})
|
||||||
|
{% if project_name -%}
|
||||||
|
working for the
|
||||||
|
{%- if project_url -%}
|
||||||
|
<a href="{{ project_url }}">{{ project_name }}</a>
|
||||||
|
{%- else -%}
|
||||||
|
{{ project_name }}
|
||||||
|
{%- endif -%}
|
||||||
|
project.
|
||||||
|
{%- endif -%}
|
||||||
|
</span>
|
||||||
|
<span class="pull-right">
|
||||||
|
<p>Blender.org
|
||||||
|
<a href="#hop"><i class="fa fa-angle-up"></i>
|
||||||
|
</a>
|
||||||
|
</p>
|
||||||
|
</span>
|
||||||
|
</div> <!-- /footer-container -->
|
||||||
|
</footer>
|
||||||
|
|
||||||
|
{% endblock -%}
|
||||||
|
|
||||||
|
<script>
|
||||||
|
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
|
||||||
|
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
|
||||||
|
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
|
||||||
|
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
|
||||||
|
|
||||||
|
ga('create', 'UA-1418081-1', 'auto');
|
||||||
|
ga('send', 'pageview');
|
||||||
|
|
||||||
|
</script>
|
||||||
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
Reference in New Issue
Block a user