Skip to content

Commit cef36c2

Browse files
JRyanSaundersJRyanSaunders
committed
new
1 parent 05c223c commit cef36c2

24 files changed

+329
-169
lines changed

‎.DS_Store

0 Bytes
Binary file not shown.

‎about.php

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
11
<?php
22
$template_name = 'about';
3-
include 'template-blocks/header.php';
3+
include 'header.php';
44
$page_title = 'About';
55
$page_header_image = 'paint6.jpg';
66
include 'template-blocks/page-header-overlay.php'; ?>
77

88
<div class="textsection">
9-
<p>about the website</p>
9+
<h3>about the website</h3>
1010
<h1>How it works</h1>
1111
<p>It's difficult finding a tradesman you can trust.
1212
This website helps you find the right tradesman for you</p>
1313
<button class="btn btn-primary">Find a tradesman</button>
1414
</div>
1515

1616
<div class="wbackground">
17-
<h3>Your next project starts here...</h3>
18-
<p>A platform that helps you find the right decorator.</p>
17+
<h2>Your next project starts here...</h2>
18+
<p class="large-text">A platform that helps you find the right decorator.</p>
1919

2020
<div class="row">
2121
<div class="col-sm-4">
22-
<img class="img-responsive icon" src="/easytrade/assets/img/magnifying.svg" alt="magnifying">
23-
<h4>Search</h4>
24-
<p>A range of Painter & Decorators in St. Albans and surrounding areas, a service to connect people to their next project.</p>
22+
<img class="img-responsive icon" src="/easytrade/assets/img/magnifying.svg" alt="magnifying">
23+
<h3>Search</h3>
24+
<p>A range of Painter & Decorators in St. Albans and surrounding areas, a service to connect people to their next project.</p>
2525
</div>
26-
<img class="img-responsive icon" src="/easytrade/assets/img/handshake.svg" alt="handshake">
26+
<img class="img-responsive icon" src="/easytrade/assets/img/handshake.svg" alt="handshake">
2727
<div class="col-sm-4">
28-
<h4>Discover</h4>
29-
<p>New connections to companies, to help you with the dream house that you deserve.</p>
28+
<h3>Discover</h3>
29+
<p>New connections to companies, to help you with the dream house that you deserve.</p>
3030
</div>
3131
<div class="col-sm-4">
32-
<img class="img-responsive icon" src="/easytrade/assets/img/world.svg" alt="world">
33-
<h4>Explore</h4>
34-
<p>The different options for you, taking into account price and styles to suit your needs.</p>
32+
<img class="img-responsive icon" src="/easytrade/assets/img/world.svg" alt="world">
33+
<h3>Explore</h3>
34+
<p>The different options for you, taking into account price and styles to suit your needs.</p>
3535
</div>
3636
</div>
3737
</div>
@@ -41,7 +41,7 @@
4141
<div class="bbackground">
4242
<div class="row">
4343
<div class="col-sm-6">
44-
<h4>Accountability through feedback</h4>
44+
<h2>Accountability through feedback</h2>
4545
<p>Once a job is in progress, a bit of accountability goes a long way. EasyTrade’s feedback
4646
system ensures that tradesmen are rewarded for good work and held accountable for any problems.
4747
Our tradesmen relish the opportunity to build an outstanding reputation on this website,
@@ -59,7 +59,7 @@
5959
</div>
6060
<div class="col-sm-6">
6161
<h4>Accountability through feedback</h4>
62-
<p>Once a job is in progress, a bit of accountability goes a long way. EasyTrade’s feedback
62+
<p class="large-text">Once a job is in progress, a bit of accountability goes a long way. EasyTrade’s feedback
6363
system ensures that tradesmen are rewarded for good work and held accountable for any problems.
6464
Our tradesmen relish the opportunity to build an outstanding reputation on this website,
6565
and your feedback makes that possible.</p>
@@ -97,5 +97,5 @@
9797
</div>
9898

9999
<?php
100-
include 'template-blocks/footer.php';
100+
include 'footer.php';
101101
?>

‎admin-pages/home-edit.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
<?php
22
$template_name = 'signup';
33
include 'admin-header.php';
4+
5+
6+
7+
include 'icon_block.php';
8+
9+
410
?>
511

612

‎admin-pages/icon_block.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,32 +26,32 @@
2626
</fieldset>
2727
2828
<fieldset>
29-
<label for="icon_title1">Icon1</label>
30-
<input type="text" id="icon_Title1" name="icon_Title1"/>
29+
<label for="icon_title1">Icon title 1</label>
30+
<input type="text" id="icon title1" name="icon_Title1"/>
3131
</fieldset>
3232
3333
<fieldset>
34-
<label for="icon_title2">Icon2</label>
34+
<label for="icon_title2">Icon title 2</label>
3535
<input type="text" id="icon_Title2" name="icon_Title2"/>
3636
</fieldset>
3737
3838
<fieldset>
39-
<label for="icon_title3">Icon3</label>
39+
<label for="icon_title3">Icon title 3</label>
4040
<input type="text" id="icon_Title3" name="icon_Title3"/>
4141
</fieldset>
4242
4343
<fieldset>
44-
<label for="icon_text1">Icon1</label>
44+
<label for="icon_text1">Icon text 1</label>
4545
<input type="text" id="icon_text1" name="icon_text1"/>
4646
</fieldset>
4747
4848
<fieldset>
49-
<label for="icon_text2">Icon2</label>
49+
<label for="icon_text2">Icon text 2</label>
5050
<input type="text" id="icon_text2" name="icon_text2"/>
5151
</fieldset>
5252
5353
<fieldset>
54-
<label for="icon_text3">Icon3</label>
54+
<label for="icon_text3">Icon text 3</label>
5555
<input type="text" id="icon_text3" name="icon_text3"/>
5656
</fieldset>
5757

