Skip to content

Commit 1eb0c3b

Browse files
author
maddog
committed
Merge branch 'master' of github.com:apiengine/apiengine-client
2 parents e7680d5 + a2c1b8f commit 1eb0c3b

File tree

6 files changed

+43
-24
lines changed

6 files changed

+43
-24
lines changed

Diff for: css/features.css

+17-4
Original file line numberDiff line numberDiff line change
@@ -58,23 +58,30 @@
5858
5959
*/
6060
.features-section {
61-
padding: 75px 0 75px 38px;
61+
padding: 75px 0 75px 39px;
62+
color: #333;
6263
}
6364
.features-toolbox {
6465
background: url('../img/features-toolbox.png');
65-
width: 337px;
66-
height: 252px;
66+
background-repeat: no-repeat;
67+
width: 335px;
68+
height: 274px;
6769
float: right;
6870
}
6971
.features-heading {
70-
font-size: 28px;
72+
font-size: 36px;
7173
font-family: 'Nexa Bold';
74+
color:#333;
7275
font-weight: normal;
7376
margin-top: 0;
77+
margin-bottom: 15px;
7478
}
7579
.features-tag {
7680
font-size: 28px;
7781
font-family: 'Nexa';
82+
margin: 0;
83+
margin-bottom: 30px;
84+
width:530px;
7885
}
7986
.features-desc {
8087
font-size: 18px;
@@ -90,6 +97,12 @@
9097
width: 60px;
9198
height: 60px;
9299
margin-right: 20px;
100+
position: relative;
101+
width: 35px;
102+
}
103+
.features-pic > div {
104+
position: absolute;
105+
right: 0;
93106
}
94107
.features-pic-discovery {
95108
width: 51px;

Diff for: img/features-toolbox.png

303 Bytes
Loading

Diff for: js/extensions.js

+4
Original file line numberDiff line numberDiff line change
@@ -660,4 +660,8 @@ jQuery.extend( jQuery.easing,
660660
* OF THE POSSIBILITY OF SUCH DAMAGE.
661661
*
662662
*/
663+
664+
665+
666+
663667
})

Diff for: templates/footer/footer.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<ul class="footer-terms">
4848
<li><a href="/legal/privacy">Privacy</a></li>
4949
<li><a href="/legal/security">Security</a></li>
50-
<li><a href="/legal/terms">Terms of Service</a></li>
50+
<li class="last"><a href="/legal/terms">Terms of Service</a></li>
5151
</ul>
5252
<div style="clear: both;"></div>
5353
<div class="copyright">API ENGINE INC. © 2012 - MADE IN <a href="http://en.wikipedia.org/wiki/Brisbane#Bris_Vegas">BRIS VEGAS</a></div>

Diff for: templates/home/features.html

+14-12
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
<div class="background light-grey">
2-
<div class="container features-section">
3-
<div class="features-toolbox">
4-
</div>
5-
<h2 class="features-heading">
6-
GREAT TOOLS
7-
</h2>
8-
<p class="features-tag">
9-
API Engine comes with a feature set of tools to suit large businesses,
10-
start-ups and individual developers alike
11-
</p>
12-
<a href="" class="sbtn green">SIGN UP</a>
13-
<div style="clear: both;">
2+
<div class="container">
3+
<div class=" features-section">
4+
<div class="features-toolbox">
5+
</div>
6+
<h2 class="features-heading">
7+
GREAT TOOLS
8+
</h2>
9+
<p class="features-tag">
10+
API Engine comes with a feature set of tools to suit large businesses,
11+
start-ups and individual developers alike
12+
</p>
13+
<a href="" class="sbtn green">SIGN UP</a>
14+
<div style="clear: both;">
15+
</div>
1416
</div>
1517
</div>
1618
</div>

Diff for: templates/legal/layout.html

+7-7
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@
66
</div>
77
<div class="settings-menu-contents">
88
<ul class="settings-menu">
9-
<li><a href="legal/beacon" class="beacon ">Beacon</a></li>
9+
<li><a href="#legal/beacon" class="beacon ">Beacon</a></li>
1010
<li class="spacer"></li>
1111

12-
<li><a href="legal/privacy" class="privacy ">Privacy</a></li>
13-
<li><a href="legal/security" class="security ">Security</a></li>
14-
<li><a href="legal/support" class="support ">Support</a></li>
12+
<li><a href="#legal/privacy" class="privacy ">Privacy</a></li>
13+
<li><a href="#legal/security" class="security ">Security</a></li>
14+
<li><a href="#legal/support" class="support ">Support</a></li>
1515
<li class="spacer"></li>
16-
<li><a href="legal/terms" class="terms">Terms</a></li>
17-
<li><a href="legal/trademark" class="trademark">Trademark</a></li>
16+
<li><a href="#legal/terms" class="terms">Terms</a></li>
17+
<li><a href="#legal/trademark" class="trademark">Trademark</a></li>
1818
<li class="spacer"></li>
19-
<li><a href="legal/money" class="money">Money</a></li>
19+
<li><a href="#legal/money" class="money">Money</a></li>
2020
</ul>
2121
</div>
2222
</div>

0 commit comments

Comments
 (0)