Skip to content

Commit 7cdf181

Browse files
authored
Merge pull request #2 from SEPIA-Framework/dev
New smart home section and layout updates.
2 parents 1545b4e + 13993b9 commit 7cdf181

File tree

6 files changed

+485
-62
lines changed

6 files changed

+485
-62
lines changed

admin-web-tools/css/shared.css

Lines changed: 63 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
-webkit-box-sizing: border-box;
66
}
77
body {
8-
background-color: #FFF;
9-
color: #16ABC3;
8+
background-color: #000;
9+
color: #FFF;
1010
}
1111
label {
1212
display: inline-block;
@@ -17,6 +17,15 @@ input,
1717
select {
1818
display: inline-block;
1919
min-width: 192px;
20+
border: 0;
21+
padding: 4px 6px;
22+
margin: 1px;
23+
}
24+
select {
25+
padding-left: 2px;
26+
}
27+
input {
28+
padding: 5px 6px;
2029
}
2130
input[type="checkbox"] {
2231
min-width: 42px;
@@ -30,11 +39,14 @@ td {
3039
min-width: 128px;
3140
text-align: left;
3241
}
42+
h2 {
43+
margin: 40px 0;
44+
}
3345
h3 {
3446
margin: 16px 0 0 0;
3547
}
3648
#main_win {
37-
border: 1px solid #9ad0df;
49+
border: 1px solid #fff;
3850
-webkit-border-radius: 5px;
3951
-moz-border-radius: 5px;
4052
border-radius: 5px;
@@ -53,6 +65,17 @@ h3 {
5365
width: 100%;
5466
height: 100%;
5567
}
68+
#pages_menu {
69+
display: flex;
70+
flex-wrap: wrap;
71+
padding: 8px;
72+
}
73+
#pages_menu hr {
74+
width: 100%;
75+
height: 0;
76+
margin: 0;
77+
border: 0;
78+
}
5679
.page {
5780
display: none;
5881
width: 100%;
@@ -64,10 +87,16 @@ h3 {
6487
flex-direction: column;
6588
align-items: center;
6689
justify-content: center;
67-
padding-bottom: 24px;
90+
padding: 24px 0;
91+
}
92+
.page_content hr {
93+
width: 100%;
94+
height: 21px;
95+
margin: 0;
96+
border: 0;
6897
}
6998
#show_result {
70-
border: 1px solid #9ad0df;
99+
border: 1px solid #fff;
71100
-webkit-border-radius: 5px;
72101
-moz-border-radius: 5px;
73102
border-radius: 5px;
@@ -77,36 +106,52 @@ h3 {
77106
}
78107

79108
.menu_button {
80-
background: #16ABC3;
81-
color: #fff;
82-
border: 0;
83-
border-radius: 0px;
84-
padding: 4px 12px;
109+
background: #000;
110+
color: #fff;
111+
border: 1px solid;
112+
border-radius: 0px;
113+
padding: 6px 16px;
85114
margin: 2px;
86115
cursor: pointer;
116+
flex-grow: 1;
87117
}
88118
.menu_button:hover {
89-
background: #888;
119+
background: #16ABC3;
90120
color: #fff;
91121
}
92122
.menu_button.active {
93-
box-shadow: 0 0 0 2px rgba(22, 171, 195, 0.5);
123+
/*box-shadow: 0 0 0 2px rgba(22, 171, 195, 0.85);*/
124+
background: #16ABC3;
125+
color: #fff;
94126
}
95127
.interface_button {
96128
background: #ceff1a;
97129
color: #000;
98-
border: 0;
99-
border-radius: 3px;
100-
padding: 4px 12px;
130+
border: 1px solid #ceff1a;
131+
border-radius: 0px;
132+
padding: 5px 15px;
101133
margin: 2px;
102134
cursor: pointer;
103135
}
104136
.interface_button:hover {
105137
background: #000;
106138
color: #ceff1a;
139+
border: 1px solid white;
140+
}
141+
.interface_button_box {
142+
display: flex;
143+
flex-wrap: wrap;
144+
padding: 8px;
145+
justify-content: center;
146+
}
147+
.interface_button_box hr {
148+
width: 100%;
149+
height: 0px;
150+
border: 0;
151+
margin: 2px;
107152
}
108153

109-
#pwd-security-indicator {
154+
.input-inline-indicator {
110155
position: absolute;
111156
top: 4px;
112157
right: 4px;
@@ -115,9 +160,9 @@ h3 {
115160
border-radius: 6px;
116161
background: #f00;
117162
}
118-
#pwd-security-indicator.secure {
163+
.input-inline-indicator.secure {
119164
background: #0f0;
120165
}
121-
#pwd-security-indicator.inactive {
166+
.input-inline-indicator.inactive {
122167
background: #fff;
123168
}

admin-web-tools/css/smart-home.css

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
#smarthome-devices-list {
2+
width: 100%;
3+
padding: 0 16px;
4+
display: flex;
5+
justify-content: center;
6+
flex-wrap: wrap;
7+
}
8+
9+
.smarthome-item {
10+
border-radius: 0px;
11+
background: #eee;
12+
color: #000;
13+
width: 100%;
14+
margin: 2px 0px;
15+
}
16+
.smarthome-item-title {
17+
background: #16ABC3;
18+
color: #fff;
19+
padding: 8px;
20+
}
21+
.smarthome-item-body {
22+
padding: 8px;
23+
}

admin-web-tools/favicon.ico

1.12 KB
Binary file not shown.

0 commit comments

Comments
 (0)