浏览代码

Merge remote-tracking branch 'origin/master'

master
Bruce Lywood 5 年前
父节点
当前提交
7585a425b9
共有 3 个文件被更改,包括 36 次插入20 次删除
  1. 1
    1
      src/components/about/aboutUsPage.vue
  2. 32
    19
      src/components/shared/footerSection.vue
  3. 3
    0
      src/router/index.js

+ 1
- 1
src/components/about/aboutUsPage.vue 查看文件

@@ -25,7 +25,7 @@
25 25
             </div>
26 26
             <div class="col-md-6 col-lg-5 section-md-t3">
27 27
               <p class="color-text-a font-weight-bold" style="text-align:left;">
28
-                began in 2013 in Pretoria East with various properties in their portfolio.
28
+                Uni-Vate Properties began in 2013 in Pretoria East with various properties in their portfolio.
29 29
                 Led by our Director, Delia O' Conner, who has over 25 years of experience in the timeshare industry,
30 30
                 the move to conventional property sales and rentals was an easy transition for the Uni-Vate team.
31 31
               </p>

+ 32
- 19
src/components/shared/footerSection.vue 查看文件

@@ -4,30 +4,41 @@
4 4
       <div class="container">
5 5
         <div class="row">
6 6
           <div class="col-sm-12 col-md-4">
7
-            <div class="w-header-a">
8
-              <div class="navbar-brand text-brand">
9
-                Uni-Vate
10
-                <span class="color-b">Properties</span>
7
+            <div class="widget-a">
8
+              <div class="w-header-a">
9
+                <h4 class="w-title-a">
10
+                  <router-link to="/">
11
+                    <b>Uni-Vate</b>
12
+                    <span class="color-b">Properties</span>
13
+                  </router-link>
14
+                </h4>
15
+              </div>
16
+              <div class="w-body-a"></div>
17
+              <div class="w-footer-a">
18
+                <ul class="list-unstyled">
19
+                  <li class="color-a">
20
+                    <eva-icon name="phone-call-outline" fill="#60CBEB"></eva-icon>
21
+                    <span class="color-text-a"></span> +27 (0)12 492 1238
22
+                  </li>
23
+                  <li class="color-a">
24
+                    <eva-icon name="email-outline" fill="#60CBEB"></eva-icon>
25
+                    <span class="color-text-a"></span> info@univateproperties.co.za
26
+                  </li>
27
+                  <br />
28
+                  <li class="item-list-a">
29
+                    <i class="ion-ios-arrow-forward" style="color:#60CBEB"></i>
30
+                    <router-link to="/contactUs">Contact Us</router-link>
31
+                  </li>
32
+                </ul>
11 33
               </div>
12
-            </div>
13
-            <div class="w-body-a"></div>
14
-            <div class="w-footer-a">
15
-              <ul class="list-unstyled">
16
-                <li class="color-a">
17
-                  <eva-icon name="phone-call-outline" fill="#60CBEB"></eva-icon>
18
-                  <span class="color-text-a"></span> +27 (0)12 492 1238
19
-                </li>
20
-                <!-- <li class="color-a">
21
-                  <eva-icon name="email-outline" fill="#60CBEB"></eva-icon>
22
-                  <span class="color-text-a"></span> info@univateproperties.co.za
23
-                </li> -->
24
-              </ul>
25 34
             </div>
26 35
           </div>
27 36
           <div class="col-sm-12 col-md-4 section-md-t3">
28 37
             <div class="widget-a">
29 38
               <div class="w-header-a">
30
-                <h4 class="w-title-a text-brand">Navigation</h4>
39
+                <h4 class="w-title-a">
40
+                  <b>Navigation</b>
41
+                </h4>
31 42
               </div>
32 43
               <div class="w-body-a">
33 44
                 <div class="w-body-a">
@@ -49,7 +60,9 @@
49 60
           </div>
50 61
           <div class="col-sm-12 col-md-4 section-md-t3">
51 62
             <div class="w-header-a">
52
-              <h4 class="w-title-a text-brand">Our Partners</h4>
63
+              <h4 class="w-title-a">
64
+                <b>Our Partners</b>
65
+              </h4>
53 66
             </div>
54 67
             <div class="w-body-a">
55 68
               <ul class="list-unstyled">

+ 3
- 0
src/router/index.js 查看文件

@@ -45,6 +45,9 @@ import Offer from '../components/processFlow/offers.vue';
45 45
 Vue.use(Router);
46 46
 
47 47
 export default new Router({
48
+  scrollBehavior (to, from, savedPosition) {
49
+    return { x: 0, y: 0 }
50
+  },
48 51
   routes: [{
49 52
     path: '/',
50 53
     name: 'Home',

正在加载...
取消
保存