Skip to content

Commit 6c12594

Browse files
fquirinfquirin
authored
Merge pull request #12 from SEPIA-Framework/dev
Update to v0.15.2
2 parents 34a7e16 + e05a339 commit 6c12594

File tree

71 files changed

+6165
-884
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+6165
-884
lines changed

‎config.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version='1.0' encoding='utf-8'?>
2-
<widget id="org.example.sepia.app.web" version="0.14.3" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
2+
<widget id="org.example.sepia.app.web" version="0.15.2" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
33
<name>S.E.P.I.A.</name>
44
<description>
55
Prototype of S.E.P.I.A. framework client

‎www/css/sepiaFW-alwaysOn.css‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
/* modifiers to make sure there are no frames and stuff around the view */
2+
3+
#sepiaFW-main-window.sepiaFW-ao-mode {
4+
border-color: #000 !important;
5+
box-shadow: 0 0 0 0 #000 !important;
6+
}
7+
.sepiaFW-top-layer-view.sepiaFW-ao-mode {
8+
border-radius: 0 !important; /* we should find a better solution to remove all changes */
9+
}
10+
11+
/* Always-On elements */
12+
113
#sepiaFW-alwaysOn-view {
214
background: #000;
315
color: #fff;
@@ -30,6 +42,15 @@
3042
z-index: 99;
3143
}
3244

