Skip to content

Commit ef1aeb6

Browse files
author
arnau march
committed
Updated latest shared/style folders from gaia
1 parent 48f7aef commit ef1aeb6

File tree

2 files changed

+36
-161
lines changed

2 files changed

+36
-161
lines changed

style/dialer/keypad.css

+4
Original file line numberDiff line numberDiff line change
@@ -347,3 +347,7 @@
347347
font-size: 3rem;
348348
color: #fff;
349349
}
350+
351+
.full-height {
352+
height: 100%;
353+
}

style/headers.css

+32-161
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,9 @@
1-
/*
2-
headers.css should only contain the following imports
3-
once @import is available in shared folder
4-
5-
@import url("headers/layout.css");
6-
@import url("headers/skin_default.css");
7-
@import url("headers/skin_comms.css");
8-
@import url("headers/skin_dark.css");
9-
@import url("headers/skin_organic.css");
10-
*/
11-
121
/* -------------------------------------------------------------------
132
HEADERS: layout
14-
This is our base CSS file.
153
Form factor or Skin dependent styles should NOT be defined here.
164
------------------------------------------------------------------- */
175

18-
section[role="region"] > header:first-child,
19-
gaia-header {
6+
section[role="region"] > header:first-child {
207
position: relative;
218
display: block;
229
z-index: 10;
@@ -25,8 +12,7 @@ gaia-header {
2512
border: none;
2613
}
2714

28-
section[role="region"] > header:first-child h1,
29-
gaia-header h1 {
15+
section[role="region"] > header:first-child h1 {
3016
font-size: 2.3rem;
3117
line-height: 5rem;
3218
text-align: left;
@@ -42,62 +28,13 @@ gaia-header h1 {
4228
text-align: center;
4329
}
4430

45-
section[role="region"] > header:first-child h1 em,
46-
gaia-header h1 em {
31+
section[role="region"] > header:first-child h1 em {
4732
font-weight: 400;
4833
font-size: 1.5rem;
4934
line-height: 1em;
5035
font-style: normal;
5136
}
5237

53-
/**
54-
* Forms in header are only used in email app.
55-
* Incorrect UI style.
56-
* Sould be removed after landing bug 1001298
57-
* (also rtl properties)
58-
*/
59-
60-
section[role="region"] > header:first-child form {
61-
display: block;
62-
overflow: hidden;
63-
position: relative;
64-
padding: 1rem 1rem 0 0.5rem ;
65-
margin-left: 3.5rem;
66-
}
67-
68-
section[role="region"] > header:first-child input[type="text"] {
69-
width: 100%;
70-
height: 3rem;
71-
box-sizing: border-box;
72-
padding: 0 0.8rem;
73-
border: solid 0.1rem #9d4123;
74-
border-top-color: #a6501e;
75-
border-radius: 0;
76-
background: #fff;
77-
font-size: 1.5rem;
78-
line-height: 3em;
79-
box-shadow: none;
80-
}
81-
82-
section[role="region"] > header:first-child form button[type="reset"] {
83-
font-size: 0;
84-
overflow: hidden;
85-
position: absolute;
86-
right: 1rem;
87-
top: 1rem;
88-
bottom: 0;
89-
width: 3rem;
90-
height: auto;
91-
margin: 0;
92-
display: none;
93-
border: none;
94-
background: url(headers/images/icons/clear.png) no-repeat center center / 1.7rem auto;
95-
}
96-
97-
section[role="region"] > header:first-child input[type="text"]:valid + button[type="reset"] {
98-
display: block;
99-
}
100-
10138
section[role="region"] > header:first-child menu {
10239
height: 100%;
10340
float: right;
@@ -110,9 +47,7 @@ section[role="region"] > header:first-child menu {
11047
---------------------------------- */
11148

11249
section[role="region"] > header:first-child a,
113-
section[role="region"] > header:first-child button,
114-
gaia-header a,
115-
gaia-header button {
50+
section[role="region"] > header:first-child button {
11651
box-sizing: border-box;
11752
position: relative;
11853
display: block;
@@ -136,13 +71,11 @@ gaia-header button {
13671
}
13772

13873
/* Pressed state */
139-
section[role="region"] > header:first-child a:focus,
140-
gaia-header a:focus {
74+
section[role="region"] > header:first-child a:focus {
14175
outline: none;
14276
}
14377

144-
section[role="region"] > header:first-child button::-moz-focus-inner,
145-
gaia-header button::-moz-focus-inner {
78+
section[role="region"] > header:first-child button::-moz-focus-inner {
14679
outline: none;
14780
border: none;
14881
margin-top: -0.2rem; /* To fix line-height bug (697451) */
@@ -151,9 +84,7 @@ gaia-header button::-moz-focus-inner {
15184

15285
/* Disabled state */
15386
section[role="region"] > header:first-child a[aria-disabled="true"],
154-
section[role="region"] > header:first-child button[disabled],
155-
gaia-header a[aria-disabled="true"],
156-
gaia-header button[disabled] {
87+
section[role="region"] > header:first-child button[disabled] {
15788
opacity: 0.3;
15889
pointer-events: none;
15990
}
@@ -170,20 +101,6 @@ section[role="region"] > header:first-child .icon {
170101
font-size: 0;
171102
}
172103

173-
gaia-header [data-icon] {
174-
font-size: 0;
175-
}
176-
177-
gaia-header [data-icon]:before {
178-
position: absolute;
179-
content: "";
180-
width: 3rem;
181-
height: 3rem;
182-
background: transparent no-repeat center / 3rem auto;
183-
top: 1rem;
184-
left: 1rem;
185-
}
186-
187104
/* ----------------------------------
188105
Subheader
189106
---------------------------------- */
@@ -205,25 +122,12 @@ section[role="region"] header h2 {
205122
right-to-left
206123
---------------------------------- */
207124

208-
html[dir="rtl"] section[role="region"] > header:first-child form {
209-
padding: 1rem .5rem 0 1rem;
210-
margin-right: 3.5rem;
211-
margin-left:0;
212-
}
213-
214-
html[dir="rtl"] section[role="region"] > header:first-child form button[type="reset"] {
215-
left: 1rem;
216-
right: inherit;
217-
}
218-
219125
html[dir="rtl"] section[role="region"] > header:first-child menu {
220126
float: left;
221127
}
222128

223129
html[dir="rtl"] section[role="region"] > header:first-child button,
224-
html[dir="rtl"] section[role="region"] > header:first-child a,
225-
html[dir="rtl"] gaia-header button,
226-
html[dir="rtl"] gaia-header a {
130+
html[dir="rtl"] section[role="region"] > header:first-child a {
227131
float: right;
228132
}
229133

@@ -242,85 +146,67 @@ section[role="region"] > header:first-child {
242146
background-color: #f97c17;
243147
}
244148

245-
section[role="region"] > header:first-child h1,
246-
gaia-header h1 {
149+
section[role="region"] > header:first-child h1 {
247150
color: #fff;
248151
}
249152

250153
section[role="region"] > header:first-child a,
251-
section[role="region"] > header:first-child button,
252-
gaia-header a,
253-
gaia-header button {
154+
section[role="region"] > header:first-child button {
254155
color: rgba(0,0,0,0.6);
255156
}
256157

257158
section[role="region"] > header:first-child a:active,
258159
section[role="region"] > header:first-child button:active,
259160
section[role="region"] > header:first-child a:hover,
260-
section[role="region"] > header:first-child button:hover,
261-
gaia-header a:active,
262-
gaia-header button:active,
263-
gaia-header a:hover,
264-
gaia-header button:hover {
161+
section[role="region"] > header:first-child button:hover {
265162
background-color: rgba(0,0,0,0.07);
266163
}
267164

268165
/* ----------------------------------
269166
Icons
270167
---------------------------------- */
271168

272-
section[role="region"] > header:first-child .icon-add,
273-
gaia-header [data-icon="add"]:before {
169+
section[role="region"] > header:first-child .icon-add {
274170
background-image: url(headers/images/icons/add.png);
275171
}
276172

277-
section[role="region"] > header:first-child .icon-compose,
278-
gaia-header [data-icon="compose"]:before {
173+
section[role="region"] > header:first-child .icon-compose {
279174
background-image: url(headers/images/icons/compose.png);
280175
}
281176

282-
section[role="region"] > header:first-child .icon-edit,
283-
gaia-header [data-icon="edit"]:before {
177+
section[role="region"] > header:first-child .icon-edit {
284178
background-image: url(headers/images/icons/edit.png);
285179
}
286180

287-
section[role="region"] > header:first-child .icon-send,
288-
gaia-header [data-icon="send"]:before {
181+
section[role="region"] > header:first-child .icon-send {
289182
background-image: url(headers/images/icons/send.png);
290183
}
291184

292-
section[role="region"] > header:first-child .icon-close,
293-
gaia-header [data-icon="close"]:before {
185+
section[role="region"] > header:first-child .icon-close {
294186
background-image: url(headers/images/icons/close.png);
295187
}
296188

297-
section[role="region"] > header:first-child .icon-back,
298-
gaia-header [data-icon="back"]:before {
189+
section[role="region"] > header:first-child .icon-back {
299190
background-image: url(headers/images/icons/back.png);
300191
}
301192

302-
section[role="region"] > header:first-child .icon-menu,
303-
gaia-header [data-icon="menu"]:before {
193+
section[role="region"] > header:first-child .icon-menu {
304194
background-image: url(headers/images/icons/menu.png);
305195
}
306196

307-
section[role="region"] > header:first-child .icon-user,
308-
gaia-header [data-icon="user"]:before {
197+
section[role="region"] > header:first-child .icon-user {
309198
background-image: url(headers/images/icons/user.png);
310199
}
311200

312-
section[role="region"] > header:first-child .icon-up,
313-
gaia-header [data-icon="up"]:before {
201+
section[role="region"] > header:first-child .icon-up {
314202
background-image: url(headers/images/icons/up.png);
315203
}
316204

317-
section[role="region"] > header:first-child .icon-down,
318-
gaia-header [data-icon="down"]:before {
205+
section[role="region"] > header:first-child .icon-down {
319206
background-image: url(headers/images/icons/down.png);
320207
}
321208

322-
section[role="region"] > header:first-child .icon-options,
323-
gaia-header [data-icon="options"]:before {
209+
section[role="region"] > header:first-child .icon-options {
324210
background-image: url(headers/images/icons/options.png);
325211
}
326212

@@ -346,9 +232,7 @@ section[role="region"].skin-comms > header:first-child {
346232
.skin-comms section[role="region"] > header:first-child a,
347233
.skin-comms section[role="region"] > header:first-child button,
348234
section[role="region"].skin-comms > header:first-child a,
349-
section[role="region"].skin-comms > header:first-child button,
350-
gaia-header[data-skin="comms"] a,
351-
gaia-header[data-skin="comms"] button {
235+
section[role="region"].skin-comms > header:first-child button {
352236
color: rgba(0,0,0,0.5);
353237
}
354238

@@ -359,9 +243,7 @@ gaia-header[data-skin="comms"] button {
359243
section[role="region"].skin-comms > header:first-child a:active,
360244
section[role="region"].skin-comms > header:first-child button:active,
361245
section[role="region"].skin-comms > header:first-child a:hover,
362-
section[role="region"].skin-comms > header:first-child button:hover,
363-
gaia-header[data-skin="comms"] a:hover,
364-
gaia-header[data-skin="comms"] button:hover {
246+
section[role="region"].skin-comms > header:first-child button:hover {
365247
background-color: rgba(0,0,0,0.1);
366248
}
367249

@@ -378,9 +260,7 @@ section[role="region"].skin-dark > header:first-child,
378260
.skin-dark section[role="region"] > header:first-child a,
379261
.skin-dark section[role="region"] > header:first-child button,
380262
section[role="region"].skin-dark > header:first-child a,
381-
section[role="region"].skin-dark > header:first-child button,
382-
gaia-header[data-skin="dark"] a,
383-
gaia-header[data-skin="dark"] button {
263+
section[role="region"].skin-dark > header:first-child button {
384264
color: #00aac5;
385265
}
386266

@@ -391,9 +271,7 @@ gaia-header[data-skin="dark"] button {
391271
section[role="region"].skin-dark > header:first-child a:active,
392272
section[role="region"].skin-dark > header:first-child button:active,
393273
section[role="region"].skin-dark > header:first-child a:hover,
394-
section[role="region"].skin-dark > header:first-child button:hover,
395-
gaia-header[data-skin="dark"] a:hover,
396-
gaia-header[data-skin="dark"] button:hover {
274+
section[role="region"].skin-dark > header:first-child button:hover {
397275
background-color: rgba(0,0,0,0.4);
398276
}
399277

@@ -416,17 +294,14 @@ section[role="region"].skin-organic > header:first-child,
416294
}
417295

418296
section[role="region"].skin-organic > header:first-child h1,
419-
.skin-organic section[role="region"] > header:first-child h1,
420-
gaia-header[data-skin="organic"] h1 {
297+
.skin-organic section[role="region"] > header:first-child h1 {
421298
color: #868692;
422299
}
423300

424301
section[role="region"].skin-organic > header:first-child a,
425302
section[role="region"].skin-organic > header:first-child button,
426303
.skin-organic section[role="region"] > header:first-child a,
427-
.skin-organic section[role="region"] > header:first-child button,
428-
gaia-header[data-skin="organic"] a,
429-
gaia-header[data-skin="organic"] button {
304+
.skin-organic section[role="region"] > header:first-child button {
430305
color: #00aac5;
431306
}
432307

@@ -435,26 +310,22 @@ gaia-header[data-skin="organic"] button {
435310
---------------------------------- */
436311

437312
section[role="region"].skin-organic > header:first-child .icon-back,
438-
.skin-organic section[role="region"] > header:first-child .icon-back,
439-
gaia-header[data-skin="organic"] [data-icon="back"]:before {
313+
.skin-organic section[role="region"] > header:first-child .icon-back {
440314
background-image: url(headers/images/icons/organic/back.png);
441315
}
442316

443317
section[role="region"].skin-organic > header:first-child .icon-close,
444-
.skin-organic section[role="region"] > header:first-child .icon-close,
445-
gaia-header[data-skin="organic"] [data-icon="close"]:before {
318+
.skin-organic section[role="region"] > header:first-child .icon-close {
446319
background-image: url(headers/images/icons/organic/close.png);
447320
}
448321

449322
section[role="region"].skin-organic > header:first-child .icon-add,
450-
.skin-organic section[role="region"] > header:first-child .icon-add,
451-
gaia-header[data-skin="organic"] [data-icon="add"]:before {
323+
.skin-organic section[role="region"] > header:first-child .icon-add {
452324
background-image: url(headers/images/icons/organic/add.png);
453325
}
454326

455327
section[role="region"].skin-organic > header:first-child .icon-edit,
456-
.skin-organic section[role="region"] > header:first-child .icon-edit,
457-
gaia-header[data-skin="organic"] [data-icon="edit"]:before {
328+
.skin-organic section[role="region"] > header:first-child .icon-edit {
458329
background-image: url(headers/images/icons/organic/edit.png);
459330
}
460331

0 commit comments

Comments
 (0)