Skip to content

Commit 26d3a92

Browse files
thomasdavisthomasdavis
committed
Merge branch 'master' of github.com:apiengine/apiengine-client
2 parents a01542f + e0091eb commit 26d3a92

4 files changed

Lines changed: 55 additions & 23 deletions

File tree

‎css/button.css‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -269,16 +269,16 @@ We need to have disabled state I think ?
269269
*/
270270
.sbtn {
271271
color: white;
272-
padding: 10px 20px 8px 20px;
272+
padding: 10px 10px 8px 10px;
273273
font-family: 'Nexa Bold';
274274
display: inline-block;
275275
font-size: 18px;
276-
line-height: 14px;
276+
line-height: 19px;
277277
}
278278
.sbtn:after {
279279
content: '>';
280280
margin-left: 5px;
281-
line-height: 12px;
281+
line-height: 16px;
282282
font-size: 24px;
283283
font-family: "ModernPics";
284284
float: right;
@@ -303,6 +303,13 @@ We need to have disabled state I think ?
303303
.sbtn.yellow:hover {
304304
outline:1px solid #fce091;
305305
}
306+
.sbtn.blue {
307+
background: #019ff3;
308+
color: #fff;
309+
}
310+
.sbtn.blue:hover {
311+
outline:1px solid #24b3ff;
312+
}
306313
/*
307314
308315
## Joined buttons

‎css/features.css‎

Lines changed: 33 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
5959
*/
6060
.features-section {
61-
padding: 75px 0 75px 39px;
61+
padding: 75px 0 50px 39px;
6262
color: #333;
6363
}
6464
.features-toolbox {
@@ -74,19 +74,30 @@
7474
color:#333;
7575
font-weight: normal;
7676
margin-top: 0;
77-
margin-bottom: 15px;
77+
margin-bottom: 5px;
78+
letter-spacing: 3px;
7879
}
7980
.features-tag {
80-
font-size: 28px;
81+
font-size: 24px;
8182
font-family: 'Nexa';
8283
margin: 0;
83-
margin-bottom: 30px;
84+
margin-bottom: 20px;
8485
width:530px;
86+
line-height: 30px;
87+
}
88+
.features-preamble {
89+
font-size: 24px;
90+
line-height: 30px;
91+
font-family: 'Nexa';
92+
text-align: left;
93+
margin-top:0;
8594
}
8695
.features-desc {
87-
font-size: 18px;
96+
font-size: 20px;
97+
line-height: 24px;
8898
font-family: 'Nexa';
8999
text-align: left;
100+
margin-top:0;
90101
}
91102
.features-info {
92103
width: 910px;
@@ -120,13 +131,25 @@ right: 0;
120131
background: url('../img/features-docs-icon.png');
121132
}
122133

123-
124-
.two-column {
125-
width: 50%;
134+
.for-tag{
135+
font-family: 'Nexa Bold';
136+
font-size: 24px;
137+
line-height:24px;
138+
margin: 25px 0 25px 0;
139+
color:#333;
140+
}
141+
.column-one {
142+
width: 48%;
126143
float: left;
127144
text-align: center;
128145
margin-top: 50px;
129146
}
147+
.column-two {
148+
width: 48%;
149+
float: right;
150+
text-align: center;
151+
margin-top: 50px;
152+
}
130153
.red-developers {
131154
width: 169px;
132155
height: 100px;
@@ -168,7 +191,8 @@ right: 0;
168191
}
169192
.features-list li {
170193

171-
font-size: 18px;
194+
font-size: 20px;
195+
line-height: 24px;
172196
font-family: 'Nexa';
173197
text-align: left;
174198
}

‎css/header.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
font-size: 16px;
4949
text-transform: uppercase;
5050

51-
-webkit-transition:color 0.25s ease-in;
51+
-webkit-transition:color 0.175s ease-in;
5252
cursor: pointer;
5353
padding: 1px 11px 1px 11px;
5454
font-family: 'Nexa';
@@ -57,7 +57,7 @@
5757
color: #fff;
5858
}
5959
.top-bar-menu li a.active {
60-
-webkit-transition:background 1s ease-in;
60+
-webkit-transition:background 0.5s ease-in;
6161
color: #fff;
6262
background: #019ff3;
6363
padding: 0 10px 0 10px;

‎templates/home/features.html‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ <h2 class="features-heading">
1010
API Engine comes with a feature set of tools to suit large businesses,
1111
start-ups and individual developers alike
1212
</p>
13+
<a href="" class="sbtn blue">PRICING</a>
1314
<a href="" class="sbtn green">SIGN UP</a>
1415
<div style="clear: both;">
1516
</div>
@@ -27,11 +28,11 @@ <h2 class="features-heading">
2728
<h2 class="features-heading">
2829
DOCUMENTATION
2930
</h2>
30-
<p class="features-desc">
31+
<p class="features-preamble">
3132
When you host your APIs on API Engine you can be confident that they are
3233
accessible, stylish, and responsive on all platforms.
3334
</p>
34-
<div class="two-column">
35+
<div class="column-one">
3536
<div class="yellow-developers">
3637
</div>
3738
<h3 class="for-tag">
@@ -52,7 +53,7 @@ <h3 class="for-tag">
5253
</li>
5354
<ul>
5455
</div>
55-
<div class="two-column">
56+
<div class="column-two">
5657
<div class="yellow-consumers">
5758
</div>
5859
<h3 class="for-tag">
@@ -84,11 +85,11 @@ <h3 class="for-tag">
8485
<h2 class="features-heading">
8586
COLLABORATION
8687
</h2>
87-
<p class="features-desc">
88+
<p class="features-preamble">
8889
When you host your APIs on API Engine you can be confident that they are
8990
accessible, stylish, and responsive on all platforms.
9091
</p>
91-
<div class="two-column">
92+
<div class="column-one">
9293
<div class="blue-developers">
9394
</div>
9495
<h3 class="for-tag">
@@ -109,7 +110,7 @@ <h3 class="for-tag">
109110
</li>
110111
<ul>
111112
</div>
112-
<div class="two-column">
113+
<div class="column-two">
113114
<div class="blue-consumers">
114115
</div>
115116
<h3 class="for-tag">
@@ -141,11 +142,11 @@ <h3 class="for-tag">
141142
<h2 class="features-heading">
142143
DISCOVERY
143144
</h2>
144-
<p class="features-desc">
145+
<p class="features-preamble">
145146
When you host your APIs on API Engine you can be confident that they are
146147
accessible, stylish, and responsive on all platforms.
147148
</p>
148-
<div class="two-column">
149+
<div class="column-one">
149150
<div class="red-developers">
150151
</div>
151152
<h3 class="for-tag">
@@ -166,7 +167,7 @@ <h3 class="for-tag">
166167
</li>
167168
<ul>
168169
</div>
169-
<div class="two-column">
170+
<div class="column-two">
170171
<div class="red-consumers">
171172
</div>
172173
<h3 class="for-tag">

0 commit comments

Comments
 (0)