MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Merge remote-tracking branch 'origin/Development' into Development

This commit is contained in:
George Kalampokis 2020-06-03 12:16:21 +03:00
parent 78ee4673ee a74321b3b4
commit 30542b4156
10 changed files with 238 additions and 235 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dmp-frontend/src/assets/splash/about/faqs.html
View File

@ -34,8 +34,7 @@
<div class="navbar-collapse" id="navbarResponsive">
<ul class="navbar-nav text-uppercase ml-auto">
<li class="nav-item">
<a class="nav-link dropbtn active-nav-link" onclick="dropdownToggle('aboutDropdown')"
href="#about">ABOUT</a>
<a class="nav-link dropbtn active-nav-link" href="#about">ABOUT</a>
<div id="aboutDropdown" class="dropdown-content">
<div class="dropdown-top"></div>
<div class="dropdown-options">
@ -46,8 +45,7 @@
</div>
</li>
<li class="nav-item">
<a class="nav-link dropbtn" onclick="dropdownToggle('resourcesDropdown')"
href="#resources">RESOURCES</a>
<a class="nav-link dropbtn" href="#resources">RESOURCES</a>
<div id="resourcesDropdown" class="dropdown-content">
<div class="dropdown-top"></div>
<div class="dropdown-options">

8
dmp-frontend/src/assets/splash/about/how-it-works.html
View File

@ -33,8 +33,7 @@
<div class="navbar-collapse" id="navbarResponsive">
<ul class="navbar-nav text-uppercase ml-auto">
<li class="nav-item">
<a class="nav-link dropbtn active-nav-link" onclick="dropdownToggle('aboutDropdown')"
href="#about">ABOUT</a>
<a class="nav-link dropbtn active-nav-link" href="#about">ABOUT</a>
<div id="aboutDropdown" class="dropdown-content">
<div class="dropdown-top"></div>
<div class="dropdown-options">
@ -45,8 +44,7 @@
</div>
</li>
<li class="nav-item">
<a class="nav-link dropbtn" onclick="dropdownToggle('resourcesDropdown')"
href="#resources">RESOURCES</a>
<a class="nav-link dropbtn" href="#resources">RESOURCES</a>
<div id="resourcesDropdown" class="dropdown-content">
<div class="dropdown-top"></div>
<div class="dropdown-options">
@ -112,7 +110,7 @@
<p class="pt-2 pb-5">
ARGOS is offered as a standalone service, where
users can download the source code and co-brand it. Read more on how to implement that in the
<a href="#"><u>Resources section</u></a>.
<a href="../resources/co-branding.html"><u>Resources section</u></a>.
</p>
</div>
</section>

4
dmp-frontend/src/assets/splash/contact.html
View File

@ -27,7 +27,7 @@
<div class="navbar-collapse" id="navbarResponsive">
<ul class="navbar-nav text-uppercase ml-auto">
<li class="nav-item">
<a class="nav-link dropbtn" onclick="dropdownToggle('aboutDropdown')" href="#about">ABOUT</a>
<a class="nav-link dropbtn" href="#about">ABOUT</a>
<div id="aboutDropdown" class="dropdown-content">
<div class="dropdown-top"></div>
<div class="dropdown-options">
@ -38,7 +38,7 @@
</div>
</li>
<li class="nav-item">
<a class="nav-link dropbtn" onclick="dropdownToggle('resourcesDropdown')" href="#resources">RESOURCES</a>
<a class="nav-link dropbtn" href="#resources">RESOURCES</a>
<div id="resourcesDropdown" class="dropdown-content">
<div class="dropdown-top"></div>
<div class="dropdown-options">

14
dmp-frontend/src/assets/splash/css/navbar.css
View File

