Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 54363f2

Browse files
rmarsrmars
committed
Start to unify the different pages of the linkerd admin site
* consolidate versions of the navbar that we use * add router name toggle to linkerd dashboard page * handle router name as params in the dashboard page, like we do in the delegator * delete the css files under /styleguide, as we no longer care to keep the admin dashboard in sync with linkerd.io * linkerd#499 the linkerd delegator page now is consistent with the dashboard (and now looks like the namerd one) * linkerd#501 Make the logging page look more like the dashboard page
1 parent 3a4aab3 commit 54363f2

File tree

17 files changed

+174
-476
lines changed

17 files changed

+174
-476
lines changed

‎admin/src/main/resources/io/buoyant/admin/css/admin.css‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎admin/src/main/resources/io/buoyant/admin/css/dashboard-shared.css‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,16 @@
22
* Styles from the new dashboard that are general enough to share.
33
*/
44

5+
body {
6+
font-family: "Source Sans Pro","Helvetica Neue",sans-serif;
7+
font-weight: 400;
8+
background-image: radial-gradient(54% 23%, #161963 0%, #090B34 97%);
9+
background-size: cover;
10+
background-repeat: no-repeat;
11+
color: #FFFFFF;
12+
min-height: 100vh;
13+
}
14+
515
.metric-header {
616
font-size: 13px;
717
letter-spacing: 1px;
@@ -55,3 +65,41 @@
5565
.sr-undefined {
5666
color: #FFFFFF;
5767
}
68+
69+
/*
70+
* Navbar styles
71+
*/
72+
.navbar {
73+
margin-bottom: 0;
74+
}
75+
76+
nav {
77+
font-size: 18px;
78+
font-weight: 300;
79+
line-height: 1.1;
80+
}
81+
82+
.navbar-container {
83+
padding: 20px 27px 9px 27px;
84+
}
85+
86+
.nav {
87+
margin-top: -11px;
88+
}
89+
90+
.navbar-brand-img img {
91+
height: 26px;
92+
}
93+
94+
nav ul.navbar-nav {
95+
margin-left: 10px;
96+
}
97+
98+
.navbar-right {
99+
margin-top: 3px;
100+
}
101+
102+
.navbar-right .dropdown {
103+
margin-right: 30px;
104+
margin-top: -14px;
105+
}

‎admin/src/main/resources/io/buoyant/admin/css/dashboard.css‎

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
body {
2-
font-family: "Source Sans Pro","Helvetica Neue",sans-serif;
3-
font-weight: 400;
4-
background-image: radial-gradient(54% 23%, #161963 0%, #090B34 97%);
5-
background-size: cover;
6-
background-repeat: no-repeat;
7-
color: #FFFFFF;
8-
min-height: 100vh;
9-
}
10-
111
.col-md-2 {
122
width: 198px;
133
padding: 0 27px 0 0;
@@ -31,36 +21,6 @@ body {
3121
padding: 0;
3222
}
3323

34-
.navbar {
35-
margin-bottom: 0;
36-
}
37-
38-
nav {
39-
font-size: 18px;
40-
font-weight: 300;
41-
line-height: 1.1;
42-
}
43-
44-
.navbar-container {
45-
padding: 20px 27px 9px 27px;
46-
}
47-
48-
.nav {
49-
margin-top: -11px;
50-
}
51-
52-
.navbar-brand-img img {
53-
height: 26px;
54-
}
55-
56-
nav ul.navbar-nav {
57-
margin-left: 10px;
58-
}
59-
60-
.navbar-right {
61-
margin-top: 3px;
62-
}
63-
6424
.modal-content {
6525
border-color: #fff;
6626
background-color: #999;

‎admin/src/main/resources/io/buoyant/admin/css/logger-overrides.css‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
/*
2+
* Overrides the twitter server logging page styles
3+
*/
4+
5+
#navbar {
6+
float: left;
7+
padding-left: 0px;
8+
padding-right: 0px;
9+
}
10+
11+
#navbar ul.nav>li {
12+
padding-left: 0px;
13+
padding-right: 0px;
14+
}
15+
16+
#navbar ul.nav>li>a {
17+
font-size: 18px;
18+
font-weight: 300;
19+
line-height: 1.1;
20+
}
21+
22+
#navbar ul.nav {
23+
margin-top: -12px;
24+
}
25+
26+
#contents {
27+
margin-left: 0px;
28+
padding-top: 0px;
29+
}
30+
31+
.table-striped>tbody>tr:nth-child(odd)>td, .table-striped>tbody>tr:nth-child(odd)>th {
32+
background-color: #161963;
33+
}
34+
35+
.table-striped>tbody>tr>td {
36+
border-top: 2px solid gray;
37+
}
38+
39+
.table-striped>thead>tr {
40+
border-bottom: 3px solid gray;
41+
}
42+
43+
.table>thead>tr>th {
44+
border-bottom: none;
45+
}
46+
47+
.table h5 {
48+
color: white;
49+
}
50+
51+
table>caption{
52+
color: red;
53+
}

‎admin/src/main/resources/io/buoyant/admin/css/styleguide/local.css‎

Lines changed: 0 additions & 151 deletions
This file was deleted.

0 commit comments

Comments
 (0)