Skip to content

Commit 15a02b9

Browse files
CSS fixes, Image update in wiki, travis file update (#219)
* Some CSS fixes * Update GUI images in wiki docs * Single line environment variables in travis
1 parent 4d59190 commit 15a02b9

File tree

7 files changed

+40
-27
lines changed

7 files changed

+40
-27
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ language: java
77
services:
88
- docker
99

10+
# All environment variables must be in one line to trigger a single build.
1011
env:
11-
- EI_BACKEND_PORT=8099
12-
- JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64
12+
- EI_BACKEND_PORT=8099 JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64
1313

1414
# Using default 'test' stage for our tests, and only running deploy stage
1515
# (after merge) on master branch

src/main/resources/static/css/style.css

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@
2020
.card-standard {
2121
width: 25rem;
2222
}
23-
.top-nav-bar-text{
24-
color: #c1c1c1;
25-
padding-left: 0px;
26-
font-size: 90%;
27-
}
2823
.sticky-button-bar{
2924
position: -webkit-sticky; /* Safari */
3025
position: sticky;

src/main/resources/static/css/ui.css

Lines changed: 31 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ body {
66
.app-header {
77
position: fixed;
88
display: flex;
9-
flex-wrap: wrap;
109
align-items: center;
1110
z-index: 1030;
1211
width: 100%;
@@ -34,7 +33,7 @@ body {
3433
}
3534
.app-header .navbar-logo {
3635
display: flex;
37-
width: 200px;
36+
min-width: 200px;
3837
align-items: center;
3938
justify-content: flex-start;
4039
padding-left: 10px;
@@ -48,7 +47,7 @@ body {
4847
}
4948
.app-header .header-bar {
5049
visibility: visible;
51-
max-width: 50%;
50+
max-width: 500px;
5251
min-width: 10%;
5352
outline: 0;
5453
}
@@ -60,8 +59,9 @@ body {
6059
}
6160
.app-header .navbar-nav {
6261
flex-direction: row;
63-
align-items: center;
6462
padding-left: 10px;
63+
min-width: 290px;
64+
justify-content: flex-end;
6565
}
6666
.app-header .navbar-toggler {
6767
margin-right: 10px;
@@ -156,9 +156,10 @@ body {
156156
}
157157
.app-header .nav-item.dropdown .badge {
158158
position: absolute;
159-
margin-left: -0.8rem;
159+
margin-left: -6rem;
160160
margin-top: -0.4rem;
161161
font-size: 0.6rem;
162+
color: #ffffff;
162163
}
163164
.app-header .nav-item.dropdown .dropdown-menu {
164165
background-clip: border-box;
@@ -203,14 +204,21 @@ body {
203204
}
204205
.nav-link {
205206
padding: 0;
206-
padding-right: 10px !important;
207+
padding-right: 5px !important;
207208
}
208209
.nav-link:focus {
209210
outline: 0;
210211
}
211212
.nav-link:hover .fa {
212213
color: #fff;
213214
}
215+
.nav-link > span {
216+
color: #c1c1c1;
217+
font-size: 90%;
218+
}
219+
.nav-link:hover > span{
220+
color: #fff;
221+
}
214222
.nav-item.dropdown .nav-link[aria-expanded="true"] .fa {
215223
color: #fff;
216224
}
@@ -220,15 +228,17 @@ body {
220228
top: 0.6rem;
221229
}
222230
.nav-item.dropdown .nav-link[aria-expanded="false"]:after {
231+
display: inline-block;
232+
width: 10px;
223233
color: #c1c1c1;
224-
width: auto;
225234
content: '\f105';
226235
border: none;
227236
font-family: 'FontAwesome';
228237
}
229238
.nav-item.dropdown .nav-link[aria-expanded="true"]:after {
239+
display: inline-block;
240+
width: 10px;
230241
color: #fff;
231-
width: auto;
232242
content: '\f107';
233243
border: none;
234244
font-family: 'FontAwesome';
@@ -409,9 +419,6 @@ body {
409419
}
410420

411421
@media (max-width: 767.98px) {
412-
.app-header .header-bar {
413-
max-width: 100%;
414-
}
415422
.app-body .sidebar {
416423
margin-left: -200px;
417424
}
@@ -428,9 +435,10 @@ body {
428435
margin-left: 200px;
429436
}
430437
.app-header {
438+
flex-wrap: wrap;
431439
align-items: flex-start;
432440
height: 80px;
433-
padding-top: 15px;
441+
padding-top: 5px;
434442
}
435443
.app-header.header-bar-hidden {
436444
height: 55px;
@@ -450,16 +458,20 @@ body {
450458
}
451459
.app-header .navbar-toggler {
452460
order: 1;
461+
align-self: center;
462+
margin-right: 0;
453463
}
454464
.app-header .header-bar {
455465
order: 4;
456466
align-self: flex-end;
457467
max-width: 100%;
458468
width: 100%;
459-
margin: 0 10px 10px 10px;
469+
margin: 0 10px 5px 10px;
460470
}
461471
.app-header .navbar-nav {
462472
order: 3;
473+
align-self: center;
474+
min-width: 0;
463475
}
464476
.app-header .nav-item.dropdown .dropdown-menu {
465477
position: fixed !important;
@@ -471,6 +483,9 @@ body {
471483
background-color: #2f353a;
472484
transform: none !important;
473485
}
486+
.app-header .nav-item.dropdown .nav-link > span:first-of-type {
487+
display: none;
488+
}
474489
.app-header .nav-item.dropdown .dropdown-menu .dropdown-header {
475490
border-radius: 0.25rem 0.25rem 0 0;
476491
}
@@ -508,6 +523,9 @@ body {
508523
content: "";
509524
background: rgba(0,0,0,.75);
510525
}
526+
.app-header .nav-item.dropdown .badge {
527+
margin-left: -0.8rem;
528+
}
511529
}
512530

513531
@media (hover: none) {

src/main/resources/templates/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<a class="nav-link" id="alertsLink" data-toggle="dropdown" href="#" role="button" aria-haspopup="true"
4141
aria-expanded="false">
4242
<i class="fa fa-bell" aria-hidden="true"></i>
43-
<span class="top-nav-bar-text">Notifications</span>
43+
<span>Notifications</span>
4444
<span class="badge badge-pill badge-danger" data-bind="visible: $root.newMessagesLength() > 0, text: $root.newMessagesLength()"></span>
4545
</a>
4646
<div class="alert-menu dropdown-menu">
@@ -67,7 +67,7 @@
6767
<li class="nav-item dropdown" id="userItem">
6868
<a class="nav-link" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
6969
<i id="login-nav-bar-icon" class="fa fa-user-circle" aria-hidden="true"></i>
70-
<span id="login-nav-bar-text" class="top-nav-bar-text"></span>
70+
<span id="login-nav-bar-text"></span>
7171
</a>
7272
<div class="user-menu dropdown-menu">
7373
<div class="dropdown-header text-center">

wiki/markdown/images/overview.png

-10 KB
Loading
-4.25 KB
Loading

wiki/markdown/subscription-handling.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ the Eiffel Intelligence front-end, once the authentication (if enabled) is done.
1212
#### _Add Subscription_
1313
This button opens a form with a number of fields to create a subscription
1414
through subscription endpoint (POST /subscriptions).
15-
#### _Reload_
16-
This button reloads the data from the database and refresh the data in the
17-
subscription table
15+
#### _Upload Subscriptions_
16+
This button help uploads a subscription by opening a file explorer
1817
#### _Bulk Delete_
1918
This button deletes all the selected subscriptions in the table from the
2019
database.
20+
#### _Reload_
21+
This button reloads the data from the database and refresh the data in the
22+
subscription table
2123
#### _Get Template_
2224
This button downloads a subscription template
23-
#### _Upload Subscriptions_
24-
This button help uploads a subscription by opening a file explorer
2525
#### _EI Back-end Status_
2626
This button indicates, through its color, whether a back-end instance is
2727
connected with front-end or not. The green color means back-end is connected

0 commit comments

Comments
 (0)