NextERP/runbot
5
0
Fork 0
mirror of https://github.com/odoo/runbot.git synced 2025-03-27 13:25:47 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

[FIX] runbot_merge: frontend templates & styles for 15.0

Browse Source 
15.0 (or 14.0) dropped some of the BS3 (?) compatibility stuff, which
the mergebot was (apparently) relying on. This lead to a visual
degradation as well as the frontend dropdown looking absolutely awful.

Fix that, on both style and templates.

15.0 (or 14.0) also dropped the bespoke responsive utility classes,
switch to bootstrap's.
This commit is contained in:
Xavier Morel 2022-11-29 10:02:18 +01:00
parent 3664eabd90
commit af016f4239
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
runbot_merge/static/scss/runbot_merge.scss
View File

@ -1,7 +1,12 @@
// FIX: bs4 shit-heap colors and styles // FIX: bs4 shit-heap colors and styles
body { html {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
color: #666666; color: #666666;
font-size: 14px;
}
body {
color: inherit;
font-family: inherit;
} }
h1, h2, h3, h4, h5, h6{ h1, h2, h3, h4, h5, h6{
color: inherit; color: inherit;
@ -36,6 +41,8 @@ h5 { font-size: 1em; }
.list-inline > li { .list-inline > li {
padding: 0 5px; padding: 0 5px;
margin-right: 0; margin-right: 0;
// TODO: find better way to do this
display: inline-block;
} }
// mergebot layouting // mergebot layouting

26
runbot_merge/views/templates.xml
View File

@ -13,6 +13,7 @@
<a t-attf-href="https://github.com/{{ pr.repository.name }}/pull/{{ pr.number }}" <a t-attf-href="https://github.com/{{ pr.repository.name }}/pull/{{ pr.number }}"
t-att-title="pr.blocked or title.strip()" t-att-title="pr.blocked or title.strip()"
t-att-target="target or None" t-att-target="target or None"
t-att-class="classes or None"
><t t-esc="pr.display_name"/></a> ><t t-esc="pr.display_name"/></a>
</template> </template>
@ -29,8 +30,10 @@
<span class="caret"></span> <span class="caret"></span>
</button> </button>
<ul class="dropdown-menu staging-statuses"> <ul class="dropdown-menu staging-statuses">
<li groups="runbot_merge.group_admin"> <li >
<a t-attf-href="/web#id={{staging.id}}&amp;view_type=form&amp;model=runbot_merge.stagings" <a groups="runbot_merge.group_admin"
class="dropdown-item" role="menuitem"
t-attf-href="/web#id={{staging.id}}&amp;view_type=form&amp;model=runbot_merge.stagings"
target="new"> target="new">
Open Staging Open Staging
</a> </a>
@ -38,14 +41,14 @@
<t t-set="statuses" t-value="{(r, c): (s, t) for r, c, s, t in staging.statuses}"/> <t t-set="statuses" t-value="{(r, c): (s, t) for r, c, s, t in staging.statuses}"/>
<t t-foreach="repo_statuses._for_staging(staging)" t-as="req"> <t t-foreach="repo_statuses._for_staging(staging)" t-as="req">
<t t-set="st" t-value="statuses.get((req.repo_id.name, req.context)) or (None, None)"/> <t t-set="st" t-value="statuses.get((req.repo_id.name, req.context)) or (None, None)"/>
<li t-att-class=" <a t-att-href="st[1]" target="new" role="menuitem" t-attf-class="
'bg-success' if st[0] == 'success' dropdown-menu
{{'bg-success' if st[0] == 'success'
else 'bg-danger' if st[0] in ('error', 'failure') else 'bg-danger' if st[0] in ('error', 'failure')
else 'bg-info' if st[0] else 'bg-info' if st[0]
else 'bg-light'" else 'bg-light'}}">
><a t-att-href="st[1]" target="new">
<t t-esc="req.repo_id.name"/>: <t t-esc="req.context"/> <t t-esc="req.repo_id.name"/>: <t t-esc="req.context"/>
</a></li> </a>
</t> </t>
</ul> </ul>
</div> </div>
@ -164,8 +167,8 @@
<t t-if="not (success or failure or pending)">bg-gray-lighter</t> <t t-if="not (success or failure or pending)">bg-gray-lighter</t>
</t> </t>
<t t-set="decorationclass" > <t t-set="decorationclass" >
<t t-if="staging_index >= 2">hidden-xs</t> <t t-if="4 > staging_index >= 2">d-none d-md-block</t>
<t t-if="staging_index >= 4">visible-lg-block</t> <t t-if="staging_index >= 4">d-none d-lg-block</t>
</t> </t>
<t t-set="title"> <t t-set="title">
<t t-if="staging.state == 'ff_failed'">fast forward failed (<t t-esc="staging.reason"/>)</t> <t t-if="staging.state == 'ff_failed'">fast forward failed (<t t-esc="staging.reason"/>)</t>
@ -254,11 +257,12 @@
<span class="caret"></span> <span class="caret"></span>
</button> </button>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li t-foreach="batch.prs" t-as="pr"> <t t-foreach="batch.prs" t-as="pr">
<t t-call="runbot_merge.link-pr"> <t t-call="runbot_merge.link-pr">
<t t-set="target">new</t> <t t-set="target">new</t>
<t t-set="classes">dropdown-item</t>
</t> </t>
</li> </t>
</ul> </ul>
</li> </li>
</t> </t>