Skip to content

Commit 2e697da

Browse files
author
Nicholas Thomson
committed
Merge branch '63998894_write_css_to_reflect_the_current_design_comps' of github.com:cloudspace/angular.crunchinator.com into 63998894_write_css_to_reflect_the_current_design_comps
2 parents 493515e + 42d4d9c commit 2e697da

File tree

8 files changed

+2045
-13
lines changed

8 files changed

+2045
-13
lines changed

app/fonts/BebasNeue.eot

16.1 KB
Binary file not shown.

app/fonts/BebasNeue.svg

Lines changed: 1991 additions & 0 deletions
Loading

app/fonts/BebasNeue.ttf

47.8 KB
Binary file not shown.

app/fonts/BebasNeue.woff

17.4 KB
Binary file not shown.

app/img/cloud.png

82.3 KB
Loading

app/index.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,9 @@
2929
<div class="navbar" role="navigation">
3030
<div class="container">
3131
<div class="row">
32-
<div class="navbar-header">
33-
<h1><a href="#">Crunchinator</a></h1>
32+
<img src="img/logo.png"/>
33+
<div class="header-text">
34+
<h1><a href="#">Crunch<span>inator</span></a></h1>
3435
<h2>Crunchbase search and visualization built using Angular.js and D3.</h2>
3536
</div>
3637
</div>

app/styles/boilerplate.css

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@ pre {
2727
margin-top: 20px;
2828
}
2929

30-
h2 {
31-
margin: 20px 0;
32-
color: #666;
33-
}
3430

3531
/**
3632
* Navigation

app/styles/main.less

Lines changed: 51 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,17 @@
1010
src: url('../fonts/guilder.otf');
1111
font-weight: normal;
1212
font-style: normal;
13+
}
1314

15+
@font-face {
16+
font-family: 'BebasNeue';
17+
src: url('../fonts/BebasNeue.eot');
18+
src: url('../fonts/BebasNeue.eot?#iefix') format('embedded-opentype'),
19+
url('../fonts/BebasNeue.woff') format('woff'),
20+
url('../fonts/BebasNeue.ttf') format('truetype'),
21+
url('../fonts/BebasNeue.svg#BebasNeue') format('svg');
22+
font-weight: normal;
23+
font-style: normal;
1424
}
1525

1626
/* Space out content a bit */
@@ -19,16 +29,50 @@ body {
1929
background-color: @dark-grey;
2030
}
2131

22-
h1{
23-
display: block;
24-
padding-top: 91px;
25-
padding-left: 130px;
26-
background-image:url('../img/logo.png');
27-
background-repeat:no-repeat;
28-
background-position:left bottom;
32+
header{
33+
34+
background-image: url('../img/cloud.png');
35+
padding-bottom: 15px;
36+
37+
.row{
38+
margin-top: 30px;
39+
padding-bottom: 20px;
40+
border-bottom: 1px solid @bright-blue;
41+
}
42+
43+
img{
44+
display: inline;
45+
float: left;
46+
}
47+
48+
.header-text{
49+
margin-left: 30px;
50+
float: left;
51+
h1{
52+
margin-top: 0px;
53+
margin-bottom: 0px;
54+
font-family: 'BebasNeue';
55+
font-size: 68px;
56+
57+
a{
58+
color: @pale-blue;
59+
60+
span{
61+
color: @white;
62+
}
63+
}
64+
}
65+
66+
h2{
67+
margin-top: 0px;
68+
font-size: 13px;
69+
color: @white;
70+
}
71+
}
2972
}
3073

3174

75+
3276
/* Everything but the jumbotron gets side spacing for mobile first views */
3377
.header,
3478
.marketing,

0 commit comments

Comments
 (0)