diff --git a/README.md b/README.md index c68b7bd39..23f8caaab 100644 --- a/README.md +++ b/README.md @@ -314,3 +314,7 @@ Channel](https://discord.com/invite/daEjfhw). ## License [Apache License v2](http://www.apache.org/licenses/LICENSE-2.0.html) + +# Additonal licence + +The etherpad-lite [logo](https://thenounproject.com/icon/16723/) in this repo – created by [Parallel Digital Studio](https://thenounproject.com/Parallel) – is licenced under [CC BY 3.0 Unported](https://creativecommons.org/licenses/by/3.0/). diff --git a/src/static/css/pad/icons.css b/src/static/css/pad/icons.css index eb1016dca..32a996db8 100644 --- a/src/static/css/pad/icons.css +++ b/src/static/css/pad/icons.css @@ -24,9 +24,6 @@ font-style: normal; font-variant: normal; text-rendering: auto; - display: flex; - justify-content: center; - align-items: center; } .buttonicon:before, [class^="buttonicon-"]:before, [class*=" buttonicon-"]:before { @@ -37,6 +34,9 @@ font-size: 15px; display: inline-block; text-decoration: inherit; + width: 1.25em; + margin: 0; + text-align: center; /* For safety - reset parent styles, that can break glyph codes*/ font-variant: normal; diff --git a/src/static/css/pad/popup.css b/src/static/css/pad/popup.css index e9d9ff65d..ba038f942 100644 --- a/src/static/css/pad/popup.css +++ b/src/static/css/pad/popup.css @@ -54,7 +54,7 @@ } /* Mobile devices */ -@media only screen and (max-width: 800px) { +@media only screen and (max-width: 992px) { .popup { border-radius: 0; top: 1rem; diff --git a/src/static/skins/colibris/favicon.ico b/src/static/skins/colibris/favicon.ico new file mode 100644 index 000000000..56b438738 Binary files /dev/null and b/src/static/skins/colibris/favicon.ico differ diff --git a/src/static/skins/colibris/index.css b/src/static/skins/colibris/index.css index 5129c43a8..22dd53be9 100644 --- a/src/static/skins/colibris/index.css +++ b/src/static/skins/colibris/index.css @@ -4,8 +4,12 @@ form { border: none } +form { + display: none; +} + body { - background: url(images/fond.jpg) center center no-repeat fixed #fff; + background: #ffffff; font-family: Quicksand, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; font-size: 16px; line-height: 1.42857143; @@ -19,7 +23,7 @@ body { #wrapper { border-top: none; margin-top: 0; - padding: 0; + padding: 10px; background: 0 0; box-shadow: none } @@ -31,17 +35,19 @@ input { #inner { background: transparent; padding-top: 0; - width: 350px; - max-width: 350px; + width: 100%; + max-width: 400px; + margin-bottom: 50px; text-align: center; color:#FFF; } #label { text-shadow: none; - color: #FFF; + color: #333; font-weight: normal; text-align: center; + display: none; } #button { @@ -51,8 +57,8 @@ input { text-shadow: none; font-size: 23px; line-height: 1.8; - color: #64d29b; - background: #586a69; + color: #fff; + background: #00a3d3; border-radius: 3px; box-shadow: none; height: 53px; @@ -64,9 +70,8 @@ input { button[type=submit] { border-top-right-radius: 3px; border-bottom-right-radius: 3px; - left: 305px; - color: #64d29b; - background: #586a69; + color: #fff; + background: #00a3d3; border: none; top: 0; opacity: 1; @@ -76,13 +81,35 @@ button[type=submit] { #button:hover, button[type=submit]:hover { cursor: pointer; - background: #4a5d5c; - color: #64d29b; + background: #0082a8; + color: #fff; } #padname { height: 38px; - max-width: 350px; + width: calc(100% - 45px); padding: 0 12px; position: relative; -} \ No newline at end of file +} + +svg#kits_logo { + width: 250px; + height: auto; + margin-bottom: 50px; + max-width: 100%; +} + +#kits_welcome_wrapper{ + padding-bottom: 30px; +} + +#kits_welcome_text { + color:black !important; + text-align: center; +} + +@media only screen and (max-width: 420px) { + svg#kits_logo { + margin-top: 30px; + } +} diff --git a/src/static/skins/colibris/pad.css b/src/static/skins/colibris/pad.css index a12bec385..53832158d 100644 --- a/src/static/skins/colibris/pad.css +++ b/src/static/skins/colibris/pad.css @@ -34,7 +34,7 @@ --super-dark-color: #485365; /*#374256;*/ --dark-color: #576273; /*#4d5d77*/ - --primary-color: #64d29b; + --primary-color: #00a3d3; --middle-color: #d2d2d2; /* kind of grey, use for border for examples */ --light-color: #f2f3f4; /*#f9f9f9;*/ diff --git a/src/static/skins/colibris/src/components/popup.css b/src/static/skins/colibris/src/components/popup.css index 0fe67e50f..8d51e19f8 100644 --- a/src/static/skins/colibris/src/components/popup.css +++ b/src/static/skins/colibris/src/components/popup.css @@ -54,7 +54,7 @@ } } -@media (max-width: 800px) { +@media (max-width: 992px) { .popup-content { padding: 1rem; box-shadow: 0 0 0 1px rgba(99, 114, 130, 0.16), -1px 1px 16px 3px rgba(27, 39, 51, 0.12); diff --git a/src/templates/index.html b/src/templates/index.html index 4d08312f9..7feb08870 100644 --- a/src/templates/index.html +++ b/src/templates/index.html @@ -17,9 +17,6 @@ +
+ <% e.begin_block("indexCustomScripts"); %>