NextERP/runbot
5
0
Fork 0
mirror of https://github.com/odoo/runbot.git synced 2025-03-15 23:45:44 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

[FIX] runbot_merge: styling crap

Browse Source 
bs4 yields complete vomit on the template as-is (see:
https://imgur.com/a/XIMn7MX).

Add a bunch of color and styling overrides to get something closer to
the original, and move the existing styles to a "proper" scss file
while at it.
This commit is contained in:
Xavier Morel 2020-01-21 11:21:14 +01:00
parent 63271cd82e
commit 3f44bb5c9e
2 changed files with 67 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
runbot_merge/static/scss/runbot_merge.scss Normal file
View File

@ -0,0 +1,61 @@
// FIX: bs4 shit-heap colors and styles
body {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
color: #666666;
}
h1, h2, h3, h4, h5, h6{
color: inherit;
margin-top: 0.66em;
margin-bottom: 0.33em;
}
h5 { font-size: 1em; }
.bg-success, .bg-info, .bg-warning, .bg-danger, .bg-gray-lighter {
color: inherit;
}
.dropdown-item, .dropdown-menu, .dropdown-menu a {
color: inherit;
}
.bg-success {
background-color: #dff0d8 !important;
}
.bg-info {
background-color: #d9edf7 !important;
}
.bg-warning {
background-color: #fcf8e3 !important;
}
.bg-danger {
background-color: #f2dede !important;
}
.list-inline {
margin-bottom: 10px;
}
.list-inline > li {
padding: 0 5px;
margin-right: 0;
}
// mergebot layouting
.stagings {
display: flex;
align-items: stretch;
}
.stagings > li {
flex: 1;
padding: 0.1em;
padding-left: 0.5em;
}
.stagings > li:not(:last-child) {
border-right: 1px solid lightgray;
}
.batch:not(:last-child) {
border-bottom: 1px solid lightgray;
}
.batch a:not(:last-of-type) a:after {
content: ",";
}
.pr-listing > * { display: inline-block; }
.pr-awaiting { opacity: 0.8; }
.pr-blocked { opacity: 0.6; }
.pr-failed { opacity: 0.9; }

34
runbot_merge/views/templates.xml
View File

@ -1,34 +1,12 @@
<odoo>
<template id="dashboard" name="mergebot dashboard">
<t t-set="styles">
<style>
.stagings {
display: flex;
align-items: stretch;
}
.stagings > li {
flex: 1;
<template id="assets_frontend" inherit_id="web.assets_frontend">
<xpath expr="link[last()]" position="after">
<link rel="stylesheet" type="text/scss" href="/runbot_merge/static/scss/runbot_merge.scss"/>
</xpath>
</template>
padding: 0.1em;
padding-left: 0.5em;
}
.stagings > li:not(:last-child) {
border-right: 1px solid lightgray;
}
.batch:not(:last-child) {
border-bottom: 1px solid lightgray;
}
.batch a:not(:last-of-type) a:after {
content: ",";
}
.pr-listing > * { display: inline-block; }
.pr-awaiting { opacity: 0.8; }
.pr-blocked { opacity: 0.6; }
.pr-failed { opacity: 0.9; }
</style>
</t>
<template id="dashboard" name="mergebot dashboard">
<t t-call="website.layout">
<t t-set="head" t-value="(head or '') + styles"/>
<div id="wrap"><div class="container-fluid">
<section t-foreach="projects.with_context(active_test=False)" t-as="project" class="row">
<h1 class="col-md-12"><t t-esc="project.name"/></h1>