@ -114,6 +114,8 @@
.nav-item {
margin-bottom: -1px;
position: relative;
display: inline-block;
}
.nav-link {
@ -200,7 +202,7 @@
.dropdown-top {
width: 0px;
border-bottom: 10px solid #23BCBA ;
border-bottom: 10px solid #23BCBA;
border-left: 10px solid transparent;
border-right: 10px solid transparent;
margin: 0 20%;
@ -229,7 +231,7 @@
.dropdown-content a {
text-align: left;
font-weight: 700;
font-family: 'Roboto',sans-serif;
font-family: 'Roboto', sans-serif;
font-size: 0.87rem;
color: #FFFFFF;
text-transform: uppercase;
@ -243,6 +245,14 @@
background-color: rgba(255, 255, 255, 0.609) !important;
}
.dropdown-options a:hover {
background-color: #ddd;
}
.nav-item:hover .dropdown-content {
display: block;
}
.show {
display: block;
}

2
dmp-frontend/src/assets/splash/css/styles.css
View File

@ -208,7 +208,7 @@ hr {
}
.normal-btn {
/* min-width: 162px; */
min-width: 162px;
max-width: 256px;
height: 40px;
cursor: pointer;

6
dmp-frontend/src/assets/splash/index.html
View File

@ -27,7 +27,7 @@
<div class="collapse navbar-collapse" id="navbarResponsive">
<ul class="navbar-nav text-uppercase ml-auto">
<li class="nav-item">
<a class="nav-link dropbtn" onclick="dropdownToggle('aboutDropdown')" href="#about">ABOUT</a>
<a class="nav-link dropbtn" href="#about">ABOUT</a>
<div id="aboutDropdown" class="dropdown-content">
<div class="dropdown-top"></div>
<div class="dropdown-options">
@ -38,7 +38,7 @@
</div>
</li>
<li class="nav-item">
<a class="nav-link dropbtn" onclick="dropdownToggle('resourcesDropdown')" href="#resources">RESOURCES</a>
<a class="nav-link dropbtn" href="#resources">RESOURCES</a>
<div id="resourcesDropdown" class="dropdown-content">
<div class="dropdown-top"></div>
<div class="dropdown-options">
@ -307,7 +307,7 @@
</div>
<div class="col-auto">
<div class="row">
<div class="col-auto branding-logo">
<div class="col-auto branding-logo pl-0">
<img src="assets/img/argos-logo - Copy.svg" width="91" height="35">
</div>
<span class="title-3">co-branding</span>

1
dmp-frontend/src/assets/splash/js/scripts.js
View File

@ -14,7 +14,6 @@ function toggleClass(ids, option) {
function navbarCollapse() {
var element = document.getElementById('nav');
if (document.body.scrollTop > 100 || document.documentElement.scrollTop > 100) {
console.log('here')
element.classList.add("navbar-shrink");
element.classList.add("fixed-top");
} else {

5
dmp-frontend/src/assets/splash/resources/co-branding.html
View File

@ -33,7 +33,7 @@
<div class="navbar-collapse" id="navbarResponsive">
<ul class="navbar-nav text-uppercase ml-auto">
<li class="nav-item">
<a class="nav-link dropbtn" onclick="dropdownToggle('aboutDropdown')" href="#about">ABOUT</a>
<a class="nav-link dropbtn" href="#about">ABOUT</a>
<div id="aboutDropdown" class="dropdown-content">
<div class="dropdown-top"></div>
<div class="dropdown-options">
@ -44,8 +44,7 @@
</div>
</li>
<li class="nav-item">
<a class="nav-link dropbtn active-nav-link" onclick="dropdownToggle('resourcesDropdown')"
href="#resources">RESOURCES</a>
<a class="nav-link dropbtn active-nav-link" href="#resources">RESOURCES</a>
<div id="resourcesDropdown" class="dropdown-content">
<div class="dropdown-top"></div>
<div class="dropdown-options">

5
dmp-frontend/src/assets/splash/resources/media-kit.html
View File

@ -33,7 +33,7 @@
<div class="navbar-collapse" id="navbarResponsive">
<ul class="navbar-nav text-uppercase ml-auto">
<li class="nav-item">
<a class="nav-link dropbtn" onclick="dropdownToggle('aboutDropdown')" href="#about">ABOUT</a>
<a class="nav-link dropbtn" href="#about">ABOUT</a>
<div id="aboutDropdown" class="dropdown-content">
<div class="dropdown-top"></div>
<div class="dropdown-options">
@ -44,8 +44,7 @@
</div>
</li>
<li class="nav-item">
<a class="nav-link dropbtn active-nav-link" onclick="dropdownToggle('resourcesDropdown')"
href="#resources">RESOURCES</a>
<a class="nav-link dropbtn active-nav-link" href="#resources">RESOURCES</a>
<div id="resourcesDropdown" class="dropdown-content">
<div class="dropdown-top"></div>
<div class="dropdown-options">

4
dmp-frontend/src/assets/splash/resources/user-guide.html
View File

@ -26,7 +26,7 @@
<div class="navbar-collapse" id="navbarResponsive">
<ul class="navbar-nav text-uppercase ml-auto">
<li class="nav-item">
<a class="nav-link dropbtn" onclick="dropdownToggle('aboutDropdown')" href="#about">ABOUT</a>
<a class="nav-link dropbtn" href="#about">ABOUT</a>
<div id="aboutDropdown" class="dropdown-content">
<div class="dropdown-top"></div>
<div class="dropdown-options">
@ -37,7 +37,7 @@
</div>
</li>
<li class="nav-item">
<a class="nav-link dropbtn active-nav-link" onclick="dropdownToggle('resourcesDropdown')" href="#resources">RESOURCES</a>
<a class="nav-link dropbtn active-nav-link" href="#resources">RESOURCES</a>
<div id="resourcesDropdown" class="dropdown-content">
<div class="dropdown-top"></div>
<div class="dropdown-options">