Commit d3e24758 authored by Mathieu's avatar Mathieu
Browse files

Update OpenMOLE logos

parent 9f743160
Pipeline #1238 failed with stage
in 11 minutes and 34 seconds
......@@ -173,12 +173,11 @@ object App {
//START BUTTON
lazy val theNavBar = div(
cls := "nav-container",
img(src := "img/openmole_dark.png", width := "300px"),
child <-- openFileTree.signal.map { oft
navBar(
Seq(
backgroundColor := "#3f3d56", fontSize := "20", marginLeft := "310px"
// if (oft) mainNav370 else mainNav0
),
emptySetters,
navItem(
if (oft) div(glyph_chevron_left) else div(glyph_chevron_right),
todo = () {
......
......@@ -40,27 +40,17 @@ class Connection {
private val connectionForm = form(
method := "post",
cls := "connection-form",
passwordInput,
connectButton
)
val render = {
//panels.settingsView.renderConnection,
div(
div("RENDER CONNECTION"),
//panels.settingsView.renderConnection,
div(
omsheet.connectionTabOverlay,
div(
img(src := "img/openmole.png", omsheet.openmoleLogo),
div(
omsheet.centerPage(),
div(
omsheet.connectionBlock,
connectionForm
)
)
)
)
cls := "screen-center",
img(src := "img/openmole_light.png", width := "600px"),
connectionForm
)
}
......
......@@ -48,22 +48,17 @@ class ResetPassword {
def setPasswordForm =
form(
method := "post",
cls := "connection-form",
passwordInput,
passwordAgainInput,
resetButton
)
val resetPassDiv =
div(omsheet.connectionTabOverlay,
div(
img(src := "img/openmole.png", omsheet.openmoleLogo),
div(
omsheet.centerPage(),
div(
omsheet.connectionBlock,
setPasswordForm
)
)
)
div(
cls := "screen-center",
img(src := "img/openmole_light.png"),
setPasswordForm
)
}
......@@ -124,14 +124,6 @@ package object client {
top := "0"
)
lazy val openmoleLogo = Seq(
fixedPosition,
width := "600",
top := "-30",
zIndex := "-1",
right := "calc(50% - 250px)"
)
lazy val displayOff = Seq(
display := "none"
)
......@@ -234,12 +226,12 @@ package object client {
cursor.pointer
)
lazy val connectionBlock = Seq(
display := "inline-block",
textAlign := "right",
float := "right",
marginRight := "15"
)
// lazy val connectionBlock = Seq(
// display := "inline-block",
// textAlign := "right",
// float := "right",
// marginRight := "15"
// )
lazy val textVersion = Seq(
color := "grey",
......@@ -465,11 +457,11 @@ package object client {
def executionState(state: ExecutionInfo) = Seq(
state match {
case _: ExecutionInfo.Failed color := "#CC3A36"
case _: ExecutionInfo.Running color := "yellow"
case _: ExecutionInfo.Failed color := "#CC3A36"
case _: ExecutionInfo.Running color := "yellow"
case _: ExecutionInfo.Finished color := "#a6bf26"
case _: ExecutionInfo.Canceled color := "orange"
case _ color := "#fff"
case _ color := "#fff"
},
fontWeight := "bold"
)
......@@ -477,7 +469,7 @@ package object client {
lazy val rowLayout = Seq(
display := "table",
tableLayout := "fixed"
//borderSpacing := 5
//borderSpacing := 5
)
lazy val columnLayout = Seq(
......@@ -551,11 +543,13 @@ package object client {
)
def centerPage(topPosition: String = "45%") = Seq(
position := "fixed",
top := topPosition,
left := "50%",
minWidth := "250",
// svg.transform := "translate (-50%,-50%)"
//cf screen-center css rule
backgroundColor := "red",
// position := "fixed",
// top := topPosition,
// left := "50%",
// minWidth := "250",
// svg.transform := "translate (-50%,-50%)"
)
lazy val relativeCenter = Seq(
......
......@@ -551,7 +551,7 @@ padding-bottom: 90px;
}
.app-container {
background: pink;
background: #3f3d56;
flex-grow: 1;
display: flex;
......@@ -563,6 +563,13 @@ padding-bottom: 90px;
height:100%;
}
.nav-container {
display: flex;
flex-direction: row;
width: 100%;
background-color : "#3f3d56";
font-size : "20";
}
.main-container {
background: #3F51B5;
......@@ -660,3 +667,20 @@ padding-bottom: 90px;
padding-left: 400px;
}
.screen-center {
overflow: hidden;
position: absolute;
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
justify-content: center; /*centers items on the line (the x-axis by default)*/
align-items: center; /*centers items on the cross-axis (y by default)*/
}
.connection-form {
display:flex;
flex-direction: column;
align-items: flex-end;
width:600px;
}
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment