Skip to content
This repository was archived by the owner on May 16, 2019. It is now read-only.

Commit ab4faa2

Browse files
committed
merged in master
2 parents 620eb9b + 660772d commit ab4faa2

19 files changed

+767
-280
lines changed

css/obBase.css

Lines changed: 188 additions & 127 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,10 @@ p {
9090
margin: 0 0 1em 0;
9191
}
9292

93+
p:last-child {
94+
margin-bottom: 0;
95+
}
96+
9397
hr {
9498
border: solid 1px rgba(255,255,255,0.08);
9599
width: 100%;
@@ -182,6 +186,134 @@ form {
182186
margin: 0;
183187
}
184188

189+
/*========== typography ==========*/
190+
191+
h1,h2,h3,h4,h5,h6,
192+
.h1,.h2,.h3,.h4,.h5,.h6 {
193+
margin: 0;
194+
font-weight: 700;
195+
-webkit-user-select: none;
196+
cursor: default;
197+
}
198+
199+
h1,h2,h3,
200+
.h1,.h2,.h3 {
201+
margin-bottom: 20px;
202+
line-height: 1.2;
203+
}
204+
205+
h4,h5,h6,
206+
.h4,.h5,.h6 {
207+
margin-bottom: 10px;
208+
line-height: 1;
209+
}
210+
211+
h3, .h3 {
212+
font-size: 18px;
213+
}
214+
215+
h4, .h4 {
216+
font-size: 17px;
217+
}
218+
219+
h5, .h5 {
220+
font-size: 15px;
221+
}
222+
223+
h6, .h6 {
224+
font-size: 15px; /* TODO: refactor to remove h6 since it is identical to h5 */
225+
}
226+
227+
.fieldItem-textarea h2, .fieldItem-textarea h3, .editableContent h2, .editableContent h3 {
228+
margin-top: 30px;
229+
}
230+
231+
.fieldItem-textarea h2:first-child, .fieldItem-textarea h3:first-child, .editableContent h2:first-child, .editableContent h3:first-child {
232+
margin-top: 0;
233+
}
234+
235+
.note {
236+
/* use for instructions and incidental text */
237+
/*font-style: italic;*/
238+
font-size: 9px;
239+
opacity: 0.50;
240+
}
241+
242+
[class *= "ion-"]:before {
243+
font-size: 1.2em;
244+
pointer-events: none;
245+
}
246+
247+
.txt-center {
248+
text-align: center;
249+
}
250+
251+
#ov1 .txt-fade {
252+
opacity: 0.75;
253+
}
254+
255+
#ov1 .unfilled {
256+
opacity: 0.35;
257+
}
258+
259+
#ov1 .div-fade {
260+
opacity: 0.50;
261+
}
262+
263+
#ov1 .div-fadeExtra {
264+
opacity: 0.3;
265+
}
266+
267+
.txt-lowleading {
268+
line-height: 1.2;
269+
}
270+
.txt-unleaded {
271+
line-height: 1;
272+
margin-bottom: 0;
273+
}
274+
275+
#ov1 .unbold {
276+
font-weight: 400;
277+
}
278+
279+
#ov1 .allCaps {
280+
text-transform: uppercase;
281+
}
282+
283+
.noOverflow {
284+
text-overflow: ellipsis;
285+
white-space: nowrap;
286+
overflow: hidden;
287+
}
288+
289+
.noWrap {
290+
white-space: nowrap;
291+
}
292+
293+
.clamp2 {
294+
/* adds an ellipses to the end of wrapped text after 2 lines */
295+
overflow: hidden;
296+
text-overflow: ellipsis;
297+
display: -webkit-box;
298+
-webkit-line-clamp: 2;
299+
-webkit-box-orient: vertical;
300+
}
301+
302+
.clamp4 {
303+
/* adds an ellipses to the end of wrapped text after 4 lines */
304+
overflow: hidden;
305+
text-overflow: ellipsis;
306+
display: -webkit-box;
307+
-webkit-line-clamp: 4;
308+
-webkit-box-orient: vertical;
309+
}
310+
311+
.txtRow2 {
312+
/* limits an element to being 2 rows of text tall */
313+
line-height: 1.25em;;
314+
height: 2.5em;
315+
}
316+
185317

