From 27526c5587ad5c7e54eeb1e05dca0bde05b53820 Mon Sep 17 00:00:00 2001 From: Francesca Sperati <6431@ait.nsw.edu.au> Date: Thu, 24 Jan 2019 22:03:49 +1100 Subject: [PATCH] companies, ads_1, referee pages --- src/_sidebar.html | 12 +- src/ads.html | 20 +-- src/ads_1.html | 228 ++++++++++++++++++++++++++++++++++ src/assets/styles/nomit.scss | 78 ++++++++++-- src/companies.html | 179 ++++++++++++++++++++++++++ src/login.html | 24 +--- src/referees.html | 178 ++++++++++++++++++++++++++ src/users.html | 1 - webpack/plugins/htmlPlugin.js | 3 + 9 files changed, 680 insertions(+), 43 deletions(-) create mode 100644 src/ads_1.html create mode 100644 src/companies.html create mode 100644 src/referees.html diff --git a/src/_sidebar.html b/src/_sidebar.html index 27e65b8..1aa1ccd 100644 --- a/src/_sidebar.html +++ b/src/_sidebar.html @@ -180,7 +180,7 @@
  • - + @@ -188,7 +188,7 @@
  • - + @@ -196,7 +196,7 @@
  • - + @@ -204,7 +204,7 @@
  • - + @@ -212,7 +212,7 @@
  • - + @@ -220,7 +220,7 @@
  • - + diff --git a/src/ads.html b/src/ads.html index 8a6a86a..65231d8 100644 --- a/src/ads.html +++ b/src/ads.html @@ -129,9 +129,11 @@
    Adv title

    Some quick example text to build on the card title and make up the bulk of the card's content.

    -
    - VIEW MORE -
    +     +
    + VIEW MORE +
    +     @@ -149,9 +151,11 @@
    Adv title

    Some quick example text to build on the card title and make up the bulk of the card's content.

    -
    + +
    VIEW MORE -
    +
    + @@ -168,9 +172,11 @@
    Adv title

    Some quick example text to build on the card title and make up the bulk of the card's content.

    -
    + +
    VIEW MORE -
    +
    + diff --git a/src/ads_1.html b/src/ads_1.html new file mode 100644 index 0000000..682c992 --- /dev/null +++ b/src/ads_1.html @@ -0,0 +1,228 @@ + + + + + + Ad_1 + + + + + + + + + + + + + + + +
    + +
    + + + + + +
    + + ${require('html-loader!./_sidebar.html')} + +
    + + + ${require('html-loader!./_topbar.html')} + + + +
    +
    + +
    +
    + +
    +
    + +
    +
    + + +
    +
    +
    + +
    Graphic Designer Internship
    +
    Great Southern Press
    +
    +
    +
    +
    +
    +
    About the business:
    +

    Southern Press is leading ... bla bla bla bla.

    +
    +
    About the role:
    +

    This part time role will ... bla bla bla bla.

    +
    +
    +
    +
    +
    + +
    +
    +
    + +
    David James
    +
    Victoria
    +
    Mobile: 0414987654
    +
    +
    +
    +
    +
    + + + + +
    +
    +
    +
    +
    +
    +
    +
    + +
    David James
    +
    Victoria
    +
    Mobile: 0414987654
    +
    +
    +
    +
    +
    + + + + +
    +
    +
    +
    +
    +
    +
    +
    + +
    David James
    +
    Victoria
    +
    Mobile: 0414987654
    +
    +
    +
    +
    +
    + + + + +
    +
    +
    +
    +
    +
    + + +
    + + + + + + + + +
    + + +
    + +
    + + + ${require('html-loader!./_footer.html')} +
    +
    + + + diff --git a/src/assets/styles/nomit.scss b/src/assets/styles/nomit.scss index 8b57ad5..c789163 100644 --- a/src/assets/styles/nomit.scss +++ b/src/assets/styles/nomit.scss @@ -48,6 +48,10 @@ .text-size-11{ font-size:11px; } + +.text-size-20{ + font-size:20px; +} //index .succ-match-perc{ height: 400px; @@ -149,16 +153,22 @@ top: -20px; right: -50px; border: 2px solid transparent; - border-top-left-radius: 132px; + border-top-left-radius: 10px; border-top-right-radius: 10px; border-bottom-right-radius: 10px; - border-bottom-left-radius: 67px; + border-bottom-left-radius: 10px; margin-left: auto; padding: 100px; + text-align: center; } .logo-wisp-right{ - width: 130px; - margin: auto; + width: 174px; +} +.modal-username{ + margin-top: 10px;; + border-radius: 50px; + border-color: #501db9; + width: 180px; } .btn-signup{ color: #fff; @@ -176,8 +186,60 @@ text-align: -webkit-center; margin-top: 20px; } -.modal-username{ - background-image:url(../images/icons/dollar.png); - background-repeat: no-repeat; - background-position: 2px 3px; +//companies +.card-body-companies{ + border-top: 1px solid #9c9fa0; + margin: 0; +} +.companies-icons{ + margin-left: 150px; + padding: 5px; + padding-left: 0; +} +.companies-icons i{ + font-size: 20px; + margin-right: 15px; + color: #9c9fa0; +} +.companies-update-img{ + width: 80px; + float: left; + margin-left: 50px; + margin-top: 20px; + margin-bottom: 20px; +} +//referees +.card-body-referee{ + border-top: 1px solid #9c9fa0; + margin: 0; +} +.referee-icons{ + margin-left: 150px; + padding: 5px; + padding-left: 0; +} +.referee-icons i{ + font-size: 20px; + margin-right: 15px; + color: #9c9fa0; +} +.referee-update-img{ + width: 80px; + float: left; + margin-left: 50px; + margin-top: 20px; + margin-bottom: 20px; +} +//ads_1 +.companies-update-title{ + margin-left: 50px; + margin-top: 20px; + margin-bottom: 20px; +} +.btn-centered{ + margin-top: 0; + margin-left: 0; +} +.btn-centered-container{ + text-align:center; } \ No newline at end of file diff --git a/src/companies.html b/src/companies.html new file mode 100644 index 0000000..dadf909 --- /dev/null +++ b/src/companies.html @@ -0,0 +1,179 @@ + + + + + + Companies + + + + + + + + + + + + + + + +
    + +
    + + + + + +
    + + ${require('html-loader!./_sidebar.html')} + +
    + + + ${require('html-loader!./_topbar.html')} + + + +
    +
    +
    +
    + Companies +
    +
    + +
    +
    + + +
    +
    +
    + +
    David James
    +
    Victoria
    +
    Mobile: 0414987654
    +
    +
    +
    +
    +
    + + + + +
    +
    +
    +
    +
    + +
    +
    +
    + +
    David James
    +
    Victoria
    +
    Mobile: 0414987654
    +
    +
    +
    +
    +
    + + + + +
    +
    +
    +
    +
    + + + + + +
    + + +
    + +
    + + + ${require('html-loader!./_footer.html')} +
    +
    + + + + diff --git a/src/login.html b/src/login.html index 4f01f95..144f350 100644 --- a/src/login.html +++ b/src/login.html @@ -55,7 +55,6 @@ -
    @@ -71,30 +70,11 @@ }); - - - - - - -
    diff --git a/src/referees.html b/src/referees.html new file mode 100644 index 0000000..1795ef3 --- /dev/null +++ b/src/referees.html @@ -0,0 +1,178 @@ + + + + + + Referees + + + + + + + + + + + + + + + +
    + +
    + + + + + +
    + + ${require('html-loader!./_sidebar.html')} + +
    + + + ${require('html-loader!./_topbar.html')} + + + +
    +
    +
    +
    + Referees +
    +
    + +
    +
    + + +
    +
    +
    + +
    David James
    +
    Victoria
    +
    Mobile: 0414987654
    +
    +
    +
    +
    +
    + + + + +
    +
    +
    +
    +
    + +
    +
    +
    + +
    David James
    +
    Victoria
    +
    Mobile: 0414987654
    +
    +
    +
    +
    +
    + + + + +
    +
    +
    +
    +
    + + + + + +
    + + +
    + +
    + + + ${require('html-loader!./_footer.html')} +
    +
    + + + diff --git a/src/users.html b/src/users.html index ef2ed22..241ee46 100644 --- a/src/users.html +++ b/src/users.html @@ -166,7 +166,6 @@ - diff --git a/webpack/plugins/htmlPlugin.js b/webpack/plugins/htmlPlugin.js index 694e0bf..c3a2dde 100755 --- a/webpack/plugins/htmlPlugin.js +++ b/webpack/plugins/htmlPlugin.js @@ -10,6 +10,7 @@ const titles = { 'calendar': 'Calendar', 'charts': 'Charts', 'ads': 'ads', + 'ads_1':'ads_1', 'chat': 'Chat', 'compose': 'Compose', 'datatable': 'Datatable', @@ -17,6 +18,8 @@ const titles = { 'forms': 'Forms', 'profile': 'profile', 'users': 'users', + 'companies': 'companies', + 'referees': 'referees', 'login': 'login', 'google-maps': 'Google Maps', 'signin': 'Signin',