Skip to content

Commit

Permalink
Merge pull request #16 from FLo-ABB/Look-improvements
Browse files Browse the repository at this point in the history
improving look
  • Loading branch information
FLo-ABB authored Jul 9, 2023
2 parents 9e66b99 + e759276 commit 1bdfdeb
Show file tree
Hide file tree
Showing 3 changed files with 61 additions and 20 deletions.
71 changes: 56 additions & 15 deletions assets/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -19,26 +19,29 @@ header {
}

.logo {
margin: 10px 50px;
position: absolute;
margin: 12px;
}

#navigation-bar {
overflow: hidden;
text-align: center;
margin: 0 auto;
display: flex;
flex-direction: row;
height: 75px;
}

#navigation-bar button {
background-color: inherit;
float: center;
border: none;
outline: none;
cursor: pointer;
padding: 25px 16px;
transition: 0.3s;
font-weight: bold;
font-size: 16px;
width: 150px
width: 150px;
height: 100%;
}

#navigation-bar button:hover {
Expand All @@ -59,16 +62,44 @@ header {
font-weight: bold;
font-size: 32px;
padding: 0px 16px;
position: absolute;
right: 0;
top: 0;
z-index: 1;
}

@media screen and (max-width: 600px) {
#navigation-bar {
display: none;
}

#hamburger {
display: block;
}


#navigation-bar{
display: none;
flex-direction: column;
position: absolute;
right: 0;
top: 0;
transition: 0.5s;
padding-top: 45px;
height: auto;
}

.logo {
display: none;
}

#navigation-bar button:hover {
box-shadow: inset -4px 0 0 #ff000f;
}

#navigation-bar button.active {
box-shadow: inset -4px 0 0 #ff000f;
}

#chartAndToolsPanel {
flex-grow: 1;
}
}

/* main app */
Expand All @@ -86,10 +117,7 @@ header {

#infoPanel {
flex-basis: 10%;
margin: 20px;
padding: 10px;
box-shadow: 0 0 2px 0 rgb(0 0 0 / 30%);
text-align: justify;
padding: 30px;
display: flex;
flex-direction: column;
justify-content: flex-start;
Expand Down Expand Up @@ -188,18 +216,31 @@ input[type="checkbox" i] {
}

/* Info Panel elements*/
#RobotTitle {
display: flex;
align-items: center;
justify-content: center;

}

#color {
display: inline-block;
width: 20px;
height: 20px;
width: 23px;
height: 23px;
border-radius: 50%;
margin: 0px 20px;
margin-right: 20px;
padding: 0px
}

#IRBName {
display: inline-block;
font-size: 2em;
letter-spacing: -0.05em;
}

#descr {
font-size: 16px;
line-height: 24px;
}

#MoreContainer {
Expand Down
2 changes: 1 addition & 1 deletion assets/uiUtils.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,5 @@ function toggleMenu() {
hamburger.innerHTML = (hamburger.innerHTML === "☰") ? "✕" : "☰";

const navigationBar = document.getElementById("navigation-bar");
navigationBar.style.display = (navigationBar.style.display === "block") ? "none" : "block";
navigationBar.style.display = (navigationBar.style.display === "flex") ? "none" : "flex";
}
8 changes: 4 additions & 4 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,13 @@
</div>
</div>
<div id="infoPanel">
<div>
<div id="color"></div>
<h2 id="IRBName"></h2>
</div>
<div style="text-align: center;">
<img id="image" src="assets/img/IRB8700_thumb.png" max-height="256px" alt="Industrial Robot">
</div>
<div id="RobotTitle">
<div id="color"></div>
<h2 id="IRBName"></h2>
</div>
<p id="descr">Put your mouse hover the circles in the chart to interact with them!</p>
<div id="supported_controllers"></div>
<button id="MoreContainer" class="More"><a href="https://new.abb.com/products/robotics" id="More"
Expand Down

0 comments on commit 1bdfdeb

Please sign in to comment.