186318
/*========== structure classes ==========*/
187319

@@ -319,11 +451,11 @@ form {
319451
#sideBar {
320452
position: fixed;
321453
right: -183px;
322-
top: 78px;
454+
top: 75px;
323455
width:230px;
324456
background-color: #252525;
325457
border-left: 0;
326-
height: calc(100% - 50px);
458+
height: calc(100% - 71px);
327459
z-index: 0;
328460
transition: right 0.5s ease;
329461
color: #DDD;
@@ -397,6 +529,7 @@ form {
397529
.barTxt {
398530
height: 50px;
399531
line-height: 50px;
532+
margin-bottom: 0;
400533
}
401534

402535
.bar .btn {
@@ -606,8 +739,6 @@ form {
606739
height: 40px;
607740
line-height: 38px;
608741
border-top: solid 1px #327EB8;
609-
border-right: solid 1px #327EB8;
610-
width: 316px;
611742
padding: 0;
612743
box-sizing: border-box;
613744
transition: opacity .5s cubic-bezier(0, 0, 0.2, 1);
@@ -1293,127 +1424,6 @@ label.fieldItem {
12931424
width: calc(100% - 230px);
12941425
}
12951426

1296-
/*========== typography ==========*/
1297-
1298-
h1,h2,h3,h4,h5,h6 {
1299-
margin: 0;
1300-
font-weight: 700;
1301-
-webkit-user-select: none;
1302-
cursor: default;
1303-
}
1304-
1305-
h1,h2,h3 {
1306-
margin-bottom: 20px;
1307-
line-height: 1.2;
1308-
}
1309-
1310-
h4,h5,h6 {
1311-
margin-bottom: 10px;
1312-
line-height: 1;
1313-
}
1314-
1315-
h3 {
1316-
font-size: 18px;
1317-
}
1318-
1319-
h5 {
1320-
font-size: 15px;
1321-
}
1322-
1323-
.h6, h6 {
1324-
font-size: 15px;
1325-
}
1326-
1327-
.fieldItem-textarea h2, .fieldItem-textarea h3, .editableContent h2, .editableContent h3 {
1328-
margin-top: 30px;
1329-
}
1330-
1331-
.fieldItem-textarea h2:first-child, .fieldItem-textarea h3:first-child, .editableContent h2:first-child, .editableContent h3:first-child {
1332-
margin-top: 0;
1333-
}
1334-
1335-
.note {
1336-
/* use for instructions and incidental text */
1337-
/*font-style: italic;*/
1338-
font-size: 9px;
1339-
opacity: 0.50;
1340-
}
1341-
1342-
[class *= "ion-"]:before {
1343-
font-size: 1.2em;
1344-
pointer-events: none;
1345-
}
1346-
1347-
.txt-center {
1348-
text-align: center;
1349-
}
1350-
1351-
#ov1 .txt-fade {
1352-
opacity: 0.75;
1353-
}
1354-
1355-
#ov1 .unfilled {
1356-
opacity: 0.35;
1357-
}
1358-
1359-
#ov1 .div-fade {
1360-
opacity: 0.50;
1361-
}
1362-
1363-
#ov1 .div-fadeExtra {
1364-
opacity: 0.3;
1365-
}
1366-
1367-
.txt-lowleading {
1368-
line-height: 1.2;
1369-
}
1370-
.txt-unleaded {
1371-
line-height: 1;
1372-
margin-bottom: 0;
1373-
}
1374-
1375-
#ov1 .unbold {
1376-
font-weight: 400;
1377-
}
1378-
1379-
#ov1 .allCaps {
1380-
text-transform: uppercase;
1381-
}
1382-
1383-
.noOverflow {
1384-
text-overflow: ellipsis;
1385-
white-space: nowrap;
1386-
overflow: hidden;
1387-
}
1388-
1389-
.noWrap {
1390-
white-space: nowrap;
1391-
}
1392-
1393-
.clamp2 {
1394-
/* adds an ellipses to the end of wrapped text after 2 lines */
1395-
overflow: hidden;
1396-
text-overflow: ellipsis;
1397-
display: -webkit-box;
1398-
-webkit-line-clamp: 2;
1399-
-webkit-box-orient: vertical;
1400-
}
1401-
1402-
.clamp4 {
1403-
/* adds an ellipses to the end of wrapped text after 4 lines */
1404-
overflow: hidden;
1405-
text-overflow: ellipsis;
1406-
display: -webkit-box;
1407-
-webkit-line-clamp: 4;
1408-
-webkit-box-orient: vertical;
1409-
}
1410-
1411-
.txtRow2 {
1412-
/* limits an element to being 2 rows of text tall */
1413-
line-height: 1.25em;;
1414-
height: 2.5em;
1415-
}
1416-
14171427
/*========== skin classes ==========*/
14181428

