From f3ebba1004e7d8270bfd41514f6b792d97c2425d Mon Sep 17 00:00:00 2001 From: Frederik Ring Date: Fri, 22 May 2020 17:51:28 +0200 Subject: [PATCH 1/5] add click to copy for demo commands --- homepage/theme/static/scripts/NOTICE | 24 +++++++++++++++++++ .../theme/static/scripts/click-to-copy.js | 3 +++ .../theme/static/scripts/clipboard.min.js | 7 ++++++ homepage/theme/templates/base.html | 2 +- homepage/theme/templates/trydemo.html | 4 ++-- 5 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 homepage/theme/static/scripts/NOTICE create mode 100644 homepage/theme/static/scripts/click-to-copy.js create mode 100644 homepage/theme/static/scripts/clipboard.min.js diff --git a/homepage/theme/static/scripts/NOTICE b/homepage/theme/static/scripts/NOTICE new file mode 100644 index 0000000..9105c3c --- /dev/null +++ b/homepage/theme/static/scripts/NOTICE @@ -0,0 +1,24 @@ +clipboard.js +Copyright (C) Zeno Rocha + +MIT License + +Copyright (c) Zeno Rocha + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/homepage/theme/static/scripts/click-to-copy.js b/homepage/theme/static/scripts/click-to-copy.js new file mode 100644 index 0000000..d1fec21 --- /dev/null +++ b/homepage/theme/static/scripts/click-to-copy.js @@ -0,0 +1,3 @@ +$(document).ready(function () { + var clipboard = new ClipboardJS('.js-click-to-copy') +}) diff --git a/homepage/theme/static/scripts/clipboard.min.js b/homepage/theme/static/scripts/clipboard.min.js new file mode 100644 index 0000000..1e6a96f --- /dev/null +++ b/homepage/theme/static/scripts/clipboard.min.js @@ -0,0 +1,7 @@ +/*! + * clipboard.js v2.0.6 + * https://clipboardjs.com/ + * + * Licensed MIT © Zeno Rocha + */ +!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define([],e):"object"==typeof exports?exports.ClipboardJS=e():t.ClipboardJS=e()}(this,function(){return o={},r.m=n=[function(t,e){t.exports=function(t){var e;if("SELECT"===t.nodeName)t.focus(),e=t.value;else if("INPUT"===t.nodeName||"TEXTAREA"===t.nodeName){var n=t.hasAttribute("readonly");n||t.setAttribute("readonly",""),t.select(),t.setSelectionRange(0,t.value.length),n||t.removeAttribute("readonly"),e=t.value}else{t.hasAttribute("contenteditable")&&t.focus();var o=window.getSelection(),r=document.createRange();r.selectNodeContents(t),o.removeAllRanges(),o.addRange(r),e=o.toString()}return e}},function(t,e){function n(){}n.prototype={on:function(t,e,n){var o=this.e||(this.e={});return(o[t]||(o[t]=[])).push({fn:e,ctx:n}),this},once:function(t,e,n){var o=this;function r(){o.off(t,r),e.apply(n,arguments)}return r._=e,this.on(t,r,n)},emit:function(t){for(var e=[].slice.call(arguments,1),n=((this.e||(this.e={}))[t]||[]).slice(),o=0,r=n.length;o {% block scripts %} - {% assets filters="rjsmin", output="scripts/packed.js", "scripts/jquery-3.4.1.min.js", "scripts/menu.js", "scripts/fade.js" %} + {% assets filters="rjsmin", output="scripts/packed.js", "scripts/jquery-3.4.1.min.js", "scripts/menu.js", "scripts/fade.js", "scripts/clipboard.min.js", "scripts/click-to-copy.js" %} {% endassets %} {% endblock %} diff --git a/homepage/theme/templates/trydemo.html b/homepage/theme/templates/trydemo.html index eebe083..7e10ab9 100644 --- a/homepage/theme/templates/trydemo.html +++ b/homepage/theme/templates/trydemo.html @@ -19,7 +19,7 @@

- + curl https://demo.offen.dev | bash
@@ -30,7 +30,7 @@

- + docker run --rm -it -p 9876:9876 offen/offen:latest demo -port 9876
From f37eb3a4bc34e53dd87308fb5ae2b43bd60fb48d Mon Sep 17 00:00:00 2001 From: Frederik Ring Date: Fri, 22 May 2020 20:50:00 +0200 Subject: [PATCH 2/5] use circle ci context for AWS credentials --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index adb824c..3531dd4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -43,6 +43,7 @@ workflows: build_deploy: jobs: - deploy: + context: AWS filters: branches: only: From 7adf8f71188165c0783bf224fb5bbbe86b777743 Mon Sep 17 00:00:00 2001 From: Frederik Ring Date: Sat, 23 May 2020 19:51:42 +0200 Subject: [PATCH 3/5] do not rebuild layers on changing args --- build/Dockerfile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index 05d982b..f0e0369 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -3,10 +3,6 @@ FROM nikolaik/python-nodejs:python3.7-nodejs12 ENV PATH "/root/.local/bin:$PATH" ENV NODE_PATH="/usr/lib/node_modules" -ARG siteurl -ENV SITEURL=$siteurl -ARG offenaccountid -ENV OFFEN_ACCOUNT_ID=$offenaccountid RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - RUN npm install -g postcss-cli@^6.1.3 autoprefixer@^9.7.0 svgo@^1.3.0 cssnano@^4.1.10 @@ -19,4 +15,10 @@ COPY ./homepage/requirements.txt /code/homepage/requirements.txt RUN pip install --user -r requirements.txt COPY ./homepage /code/homepage + +ARG siteurl +ENV SITEURL=$siteurl +ARG offenaccountid +ENV OFFEN_ACCOUNT_ID=$offenaccountid + RUN make publish && rm -rf output/theme/.webassets-cache From b3808c2173f2f3106aafcaafb1ba6571a1e5f19f Mon Sep 17 00:00:00 2001 From: Hendrik Niefeld Date: Sun, 24 May 2020 20:08:40 +0200 Subject: [PATCH 4/5] update table --- homepage/theme/static/css/fix.css | 34 ++++++++++++++---- .../theme/static/images/gfx-table-fade.png | Bin 0 -> 6308 bytes homepage/theme/templates/index.html | 20 +++++++---- 3 files changed, 40 insertions(+), 14 deletions(-) create mode 100644 homepage/theme/static/images/gfx-table-fade.png diff --git a/homepage/theme/static/css/fix.css b/homepage/theme/static/css/fix.css index aae8f8d..5e1d6e6 100644 --- a/homepage/theme/static/css/fix.css +++ b/homepage/theme/static/css/fix.css @@ -95,7 +95,8 @@ LAYOUT width: 27%; } .wx-table-b, -.wx-table-c { +.wx-table-c, +.wx-table-d { width: 16%; } .hx24 { @@ -124,7 +125,8 @@ LAYOUT .wx-table-b { width: 20%; } - .wx-table-c { + .wx-table-c, + .wx-table-d { width: 16%; } .hx-try-user { @@ -139,7 +141,8 @@ LAYOUT width: 100%; } .wx-table-b, - .wx-table-c { + .wx-table-c, + .wx-table-d { width: 25%; } .hx-compare-c, @@ -318,12 +321,29 @@ i { .inner-shaddow { box-shadow: inset 0px 0px 4px 0px rgba(0,0,0,0.75); } +/* Table */ + .bg-table { + display: none; + } +.hscroll { + padding: 2rem; +} @media only screen and (max-width: 45em) { + .bg-table { + display: inline-block; + top: 0; + right: 0; + z-index : 560; + } .hscroll { overflow-x: auto; } .hscroll table { - width: 46rem; + width: 48rem; + } + .wx-table-d { + width: 8rem; + padding-right: 4rem; } } @@ -395,10 +415,11 @@ STACKING IMAGES z-index : 550; } .bg-cta-pfeil { - top: -11rem; + top: -13rem; left: 66%; z-index : 570; } + @media only screen and (min-width: 30em) { .bg-feature-1 { left: calc(50% - 21rem); @@ -413,10 +434,9 @@ STACKING IMAGES .bg-metrics-bulb { top: 11rem; left: calc(100% - 30rem); - z-index : 550; } .bg-cta-pfeil { - top: -12rem; + top: -14rem; left: 72%; } } diff --git a/homepage/theme/static/images/gfx-table-fade.png b/homepage/theme/static/images/gfx-table-fade.png new file mode 100644 index 0000000000000000000000000000000000000000..6d8af731887728fca205840749e06b449b3baf38 GIT binary patch literal 6308 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
-
+
+ +
+
+ smile +
+
@@ -511,7 +517,7 @@ Google Analytics Matomo On-Premise Fathom - Offen + Offen @@ -531,7 +537,7 @@ - + @@ -555,7 +561,7 @@ - + @@ -579,7 +585,7 @@ - + @@ -603,7 +609,7 @@ - + @@ -627,7 +633,7 @@ - + From 83701298c3ce2b62e229c6fdf75109da833060a3 Mon Sep 17 00:00:00 2001 From: Hendrik Niefeld Date: Sun, 24 May 2020 20:17:15 +0200 Subject: [PATCH 5/5] update table --- homepage/theme/static/css/fix.css | 3 ++- homepage/theme/templates/index.html | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/homepage/theme/static/css/fix.css b/homepage/theme/static/css/fix.css index 5e1d6e6..40b02f3 100644 --- a/homepage/theme/static/css/fix.css +++ b/homepage/theme/static/css/fix.css @@ -337,9 +337,10 @@ i { } .hscroll { overflow-x: auto; + padding-left: 1.6rem; } .hscroll table { - width: 48rem; + width: 47rem; } .wx-table-d { width: 8rem; diff --git a/homepage/theme/templates/index.html b/homepage/theme/templates/index.html index 37fc491..10cb0fb 100644 --- a/homepage/theme/templates/index.html +++ b/homepage/theme/templates/index.html @@ -503,7 +503,7 @@
- smile + fade