From 96fe53a7b418a2571d055078716f786a1f3d8f6a Mon Sep 17 00:00:00 2001 From: philli-m <5871230+philli-m@users.noreply.github.com> Date: Tue, 11 Jul 2023 13:51:18 +0200 Subject: [PATCH] assets/fonts: add logo as icon //icons: set icon classname and style //button: add colour and hover styling --- adhocracy-plus/assets/fonts/holi_logo.ico | Bin 0 -> 204862 bytes adhocracy-plus/assets/fonts/holi_logo.svg | 3 + adhocracy-plus/assets/scss/_variables.scss | 3 +- .../assets/scss/components/_button.scss | 15 ++- adhocracy-plus/assets/scss/icons/style.css | 91 ++++++++++-------- .../socialaccount/snippets/provider_list.html | 40 ++++---- changelog/7430.md | 3 + 7 files changed, 97 insertions(+), 58 deletions(-) create mode 100644 adhocracy-plus/assets/fonts/holi_logo.ico create mode 100644 adhocracy-plus/assets/fonts/holi_logo.svg create mode 100644 changelog/7430.md diff --git a/adhocracy-plus/assets/fonts/holi_logo.ico b/adhocracy-plus/assets/fonts/holi_logo.ico new file mode 100644 index 0000000000000000000000000000000000000000..f35fedb8a442e4ff79e6b494f59c2e77fc1dbd9d GIT binary patch literal 204862 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 + + diff --git a/adhocracy-plus/assets/scss/_variables.scss b/adhocracy-plus/assets/scss/_variables.scss index b2b5b05e8d..bad3509e85 100644 --- a/adhocracy-plus/assets/scss/_variables.scss +++ b/adhocracy-plus/assets/scss/_variables.scss @@ -122,7 +122,8 @@ $idea-remark-color: #999 !default; $facebook: #3b5999 !default; $google: #dd4b39 !default; $twitter: #1da1f2 !default; -$github: #333; +$github: #333 !default; +$project-holi: #fdfd80 !default; // set bootstrap modal variables $modal-inner-padding: 1.5 * $spacer !default; diff --git a/adhocracy-plus/assets/scss/components/_button.scss b/adhocracy-plus/assets/scss/components/_button.scss index a1f771888d..3c7110ad3d 100644 --- a/adhocracy-plus/assets/scss/components/_button.scss +++ b/adhocracy-plus/assets/scss/components/_button.scss @@ -248,8 +248,17 @@ } } +.btn--facebook, +.btn--google, +.btn--twitter, +.btn--github, +.btn--project-holi { + width: 100%; +} + + .btn.btn--facebook { - @include button($facebook, $facebook, $print-black, 55%); + @include button($facebook, $facebook, $print-black, 50%); } .btn.btn--google { @@ -264,6 +273,10 @@ @include button($github, $github, $print-black, 70%); } +.btn.btn--project-holi { + @include button($project-holi, $print-black, $print-black, 17%); +} + .checkbox-btn { display: inline-block; position: relative; diff --git a/adhocracy-plus/assets/scss/icons/style.css b/adhocracy-plus/assets/scss/icons/style.css index c58adf8000..a1d56f0010 100644 --- a/adhocracy-plus/assets/scss/icons/style.css +++ b/adhocracy-plus/assets/scss/icons/style.css @@ -1,80 +1,95 @@ @font-face { - font-family: 'icomoon'; - src: url('../fonts/icomoon.eot?jd0zuw'); - src: url('../fonts/icomoon.eot?jd0zuw#iefix') format('embedded-opentype'), - url('../fonts/icomoon.ttf?jd0zuw') format('truetype'), - url('../fonts/icomoon.woff?jd0zuw') format('woff'), - url('../fonts/icomoon.svg?jd0zuw#icomoon') format('svg'); - font-weight: normal; - font-style: normal; + font-family: 'icomoon'; + src: url('../fonts/icomoon.eot?jd0zuw'); + src: url('../fonts/icomoon.eot?jd0zuw#iefix') format('embedded-opentype'), + url('../fonts/icomoon.ttf?jd0zuw') format('truetype'), + url('../fonts/icomoon.woff?jd0zuw') format('woff'), + url('../fonts/icomoon.svg?jd0zuw#icomoon') format('svg'); + font-weight: normal; + font-style: normal; } [class^="icon-"], [class*=" icon-"] { - /* use !important to prevent issues with browser extensions that change fonts */ - font-family: 'icomoon' !important; - speak: none; - font-style: normal; - font-weight: normal; - font-variant: normal; - text-transform: none; - line-height: 1; + /* use !important to prevent issues with browser extensions that change fonts */ + font-family: 'icomoon' !important; + speak: none; + font-style: normal; + font-weight: normal; + font-variant: normal; + text-transform: none; + line-height: 1; - /* Better Font Rendering =========== */ - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; + /* Better Font Rendering =========== */ + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; } .icon-answered:before { - content: "\e900"; - font-size: 0.9rem; + content: "\e900"; + font-size: 0.9rem; } + /* not used */ .icon-arrow-down:before { - content: "\e901"; + content: "\e901"; } + /* not used */ .icon-arrow-right:before { - content: "\e902"; + content: "\e902"; } + /* not used */ .icon-clear:before { - content: "\e903"; + content: "\e903"; } + .icon-in-list:before { - content: "\e904"; - font-size: 1.1rem; - vertical-align: bottom; + content: "\e904"; + font-size: 1.1rem; + vertical-align: bottom; } + .icon-like:before { - content: "\e905"; + content: "\e905"; } + /* not used */ .icon-list:before { - content: "\e906"; - font-size: 1.1rem; + content: "\e906"; + font-size: 1.1rem; } + .icon-push-in-list:before { - content: "\e907"; - font-size: 1.1rem; - vertical-align: bottom; + content: "\e907"; + font-size: 1.1rem; + vertical-align: bottom; } + /* not used */ .icon-screen-view:before { - content: "\e908"; + content: "\e908"; } + /* not used */ .icon-sort-list:before { - content: "\e909"; + content: "\e909"; } + /* not used */ .icon-talking-desired:before { - content: "\e90a"; + content: "\e90a"; } .fa-stack { - font-size: 0.5rem; + font-size: 0.5rem; } .fa-eye { - font-size: 1.05rem; + font-size: 1.05rem; +} + +.fa-project-holi { + content: url('../fonts/holi_logo.ico'); + height: 1rem; } diff --git a/adhocracy-plus/templates/socialaccount/snippets/provider_list.html b/adhocracy-plus/templates/socialaccount/snippets/provider_list.html index 27518721b3..37a7bde231 100644 --- a/adhocracy-plus/templates/socialaccount/snippets/provider_list.html +++ b/adhocracy-plus/templates/socialaccount/snippets/provider_list.html @@ -5,24 +5,28 @@ {% if socialaccount_providers %}

{% translate "Login with social media account" %}

- {% for provider in socialaccount_providers %} - {% if provider.id == "openid" %} - {% for brand in provider.get_brands %} -
- {{ brand.name }} +
+
+ {% for provider in socialaccount_providers %} + {% if provider.id == "openid" %} + {% for brand in provider.get_brands %} +
+ {{ brand.name }} +
+ {% endfor %} + {% endif %} +
+ + {% translate 'Login with ' %} {{ provider.name|capfirst }} + +
+ {% endfor %} +
- {% endfor %} - {% endif %} -
- - {% translate 'Login with ' %} {{ provider.name|capfirst }} - -
- {% endfor %}
{% endif %} diff --git a/changelog/7430.md b/changelog/7430.md new file mode 100644 index 0000000000..fa305aeeb8 --- /dev/null +++ b/changelog/7430.md @@ -0,0 +1,3 @@ +### Added + +- logo icon and styling for project-holi btn (!7430)