Skip to content

Commit c7e6a1b

Browse files
ipweblabVidas P
authored andcommitted
Improve appearance of badges
1 parent 3639744 commit c7e6a1b

File tree

4 files changed

+49
-19
lines changed

4 files changed

+49
-19
lines changed

app/assets/stylesheets/agent.scss

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
}
4242

4343
.agent-workflows {
44-
.badge {
44+
a.badge {
4545
font-size: 12px;
4646
font-weight: 400;
4747
margin: 0 0 3px 0;
@@ -55,7 +55,8 @@
5555
}
5656

5757
&:hover {
58-
filter: brightness(115%) saturate(115%);
58+
filter: brightness(115%) saturate(125%);
59+
pointer: default;
5960
}
6061
}
6162
}
@@ -235,8 +236,16 @@ li.issues {
235236

236237
// Nav
237238

238-
a.current-workflow {
239-
border: 1px white solid;
239+
.agents-top-nav {
240+
241+
a.current-workflow {
242+
background: #75787D;
243+
}
244+
245+
.badge {
246+
display: inline-flex;
247+
padding: 4px;
248+
}
240249
}
241250

242251

app/assets/stylesheets/general.scss

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ nav .nav-item .nav-link:focus,
9595

9696
.pagination li {
9797
@extend .page-item;
98+
9899
a {
99100
@extend .page-link;
100101
}
@@ -110,21 +111,19 @@ nav .nav-item .nav-link:focus,
110111
@extend .is-invalid;
111112
}
112113
// Hack to show feedback for fields with errors, uses sibling selector.
114+
113115
.field_with_errors ~ .invalid-feedback {
114116
display: block;
115117
}
116-
117-
118-
119118
// Select2 fixes
120-
121119
.select2 {
122120
float: none !important;
123121
margin-left: 0 !important;
124122
}
125123

126-
.select2-container .select2-choices .select2-search-field input,
127-
.select2-container .select2-choice, .select2-container .select2-choices {
124+
.select2-container .select2-choice,
125+
.select2-container .select2-choices,
126+
.select2-container .select2-choices .select2-search-field input {
128127
font-family: $font-family-base !important;
129128
}
130129

@@ -147,9 +146,7 @@ nav .nav-item .nav-link:focus,
147146
.schedule-region .cannot-be-scheduled {
148147
display: none;
149148
}
150-
151149
// Disabled
152-
153150
.agent-unavailable {
154151
opacity: 0.5;
155152
}
@@ -166,6 +163,25 @@ h1 .badge {
166163
text-shadow: none;
167164
}
168165

166+
.badge {
167+
display: inline-block;
168+
font-size: 12px;
169+
font-weight: 500;
170+
border-radius: 2px;
171+
max-width: 11rem;
172+
white-space: nowrap;
173+
overflow: hidden;
174+
text-overflow: ellipsis;
175+
text-shadow: none;
176+
}
177+
178+
.alert,
179+
.dropdown-menu {
180+
.badge.workflow {
181+
display: inline-flex;
182+
}
183+
}
184+
169185
.select2-highlighted a {
170186
color: yellow;
171187
text-decoration: underline;

app/assets/stylesheets/tables.scss

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ table.table {
5050
line-height: 1.2;
5151
padding: 8px;
5252
padding-top: 10px;
53-
5453
border: none;
5554
border-bottom: 1px solid #222;
5655
border-bottom-width: 1px !important;
@@ -60,11 +59,6 @@ table.table {
6059
border-bottom-width: 0 !important;
6160
}
6261

63-
.badge {
64-
font-size: 14px;
65-
font-weight: 500;
66-
margin-right: 8px;
67-
border-radius: 2px;
6862
}
6963
}
7064

app/assets/stylesheets/workflows.scss

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,18 @@
11

22
h1 {
33
.badge.workflow {
4-
top: -3px;
4+
top: 3px;
55
position: relative;
6+
7+
i.fa {
8+
width: 24px;
9+
height: 25px;
10+
font-size: 18px;
11+
display: inline-flex;
12+
align-items: center;
13+
justify-content: center;
14+
padding: 0;
15+
}
616
}
717
}
818

@@ -35,6 +45,7 @@ h1 {
3545
height: 32px;
3646
border-radius: 2px;
3747
vertical-align: middle;
48+
margin-right: 8px;
3849
padding: 5px 0;
3950
top: -3px;
4051
position: relative;

0 commit comments

Comments
 (0)