senaduka/old-web
1
0
Fork 0
Code Issues Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Merge branch 'modify-css-to-accomodate-KIVI-design' into 'master'

Browse Source 
Modify css to accomodate kivi design

See merge request saburly/marketalarm/web!44
This commit was merged in pull request #44.
This commit is contained in:
Bilal Catic
2019-10-14 09:18:21 +00:00
parent 8f0b18a4d7 362ee0dbb2
commit 25ee3bc16c
9 changed files with 41 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/queryReview.js
View File

@@ -102,7 +102,8 @@ const postQueryReview = async (req, res) => {
res.render("queryReview", { res.render("queryReview", {
error, error,
title, title,
queryReviewData queryReviewData,
email: ""
}); });
return; return;
} }
@@ -112,7 +113,8 @@ const postQueryReview = async (req, res) => {
res.render("queryReview", { res.render("queryReview", {
error, error,
title, title,
queryReviewData queryReviewData,
email: ""
}); });
return; return;
} }

BIN
app/public/fonts/altehaasgroteskbold.ttf Normal file
View File

Binary file not shown.

BIN
app/public/fonts/altehaasgroteskregular.ttf Normal file
View File

Binary file not shown.

33
app/public/main.css
View File

@@ -1,3 +1,14 @@
@font-face {
font-family: "Alte Haas Grotesk";
src: url("./fonts/altehaasgroteskregular.ttf");
}
@font-face {
font-family: "Alte Haas Grotesk";
src: url("./fonts/altehaasgroteskbold.ttf");
font-weight: bold;
}
.welcome-center-button { .welcome-center-button {
width: 100%; width: 100%;
} }
@@ -18,6 +29,10 @@
width: 95%; width: 95%;
} }
.noUi-connect {
background: #02adba;
}
.centered-element { .centered-element {
margin-top: 200px; margin-top: 200px;
} }
@@ -26,6 +41,19 @@
margin-top: 100px; margin-top: 100px;
} }
.btn, .btn-floating {
background: #02adba;
font-weight: bold;
}
.kivi-color {
color: #02adba;
}
.kivi-spinner-color {
border-color: #02adba;
}
#map { #map {
height: 50%; height: 50%;
} }
@@ -35,7 +63,7 @@ body {
height: 100%; height: 100%;
margin: 0; margin: 0;
padding: 0; padding: 0;
font-family: "Tangerine", serif; font-family: "Alte Haas Grotesk", serif;
} }
#floating-panel { #floating-panel {
@@ -43,10 +71,9 @@ body {
left: 25%; left: 25%;
z-index: 5; z-index: 5;
background-color: #fff; background-color: #fff;
padding: 5px;
border: 1px solid #999; border: 1px solid #999;
text-align: center; text-align: center;
font-family: "Roboto", "sans-serif"; font-family: "Roboto", "sans-serif";
line-height: 30px; line-height: 30px;
padding-left: 10px; padding: 5px 5px 5px 10px;
} }

4
app/views/layout.ejs
View File

@@ -23,9 +23,9 @@
<body> <body>
<%if (title) { %> <%if (title) { %>
<nav style="background-color: #26a69a; margin: auto;"> <nav style="background-color: #02adba; margin: auto;">
<div class="row center-align"> <div class="row center-align">
<h6 style="padding-top: 20px;"><%= title %></h6> <h6 style="font-weight: bold; padding-top: 20px;"><%= title %></h6>
</div> </div>
</nav> </nav>
<% } %> <% } %>

2
app/views/queryReview.ejs
View File

@@ -4,7 +4,7 @@
<% for(const stepData of queryReviewData) { %> <% for(const stepData of queryReviewData) { %>
<li class="collection-item" > <li class="collection-item" >
<div id="<%= stepData.id %>" ><%= stepData.title || '-' %> <div id="<%= stepData.id %>" ><%= stepData.title || '-' %>
<a href="<%= stepData.url %>" class="secondary-content"> <a href="<%= stepData.url %>" class="kivi-color secondary-content">
<i class="material-icons">edit</i> <i class="material-icons">edit</i>
</a> </a>
</div> </div>

2
app/views/realEstateType.ejs
View File

@@ -4,7 +4,7 @@
<% for(const realEstateType of realEstateTypes) { %> <% for(const realEstateType of realEstateTypes) { %>
<li class="collection-item"> <li class="collection-item">
<div id="<%= realEstateType.id %>" onclick="saveAndSubmit(this.id)"><%= realEstateType.title %> <div id="<%= realEstateType.id %>" onclick="saveAndSubmit(this.id)"><%= realEstateType.title %>
<a href="#" class="secondary-content"> <a href="#" class="kivi-color secondary-content">
<i class="material-icons">send</i> <i class="material-icons">send</i>
</a> </a>
</div> </div>

2
app/views/realEstates.ejs
View File

@@ -3,7 +3,7 @@
<% for(const realEstate of realEstates) { %> <% for(const realEstate of realEstates) { %>
<li class="collection-item"> <li class="collection-item">
<div><%= realEstate.title %> <div><%= realEstate.title %>
<a href="<%= realEstate.url %>" class="secondary-content"> <a href="<%= realEstate.url %>" class="kivi-color secondary-content">
<i class="material-icons">send</i> <i class="material-icons">send</i>
</a> </a>
</div> </div>

3
app/views/redirect.ejs
View File

@@ -1,6 +1,7 @@
<br><br>
<div class="center"> <div class="center">
<div class="preloader-wrapper big active center"> <div class="preloader-wrapper big active center">
<div class="spinner-layer spinner-green-only"> <div class="kivi-spinner-color spinner-layer spinner-green-only">
<div class="circle-clipper left"> <div class="circle-clipper left">
<div class="circle"></div> <div class="circle"></div>
</div><div class="gap-patch"> </div><div class="gap-patch">