‎admin-pages/rating_block.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<form method="rating">
22

3-
<!-- option to add polaroids??? how??? -->
4-
53
<fieldset>
64
<label for="rating1">Rating 1</label>
75
<input type="text" id="rating1" name="rating1"/>
@@ -33,17 +31,17 @@
3331
</fieldset>
3432

3533
<fieldset>
36-
<label for="review_type1">Review 1</label>
34+
<label for="review_type1">Review type 1</label>
3735
<input type="text" id="review_type1" name="review_type1"/>
3836
</fieldset>
3937

4038
<fieldset>
41-
<label for="review_type2">Review 2</label>
39+
<label for="review_type2">Review type 2</label>
4240
<input type="text" id="review_type2" name="review_type2"/>
4341
</fieldset>
4442

4543
<fieldset>
46-
<label for="review_type3">Review 3</label>
44+
<label for="review_type3">Review type 3</label>
4745
<input type="text" id="review_type3" name="review_type3"/>
4846
</fieldset>
4947

‎assets/css/base/elements.scss

Lines changed: 22 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,44 @@
11
h1, h2, h3 {
2-
font-family: $Defaultfont;
2+
font-family: $default-font;
33
font-style: normal;
4-
}
5-
h1, h2 {
6-
font-weight: 500;
7-
text-align: center;
8-
color: #FFFFFF;
9-
text-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25);
10-
font-size: 30px;
4+
font-weight: 600;
5+
line-height: normal;
6+
text-align: left;
7+
text-transform: uppercase;
8+
color: #000000;
9+
margin: 0;
1110
}
1211
h1 {
13-
font-weight: 300;
14-
color: #FFFFFF;
15-
font-size: 50px;
16-
position: absolute;
17-
top: 50%;
18-
left: 50%;
19-
transform: translate(-50%, -50%);
12+
font-size: 45px;
2013
}
2114
h2 {
22-
15+
font-size: 36px;
2316
}
2417
h3 {
25-
font-weight: normal;
26-
font-size: 30px;
27-
line-height: normal;
28-
text-align: center;
29-
color: #2F4C57;
18+
font-size: 21px;
3019
}
3120
h4 {
32-
font-weight: normal;
33-
font-size: 19px;
34-
line-height: normal;
35-
text-align: center;
36-
color: #2F4C57;
21+
3722
}
3823
h5 {
39-
font-weight: normal;
40-
font-size: 40px;
41-
line-height: normal;
42-
text-align: center;
43-
color: #ffffff;
24+
4425
}
4526
h6 {
4627

4728
}
4829
p {
49-
font-family: Raleway;
30+
font-family: $default-font;
5031
font-style: normal;
51-
font-weight: normal;
52-
font-size: 18px;
32+
font-weight: 600;
33+
font-size: 16px;
5334
line-height: normal;
54-
text-align: center;
55-
color: #2F4C57;
35+
text-align: left;
36+
37+
color: #000000;
38+
}
39+
.large-text {
40+
@extend p;
41+
font-size: 20px;
5642
}
5743
button {
5844

‎assets/css/base/header.scss

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.navbar-inverse {
2-
background-color: $primarycolor;
2+
background-color: $primary-colour-dark;
33
border: none;
44
.navbar-form {
55
.input-group-btn {
@@ -11,10 +11,9 @@
1111
.navbar-nav {
1212
li {
1313
a {
14-
background-color: $primarycolor;
15-
color: $secondarycolor;
14+
color: $white;
1615
&:hover {
17-
background-color: $thirdcolor;
16+
background-color: $grey;
1817
color: black;
1918
}
2019
&.signin {
@@ -23,23 +22,26 @@
2322
padding-bottom: 6px;
2423
margin-top: 7px;
2524
}
25+
h3 {
26+
font-size: 17px;
27+
}
2628
}
2729
&.active {
2830
a {
29-
background-color: $primarycolor;
30-
color: $secondarycolor;
31+
background-color: $primary-colour-dark;
32+
color: $white;
3133
}
3234
&:hover
3335
{
34-
background-color: $thirdcolor;
36+
background-color: $grey;
3537
color: black;
3638
}
3739
}
3840
}
3941
.profile {
4042
height: 40px;
4143
padding: 3%;
42-
color: $secondarycolor;
44+
color: $white;
4345
}
4446
}
4547
}

‎assets/css/base/variable.scss

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
$primarycolor: #2F4C57;
2-
$secondarycolor: #fff;
3-
$thirdcolor: #ddd;
1+
$primary-colour-light: #6893A3;
2+
$primary-colour-medium: #135067;
3+
$primary-colour-dark: #2F4C57;
4+
$accent-colour-1: '#B03D55';
5+
46
$black: #000;
57
$white: #fff;
6-
$Defaultfont: "Raleway";
7-
$bbackgroundcolor: #6893A3;
8+
$grey: #ddd;
9+
10+
$default-font: "Raleway";

‎assets/css/templates/about.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
}
77

88
.wbackground {
9-
background-color: $secondarycolor;
9+
background-color: $white;
1010
font-size: 36px;
1111
padding: 10px;
1212
justify-content: space-around;
1313
}
1414

1515
.bbackground {
16-
background-color: $bbackgroundcolor;
16+
background-color: $white;
1717
font-size: 36px;
1818
padding: 10px;
1919
justify-content: space-around;

‎assets/css/templates/home.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@
3333
width: 50%;
3434
height: 8%;
3535
font-size: 24px;
36-
font-family: $Defaultfont;
36+
font-family: $default-font;
3737
}
3838
}

0 commit comments

Comments
 (0)