mirror of
https://projects.blender.org/infrastructure/gitea-custom.git
synced 2024-12-22 07:13:09 -05:00
Merge branch 'develop'
This commit is contained in:
Pablo Vazquez
commit
1375157807
5 changed files with 108 additions and 73 deletions
|
|
@ -1,27 +1,89 @@
|
||||||
<div class="ui fluid card" style="width: 100%;">
|
<div class="ui fluid card" style="width: 100%;">
|
||||||
<div class="content">
|
<div class="content">
|
||||||
<h3>Ongoing Projects</h3>
|
<div class="ui grid">
|
||||||
<p>Focused activities to advance Blender.</p>
|
<div class="eight wide column">
|
||||||
|
<h3>Ongoing Projects</h3>
|
||||||
<div class="description">
|
</div>
|
||||||
<ul>
|
<div class="eight wide column right" style="text-align: right">
|
||||||
<li>
|
<h3>
|
||||||
<a href="https://code.blender.org/2022/11/the-future-of-character-animation-rigging/">
|
<a href="{{AppSubUrl}}/blender/blender/">
|
||||||
The Future of Character Animation
|
<svg data-v-9113ce96="" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16" aria-hidden="true"
|
||||||
|
class="svg octicon-repo repo-list-icon" style="margin-top: .333rem;">
|
||||||
|
<path
|
||||||
|
d="M2 2.5A2.5 2.5 0 0 1 4.5 0h8.75a.75.75 0 0 1 .75.75v12.5a.75.75 0 0 1-.75.75h-2.5a.75.75 0 0 1 0-1.5h1.75v-2h-8a1 1 0 0 0-.714 1.7.75.75 0 1 1-1.072 1.05A2.5 2.5 0 0 1 2 11.5Zm10.5-1h-8a1 1 0 0 0-1 1v6.708A2.5 2.5 0 0 1 4.5 9h8ZM5 12.25a.25.25 0 0 1 .25-.25h3.5a.25.25 0 0 1 .25.25v3.25a.25.25 0 0 1-.4.2l-1.45-1.087a.25.25 0 0 0-.3 0L5.4 15.7a.25.25 0 0 1-.4-.2Z">
|
||||||
|
</path>
|
||||||
|
</svg>
|
||||||
|
blender/blender
|
||||||
</a>
|
</a>
|
||||||
<li>
|
</h3>
|
||||||
<a href="https://code.blender.org/2022/12/brush-assets-workflow/">
|
</div>
|
||||||
Brush Assets
|
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
<div class="extra content">
|
<table class="ui celled striped table">
|
||||||
<span class="right floated">
|
<thead>
|
||||||
<a href="https://code.blender.org">
|
<tr>
|
||||||
See all articles {{svg "octicon-chevron-right" 18}}
|
<th>Project</th>
|
||||||
</a>
|
<th>Description</th>
|
||||||
</span>
|
<th>Status</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td>
|
||||||
|
<a href="{{AppSubUrl}}/blender/blender/projects/30">Brush Assets</a>
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
Unified, flexible brush management.
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<a href="https://devtalk.blender.org/t/brush-assets-prototype-feedback/33568">Feedback Wanted</a>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>
|
||||||
|
<a href="{{AppSubUrl}}/blender/blender/issues/93220">EEVEE Next</a>
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
Next generation of the viewport renderer.
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<a href="https://devtalk.blender.org/t/blender-4-2-eevee-next-feedback/31813/1">Feedback Wanted</a>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>
|
||||||
|
<a href="https://code.blender.org/2024/05/extensions-platform-beta-release/">Extensions</a>
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
Online and offline management of add-ons and themes.
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<a href="https://devtalk.blender.org/t/extensions-platform/34663/1">Feedback Wanted</a>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>
|
||||||
|
<a href="https://projects.blender.org/blender/blender/projects/6">Grease Pencil v3</a>
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
Improved workflows for 2D design and animation.
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<a href="https://projects.blender.org/blender/blender/projects/6">Under Development</a>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>
|
||||||
|
<a href="https://developer.blender.org/docs/features/animation/animation_system/baklava/">Layered Animation</a>
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
Part of the new animation system roadmap.
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<a href="https://devtalk.blender.org/tag/animation-rigging">Under Development</a>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,18 @@
|
||||||
|
<div class="ui dropdown jump item tooltip" data-content="Products">
|
||||||
|
Products
|
||||||
|
<span class="fitted not-mobile">{{svg "octicon-triangle-down"}}</span>
|
||||||
|
<div class="menu">
|
||||||
|
<a class="item" href="{{AppSubUrl}}/blender/blender/">Blender</a>
|
||||||
|
<a class="item" href="{{AppSubUrl}}/blender/blender/blender-manual/">User Manual</a>
|
||||||
|
<div class="divider"></div>
|
||||||
|
<a class="item" href="{{AppSubUrl}}/infrastructure/blender-open-data/">Blender Benchmark</a>
|
||||||
|
<div class="divider"></div>
|
||||||
|
<a class="item" href="{{AppSubUrl}}/studio/">Blender Studio Tools</a>
|
||||||
|
<a class="item" href="{{AppSubUrl}}/studio/flamenco/">Flamenco</a>
|
||||||
|
<a class="item" href="{{AppSubUrl}}/studio/watchtower/">Watchtower</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="ui dropdown jump item tooltip" data-content="Modules">
|
<div class="ui dropdown jump item tooltip" data-content="Modules">
|
||||||
Modules
|
Modules
|
||||||
<span class="fitted not-mobile">{{svg "octicon-triangle-down"}}</span>
|
<span class="fitted not-mobile">{{svg "octicon-triangle-down"}}</span>
|
||||||
|
|
|
||||||
|
|
@ -231,6 +231,14 @@
|
||||||
top: 2px;
|
top: 2px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Labels (badges) */
|
||||||
|
/* Hardcoded label color to make it look like a module,
|
||||||
|
* so it can be used in other contexts (e.g. static homepage content). */
|
||||||
|
.ui.label.is-module {
|
||||||
|
background-color: #514b3c !important;
|
||||||
|
color: #eee !important;
|
||||||
|
}
|
||||||
|
|
||||||
/* Footer. */
|
/* Footer. */
|
||||||
footer {
|
footer {
|
||||||
color: var(--color-footer-text);
|
color: var(--color-footer-text);
|
||||||
|
|
|
||||||
|
|
@ -19,12 +19,12 @@
|
||||||
<p>This portal hosts more than just the Blender sources, bug and patch tracker. Explore the other repositories and get involved!</p>
|
<p>This portal hosts more than just the Blender sources, bug and patch tracker. Explore the other repositories and get involved!</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{{template "blender_components/card_projects" .}}
|
||||||
{{template "blender_components/card_repos" .}}
|
{{template "blender_components/card_repos" .}}
|
||||||
|
|
||||||
<div class="ui stackable two column grid mb-4 pt-0">
|
<div class="ui stackable two column grid mb-4 pt-0">
|
||||||
<div class="column">
|
<div class="column">
|
||||||
{{template "blender_components/card_releases" .}}
|
{{template "blender_components/card_releases" .}}
|
||||||
{{template "blender_components/card_projects" .}}
|
|
||||||
</div>
|
</div>
|
||||||
<div class="column">
|
<div class="column">
|
||||||
{{template "blender_components/card_modules" .}}
|
{{template "blender_components/card_modules" .}}
|
||||||
|
|
|
||||||
|
|
@ -4,57 +4,7 @@
|
||||||
<div class="ui container">
|
<div class="ui container">
|
||||||
<div class="ui stackable grid">
|
<div class="ui stackable grid">
|
||||||
<div class="ui container ten wide column">
|
<div class="ui container ten wide column">
|
||||||
|
{{template "blender_components/card_projects" .}}
|
||||||
<div class="ui">
|
|
||||||
<div class="ui stackable three column grid">
|
|
||||||
<div class="column">
|
|
||||||
<div class="ui card card-with-image card-with-icon">
|
|
||||||
<a href="{{AppSubUrl}}/blender/blender" class="image">
|
|
||||||
<img src="/assets/img/thumb_blender.jpg" style="width: 100%; height: 100%;">
|
|
||||||
</a>
|
|
||||||
<div class="content">
|
|
||||||
<a href="{{AppSubUrl}}/blender/blender">
|
|
||||||
<h4>Blender</h4>
|
|
||||||
</a>
|
|
||||||
<div class="description">
|
|
||||||
<p>The main repository for Blender's code and all its branches.</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="column">
|
|
||||||
<div class="ui card card-with-image card-with-icon">
|
|
||||||
<a href="{{AppSubUrl}}/blender/documentation" class="image">
|
|
||||||
<img src="/assets/img/thumb_manual.jpg" style="width: 100%; height: 100%;">
|
|
||||||
</a>
|
|
||||||
<div class="content">
|
|
||||||
<a href="{{AppSubUrl}}/blender/documentation">
|
|
||||||
<h4>User Manual</h4>
|
|
||||||
</a>
|
|
||||||
<div class="description">
|
|
||||||
<p>The official Blender manual, with references and examples.</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="column">
|
|
||||||
<div class="ui card card-with-image card-with-icon">
|
|
||||||
<a href="{{AppSubUrl}}/studio/flamenco" class="image">
|
|
||||||
<img src="/assets/img/thumb_flamenco.jpg" style="width: 100%; height: 100%;">
|
|
||||||
</a>
|
|
||||||
<div class="content">
|
|
||||||
<a href="{{AppSubUrl}}/studio/flamenco">
|
|
||||||
<h4>Flamenco</h4>
|
|
||||||
</a>
|
|
||||||
<div class="description">
|
|
||||||
<p>Free and open source render management software.</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="six wide column">
|
<div class="six wide column">
|
||||||
{{template "blender_components/card_releases" .}}
|
{{template "blender_components/card_releases" .}}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue