Skip to content

Commit 336b66f

Browse files
pparidansXavier-Do
authored andcommitted
[FIX] runbot: btn-default styling, cleanup & fix active state
BS button "default" variant styling coherence depending on the states (regular/hover/active) and fixing the missing border color on active state. Also fix the search field's "github PR" button styling.
1 parent dbf5f43 commit 336b66f

2 files changed

Lines changed: 31 additions & 30 deletions

File tree

runbot/static/src/css/runbot.css

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
:root {
22
--gray: #6c757d; /* used for batch limitation */
3+
--btn-default-color: var(--bs-body-color);
4+
--btn-default-bg: var(--bs-body-bg);
5+
--btn-default-border: #ccc;
6+
--active-project-color: #777;
37
}
48

59
/*
@@ -13,14 +17,20 @@
1317
--bs-info-bg-subtle: #d9edf7;
1418
--bs-info-rgb: 23, 162, 184;
1519
}
16-
:root[data-bs-theme=red404] {
20+
21+
:root[data-bs-theme=red404] {
1722
--bs-success-bg-subtle: #cdffb9;
1823
--bs-danger-bg-subtle: #e67ecf;
1924
--bs-warning-bg-subtle: #fae9b1;
2025
--bs-info-bg-subtle: #b6e2f8;
2126
--bs-info-rgb: 23, 162, 184;
2227
}
2328

29+
:root[data-bs-theme=dark] {
30+
--btn-default-border: #333;
31+
--active-project-color: #CCC;
32+
}
33+
2434
[data-bs-theme=legacy] .text-bg-info {
2535
color: #fff !important; /* black by default, changes from previous version, color forced to fit with --bs-info-rgb*/
2636
}
@@ -59,37 +69,28 @@
5969
--bs-btn-disabled-border-color: #b90e6c;
6070
}
6171

62-
63-
:root {
64-
--alternative:#ccc;
65-
--btn-default-color: var(--bs-body-color);
66-
--btn-default-border:#ccc;
67-
--bs-default-rgb: var(--bs-body-color-rgb);
68-
--active-project-color: #777;
69-
70-
}
71-
72-
:root[data-bs-theme=dark] {
73-
--btn-default-border:#333;
74-
--btn-default-color: var(--bs-body-color);
75-
--active-project-color: #CCC;
76-
}
77-
7872
.btn-default {
7973
--bs-btn-color: var(--btn-default-color);
80-
--bs-btn-bg: var(--bs-body-bg);
74+
--bs-btn-bg: var(--btn-default-bg);
8175
--bs-btn-border-color: var(--btn-default-border);
8276
--bs-btn-hover-color: var(--btn-default-color);
83-
--bs-btn-hover-bg: var(--btn-default-border);
84-
--bs-btn-hover-border-color: var(--btn-default-border);
77+
--bs-btn-hover-bg: color-mix(in lab, var(--btn-default-bg), black 15%);
78+
--bs-btn-hover-border-color: color-mix(in lab, var(--btn-default-border), black 10%);
8579
--bs-btn-focus-shadow-rgb: 60, 153, 110;
8680
--bs-btn-active-color: var(--btn-default-color);
87-
--bs-btn-active-bg: var(--bs-body-bg);
88-
--bs-btn-active-border-color: var(--bs-body-bg);
81+
--bs-btn-active-bg: color-mix(in lab, var(--btn-default-bg), black 20%);
82+
--bs-btn-active-border-color: color-mix(in lab, var(--btn-default-border), black 15%);
8983
--bs-btn-active-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
9084
--bs-btn-disabled-color: var(--btn-default-color);
91-
--bs-btn-disabled-bg: var(--bs-body-bg);
92-
--bs-btn-disabled-border-color: var(--btn-default-border);;
85+
--bs-btn-disabled-bg: var(--btn-default-bg);
86+
--bs-btn-disabled-border-color: var(--btn-default-border);
87+
}
88+
89+
[data-bs-theme=dark] .btn-default {
90+
--bs-btn-hover-bg: color-mix(in lab, var(--btn-default-bg), white 15%);
91+
--bs-btn-hover-border-color: color-mix(in lab, var(--btn-default-border), white 10%);
92+
--bs-btn-active-bg: color-mix(in lab, var(--btn-default-bg), white 20%);
93+
--bs-btn-active-border-color: color-mix(in lab, var(--btn-default-border), white 15%);
9394
}
9495

9596
.btn-info {

runbot/templates/frontend.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
<form class="form-inline my-2 my-lg-0" role="search" t-att-action="qu(search='')" method="get">
88
<div class="input-group md-form form-sm form-2 ps-0">
99
<input class="form-control my-0 py-1" type="text" placeholder="Search" aria-label="Search" name="search" t-att-value="search" autofocus="autofocus"/>
10-
<a t-if="has_pr" class="btn btn-primary active input-group-text" title="All" t-att-href="qu(has_pr=None)">
11-
<i class="fa fa-github text-grey"/>
10+
<a t-if="has_pr" class="btn btn-primary" title="All" t-att-href="qu(has_pr=None)">
11+
<i class="fa fa-github"/>
1212
</a>
13-
<a t-else="" class="btn input-group-text" title="Open pull requests" t-att-href="qu(has_pr=1)">
14-
<i class="fa fa-github text-grey"/>
13+
<a t-else="" class="btn btn-default" title="Open pull requests" t-att-href="qu(has_pr=1)">
14+
<i class="fa fa-github"/>
1515
</a>
16-
<button type='submit' class="input-group-text">
17-
<i class="fa fa-search text-grey"/>
16+
<button type="submit" class="btn btn-default">
17+
<i class="fa fa-search"/>
1818
</button>
1919
</div>
2020
</form>

0 commit comments

Comments
 (0)