14191429
.userPageImageUpload {
@@ -1760,6 +1770,33 @@ removed because I don't think we're using the trick to hide the borders any more
17601770
left: 168px;
17611771
}
17621772
1773+
.suggestionsList {
1774+
position: absolute;
1775+
width: 100%;
1776+
max-height: 155px;
1777+
background: #fff;
1778+
margin-top: 14px;
1779+
border-bottom-left-radius: 3px;
1780+
border-bottom-right-radius: 3px;
1781+
overflow-y: scroll;
1782+
}
1783+
1784+
.suggestionsList a {
1785+
display: block;
1786+
color: #000;
1787+
padding: 8px 20px;
1788+
}
1789+
.suggestionsList a:last-child {
1790+
border-bottom-left-radius: 3px;
1791+
border-bottom-right-radius: 3px;
1792+
}
1793+
.suggestionsList a:hover, .suggestionsList a:focus {
1794+
text-decoration: none;
1795+
}
1796+
.suggestionsList a:hover, .suggestionsList a.selected {
1797+
background-color: #efefef;
1798+
}
1799+
17631800
.txtField-bar,
17641801
input[type="text"].txtField-bar {
17651802
background: none;
@@ -3456,7 +3493,7 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
34563493
}
34573494

34583495
.onboardingIntroDiscover:before {
3459-
background: #252525 url('../imgs/onboarding-discover-callout.png') 100% 0%;
3496+
background: #252525 url('../imgs/onboarding-discover-callout.png') 100% 0;
34603497
background-size: 233px 196px;
34613498
content: " ";
34623499
width: 32px;
@@ -4128,7 +4165,6 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
41284165
}
41294166
41304167
.tooltip:hover:after{
4131-
max-width: 400px;
41324168
background: rgba(37,37,37,.95);
41334169
border-radius: 3px;
41344170
bottom: -32px;
@@ -4954,6 +4990,7 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
49544990
#ov1 .textOpacity0,
49554991
#ov1 .opacity0 {
49564992
opacity: 0;
4993+
pointer-events: none;
49574994
}
49584995

49594996
#ov1 .textOpacity25 {
@@ -5261,6 +5298,10 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
52615298
margin-left: 7px;
52625299
}
52635300

5301+
#ov1 .marginLeft8 {
5302+
margin-left: 8px; /* use this to match the gap on the right created by the custom scrollbar */
5303+
}
5304+
52645305
#ov1 .marginLeft10 {
52655306
margin-left: 10px;
52665307
}
@@ -6204,3 +6245,23 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
62046245
background-color: #eeeae1;
62056246
height: 100%;
62066247
}
6248+
6249+
.backToTop {
6250+
position: fixed;
6251+
bottom: 15px;
6252+
right: 73px;
6253+
padding: 10px;
6254+
background-color: #252525;
6255+
transform: translateY(100%);
6256+
opacity: 0;
6257+
transition: transform 300ms ease, right 0.5s ease;
6258+
}
6259+
6260+
.backToTop.slideUp {
6261+
opacity: 1;
6262+
transform: translateY(0);
6263+
}
6264+
6265+
#ov1.chatOpen .backToTop {
6266+
right: 303px;
6267+
}

0 commit comments

Comments
 (0)