45+
.sepiaFW-alwaysOn-alarm-anim {
46+
animation: alarm 1s infinite ease-in;
47+
}
48+
@keyframes alarm {
49+
0% { background-color: #000; }
50+
50% { background-color: #ceff1a; }
51+
100% { background-color: #000; }
52+
}
53+
3354
#sepiaFW-alwaysOn-avatar .avatar-eye {
3455
position: absolute;
3556
width: 30%;

‎www/css/sepiaFW-cards.css‎

Lines changed: 110 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.sepiaFW-cards-flexSize-container {
2-
background: rgba(0, 0, 0, 0.10);
2+
background: #e5e5e5; /*rgba(0, 0, 0, 0.10);*/
33
position: relative;
44
margin: 5px 0px;
55
border-radius: 3px;
@@ -59,32 +59,49 @@
5959

6060
/* ------ Lists ------ */
6161

62+
/* commons */
63+
.sepiaFW-list-drag-dummy {
64+
position: fixed;
65+
pointer-events: none;
66+
background: rgba(125, 125, 125, 0.5);
67+
margin: 0;
68+
padding: 0;
69+
z-index: 999;
70+
}
71+
.sepiaFW-list-hover-over {
72+
opacity: 0.5;
73+
}
74+
6275
/* header */
6376
.sepiaFW-cards-list-title {
6477
display: flex;
78+
flex-wrap: wrap;
6579
justify-content: space-between;
6680
position: relative;
6781
/*background: rgba(205, 235, 205, 0.90);*/
6882
background: rgba(235, 235, 255, 0.95);
6983
/*color: #fff;*/
7084
/*border-radius: 3px 3px 0 0;*/
85+
border-radius: 3px;
7186
margin: 0px 5px 0px 5px;
7287
width: calc(100% - 10px);
7388
min-height: 38px;
74-
padding: 1px;
89+
padding-top: 1px;
7590
text-align: center;
7691
font-weight: bold;
7792
line-height: 27px;
7893
}
79-
.sepiaFW-cards-list-title span {
94+
.sepiaFW-cards-list-title > span {
8095
/*position: absolute;
8196
left: 50%;
8297
top: 50%;
8398
transform: translate(-50%, -50%);*/
84-
display: inline-block;
99+
display: flex;
100+
align-items: center;
85101
flex: 0 1 auto;
102+
height: 37px;
86103
order: 2;
87-
padding-top: 3px;
104+
padding-top: 0px;
88105
}
89106
.sepiaFW-cards-list-title button {
90107
flex: 0 1 auto;
@@ -93,19 +110,32 @@
93110
padding: 4px 12px !important;
94111
}
95112
.sepiaFW-cards-list-contextMenu {
96-
position: absolute;
97-
top: 39px;
98-
right: 0px;
113+
/*position: absolute;
114+
top: 38px;
115+
right: 0px;*/
99116
line-height: 17px;
100117
font-size: 13px;
101118
display: none;
119+
width: 100%;
120+
order: 4;
121+
}
122+
.sepiaFW-cards-list-contextMenu > ul {
123+
display: flex;
124+
flex-wrap: wrap;
125+
justify-content: space-between;
102126
}
103-
.sepiaFW-cards-list-contextMenu li:first-of-type{
127+
.sepiaFW-cards-list-contextMenu li {
128+
padding: 2px 6px;
129+
display: flex;
130+
justify-content: center;
131+
align-items: center;
132+
}
133+
/*.sepiaFW-cards-list-contextMenu li:first-of-type{
104134
margin-top: 0px;
105135
}
106136
.sepiaFW-cards-list-contextMenu li:last-of-type{
107137
margin-bottom: 0px;
108-
}
138+
}*/
109139
.sepiaFW-cards-list-saveBtn {
110140
/*float: left;*/
111141
opacity: 0.10;
@@ -134,12 +164,30 @@
134164
.sepiaFW-cards-list-body {
135165
margin: 0px;
136166
padding: 0px;
137-
min-height: 5px;
167+
min-height: 25px;
138168
padding-bottom: 5px;
139169
}
140170
.sepiaFW-cards-list-body .listElement {
141171
display: flex;
142-
min-height: 33px;
172+
min-height: 34px;
173+
padding-top: 3px;
174+
}
175+
.sepiaFW-cards-list-body .listElement:first-child {
176+
margin-top: 2px;
177+
}
178+
.sepiaFW-cards-list-body .listElement.draggable-toggle {
179+
opacity: 0.6;
180+
}
181+
.sepiaFW-cards-list-body .listElement.dragging {
182+
opacity: 0.2;
183+
}
184+
.sepiaFW-cards-list-body .listElement.new-position {
185+
animation: list-pulse .500s 1;
186+
}
187+
@keyframes list-pulse {
188+
0% { opacity: 0.2; }
189+
33% { opacity: 0.05; }
190+
100% { opacity: 1.0; }
143191
}
144192
.sepiaFW-cards-list-body .listElement div {
145193
background: rgba(255, 255, 255, 0.90);
@@ -149,31 +197,55 @@
149197
min-height: 20px;
150198
}
151199
.sepiaFW-cards-list-body .listElement .listLeft {
152-
width: 50px;
153-
margin: 5px 0px 0px 5px;
200+
display: flex;
201+
align-items: center;
202+
justify-content: center;
203+
width: 44px;
204+
/*border-right: 3px solid #e5e5e5;*/
205+
margin: 0px 3px 0px 5px;
154206
user-select: none;
207+
cursor: pointer;
155208
}
156209
.sepiaFW-cards-list-body .listElement .listCenter {
157-
width: calc(100% - 120px);
158-
margin: 5px 5px 0px 5px;
159-
padding: 5px;
210+
display: flex;
211+
align-items: center;
212+
justify-content: left;
213+
width: calc(100% - 101px);
214+
margin: 0px 0px 0px 0px;
215+
padding: 5px 8px;
160216
}
161217
.sepiaFW-cards-list-body .listElement .listRight {
162-
width: 50px;
163-
margin: 5px 5px 0px 0px;
218+
display: flex;
219+
align-items: center;
220+
justify-content: center;
221+
width: 44px;
222+
/*border-left: 2px solid #545454;*/
223+
/*background: #bcbebe;*/
224+
border-left: 0px solid #fff;
225+
background: #d2d2dd;
226+
color: #fff;
227+
margin: 0px 5px 0px 3px;
164228
user-select: none;
165229
}
166-
.sepiaFW-notouch-device .sepiaFW-cards-list-body .listElement .listRight:hover { background: rgba(255, 0, 0, 0.50); }
230+
.sepiaFW-notouch-device .sepiaFW-cards-list-body .listElement .listRight:hover {
231+
background: rgba(255, 0, 0, 0.50);
232+
}
167233

168234
.sepiaFW-cards-list-body .listElement .checked {
169-
background: rgba(0, 255, 0, 0.50);
235+
background: rgba(0, 255, 0, 0.50); /*#72f272 - rgba(114, 242, 114, 0.75)*/
170236
}
171-
.sepiaFW-notouch-device .sepiaFW-cards-list-body .listElement .checked:hover { background: rgba(0, 255, 255, 0.50); }
172-
173-
.sepiaFW-cards-list-body .listElement .unchecked {
237+
.sepiaFW-cards-list-body .listElement .inProgress {
238+
background: rgba(242, 242, 114, 0.75); /*#f2f272*/
239+
}
240+
/*.sepiaFW-cards-list-body .listElement .unchecked {
174241
background: rgba(255, 255, 255, 0.90);
242+
}*/
243+
/*.sepiaFW-notouch-device .sepiaFW-cards-list-body .listElement .unchecked:hover {
244+
background: rgba(0, 255, 0, 0.50);
175245
}
176-
.sepiaFW-notouch-device .sepiaFW-cards-list-body .listElement .unchecked:hover { background: rgba(0, 255, 0, 0.50); }
246+
.sepiaFW-notouch-device .sepiaFW-cards-list-body .listElement .checked:hover {
247+
background: rgba(0, 255, 255, 0.50);
248+
}*/
177249

178250
/* hidden and visible */
179251
.sepiaFW-cards-list-body .itemHidden {
@@ -188,7 +260,10 @@
188260
.sepiaFW-cards-list-footer {
189261
display: inline-block;
190262
/*background: rgba(235, 235, 255, 0.33);*/
191-
background: rgba(170, 170, 180, 0.33);
263+
/*background: rgba(170, 170, 180, 0.33);*/
264+
/*background: #d2d2dd;*/
265+
background: #eff1ff;
266+
border-radius: 3px;
192267
margin: 0px 5px 5px 5px;
193268
text-align: center;
194269
padding: 5px;
@@ -226,8 +301,10 @@
226301
align-items: center;
227302
justify-content: center;
228303
width: calc(100% - 120px);
304+
min-height: 38px;
229305
margin: 5px 5px 0px 5px;
230306
padding: 5px;
307+
font-weight: bold;
231308
}
232309
.sepiaFW-cards-list-body .radioStation .radioRight {
233310
display: flex;
@@ -304,13 +381,14 @@
304381
cursor: pointer;
305382
padding: 5px;
306383
}
307-
.sepiaFW-notouch-device .sepiaFW-cards-list-body .timeEvent .timeEventRight:hover { background: rgba(255, 0, 0, 0.50); }
384+
.sepiaFW-notouch-device .sepiaFW-cards-list-body .timeEvent .timeEventRight:hover { background: rgba(255, 0, 0, 0.50); }
308385

309386
/* ---- News ---- */
310387

311388
.sepiaFW-cards-list-title.newsHeader {
312-
background: rgba(255, 255, 255, 0.95);
313-
color: #000;
389+
background: rgba(255, 255, 255, 0.90);
390+
border-radius: 0;
391+
font-weight: normal;
314392
}
315393
.sepiaFW-cards-list-title.newsHeader span {
316394
padding-left: 0px;
@@ -345,6 +423,9 @@
345423
padding: 0px;
346424
font-size: 12px;
347425
}
426+
.sepiaFW-cards-list-footer.newsFooter {
427+
border-radius: 0;
428+
}
348429

349430
/* ---- Weather ---- */
350431

‎www/css/sepiaFW-frames.css‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,15 @@
5757
.sepiaFW-frames-page {
5858
padding: 8px 16px;
5959
overflow-y: auto;
60+
/*overflow-y: overlay;*/
6061
-webkit-overflow-scrolling: touch;
6162
}
63+
.sepiaFW-frames-page a {
64+
color: #4ec48f;
65+
}
66+
.sepiaFW-frames-page a:visited {
67+
color: #4ec48f;
68+
}
6269
.sepiaFW-frames-page button {
6370
background: #000 !important;
6471
color: #ceff1a !important;

‎www/css/sepiaFW-skin-9to5.css‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,18 @@ html {
3535
border-color: #4B6688;
3636
}
3737

38+
#sepiaFW-chat-controls-speech-box > div {
39+
background: #4B6688;
40+
color: #fff;
41+
}
42+
3843
.sepiaFW-menu {
3944
background: #684744;
4045
color: #fff;
4146
}
47+
.sepiaFW-cards-list-contextMenu {
48+
background: #312F3F;;
49+
}
4250
#sepiaFW-chat-menu {
4351
background: #684744;
4452
color: #fff;
@@ -108,13 +116,19 @@ html {
108116
/*----- cards ------*/
109117

110118
.sepiaFW-cards-list-title {
111-
background: #B5B8C9;
119+
background: #4B6688;
112120
color: #fff;
113121
}
122+
.sepiaFW-cards-list-footer {
123+
background: #d2d2dd;
124+
}
114125
.sepiaFW-cards-list-title.newsHeader button {
115126
color: #312F3F !important;
116127
}
117-
128+
.sepiaFW-cards-list-body .listElement .listRight {
129+
border-color: #c2c3d3;
130+
background: #d4d5e0;
131+
}
118132
.sepiaFW-cards-list-body .weatherNowSmall .weatherNowSmallImage {
119133
background: #4B6688;
120134
}

‎www/css/sepiaFW-skin-autum.css‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,11 @@ html {
3535
border-color: #44451F;
3636
}
3737

38+
#sepiaFW-chat-controls-speech-box > div {
39+
background: #44451F;
40+
color: #fff;
41+
}
42+
3843
.sepiaFW-menu {
3944
background: #CD6859;
4045
color: #fff;
@@ -131,7 +136,14 @@ html {
131136
.sepiaFW-cards-list-title.newsHeader button {
132137
color: #BE3E2C !important;
133138
}
134-
139+
.sepiaFW-cards-list-footer {
140+
background: #ebd2a6;
141+
color: #44451f;
142+
}
143+
.sepiaFW-cards-list-body .listElement .listRight {
144+
border-color: #f3b547;
145+
background: #ebd2a6;
146+
}
135147
.sepiaFW-cards-list-body .weatherNowSmall .weatherNowSmallImage {
136148
background: #44451F;
137149
}

0 commit comments

Comments
 (0)