From 57899ed1678a9b0f6147c10d4160f5169fc28b10 Mon Sep 17 00:00:00 2001 From: Poornima Mohan Date: Wed, 5 Oct 2016 11:42:45 -0700 Subject: [PATCH 1/3] Changes to the Footer content --- .../components/flows.component.less | 52 +++++++++++++++++++ .../app/flogo.flows/components/flows.tpl.html | 12 ++++- 2 files changed, 63 insertions(+), 1 deletion(-) diff --git a/src/client/app/flogo.flows/components/flows.component.less b/src/client/app/flogo.flows/components/flows.component.less index 5004ccbfb..bcab6e500 100644 --- a/src/client/app/flogo.flows/components/flows.component.less +++ b/src/client/app/flogo.flows/components/flows.component.less @@ -247,6 +247,58 @@ flogo-flows-import:hover{ height: 200px; } +.flogo-flows-footerContainer{ + width: 100%; + height:60px; + border:1px solid #b6b6b6; + position: absolute; + bottom:0px; + padding:0px 70px; +} + +.flogo-flows-footerText{ + height:20px; + padding:3px 0px; +} + +.flogo-flows-copyright{ + width: 550.5px; + height: 20px; + font-family: "Source Sans Pro"; + font-size: 14px; + font-weight: normal; + font-style: normal; + font-stretch: normal; + line-height: 1.43; + letter-spacing: 0.8px; + color: #727272; + display: inline-block; +} + +.flogo-flows-footerPrivacy{ + float:right; + width:422px; + height: 20px; + margin:10px 0px; + padding:2px 0px; +} + +.flogo-flows-privacyText{ + font-family: "Source Sans Pro"; + font-size: 14px; + font-weight: normal; + font-style: normal; + font-stretch: normal; + line-height: 1.43; + letter-spacing: 0.8px; + text-align: right; + color: #727272; + border-right:1px solid #727272; + text-decoration: none; + cursor: pointer; + padding:2px 17px 2px 0px; +} + /* .flogo-calc-cards-container-width(1); .flogo-calc-cards-container-width(2); diff --git a/src/client/app/flogo.flows/components/flows.tpl.html b/src/client/app/flogo.flows/components/flows.tpl.html index 5f049b1d7..d7da58df1 100644 --- a/src/client/app/flogo.flows/components/flows.tpl.html +++ b/src/client/app/flogo.flows/components/flows.tpl.html @@ -4,7 +4,7 @@

Welcome back

We have got some new instructional videos you can check out that can help you.

- Featured Video tutorial + Featured Video tutorial
@@ -40,4 +40,14 @@

My Flows

+ \ No newline at end of file From a30452b39332cbf4ac691495da209c7388fe9ee8 Mon Sep 17 00:00:00 2001 From: Poornima Mohan Date: Wed, 5 Oct 2016 14:29:08 -0700 Subject: [PATCH 2/3] Changes to footer privacy styles --- .../components/flows.component.less | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/client/app/flogo.flows/components/flows.component.less b/src/client/app/flogo.flows/components/flows.component.less index bcab6e500..cc0224fd4 100644 --- a/src/client/app/flogo.flows/components/flows.component.less +++ b/src/client/app/flogo.flows/components/flows.component.less @@ -275,14 +275,6 @@ flogo-flows-import:hover{ display: inline-block; } -.flogo-flows-footerPrivacy{ - float:right; - width:422px; - height: 20px; - margin:10px 0px; - padding:2px 0px; -} - .flogo-flows-privacyText{ font-family: "Source Sans Pro"; font-size: 14px; @@ -296,9 +288,19 @@ flogo-flows-import:hover{ border-right:1px solid #727272; text-decoration: none; cursor: pointer; - padding:2px 17px 2px 0px; + padding:2px 17px; +} + +.flogo-flows-footerPrivacy{ + float:right; + width:422px; + height: 20px; + margin:10px 0px; + padding:2px 0px; } + + /* .flogo-calc-cards-container-width(1); .flogo-calc-cards-container-width(2); From 4e9ec0910cd539ba74b709e6e9fe3e8b7b09faf7 Mon Sep 17 00:00:00 2001 From: Poornima Mohan Date: Thu, 6 Oct 2016 11:35:24 -0700 Subject: [PATCH 3/3] Included the links to the Privacy, Terms of Use and Trademarks --- .../app/flogo.flows/components/flows.component.less | 3 +++ .../app/flogo.flows/components/flows.tpl.html | 13 +++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/client/app/flogo.flows/components/flows.component.less b/src/client/app/flogo.flows/components/flows.component.less index cc0224fd4..012481897 100644 --- a/src/client/app/flogo.flows/components/flows.component.less +++ b/src/client/app/flogo.flows/components/flows.component.less @@ -3,6 +3,7 @@ flex: auto; margin:0 auto; width:100%; + position: relative; } @card-bg-color: #ffffff; @@ -26,6 +27,7 @@ .flogo-flows-container{ background: #eeeded; width: 100%; + margin-bottom: 60px; } flogo-flows-import:hover{ @@ -254,6 +256,7 @@ flogo-flows-import:hover{ position: absolute; bottom:0px; padding:0px 70px; + background: #eeeded; } .flogo-flows-footerText{ diff --git a/src/client/app/flogo.flows/components/flows.tpl.html b/src/client/app/flogo.flows/components/flows.tpl.html index d7da58df1..12594dbe7 100644 --- a/src/client/app/flogo.flows/components/flows.tpl.html +++ b/src/client/app/flogo.flows/components/flows.tpl.html @@ -40,14 +40,15 @@

My Flows

- \ No newline at end of file