UI: Blender-id web-assets v2 upgrade #93590

Merged
Márton Lente merged 28 commits from ui/web-assets-v2-upgrade into main 2024-08-22 14:41:33 +02:00
8 changed files with 24 additions and 24 deletions
Showing only changes of commit fa2c2d0c29 - Show all commits

View File

@ -23,7 +23,7 @@ body.is-auth-page
height: unset height: unset
&:focus &:focus
border-color: var(--color-primary) border-color: var(--color-accent)
.blender-logo .blender-logo
filter: drop-shadow(2px 0px 15px rgba(0,0,0,0.15)) filter: drop-shadow(2px 0px 15px rgba(0,0,0,0.15))
@ -40,7 +40,7 @@ body.is-auth-page
right: 0 right: 0
z-index: 1 z-index: 1
.page-background .page-bg
background-size: cover background-size: cover
bottom: 0 bottom: 0
left: 0 left: 0

View File

@ -19,7 +19,7 @@ $font-path: '/static/assets/fonts'
&-links // .bid-links &-links // .bid-links
display: flex display: flex
font-size: var(--font-size-small) font-size: var(--fs-sm)
justify-content: space-between justify-content: space-between
+list-unstyled +list-unstyled
margin: var(--spacer) 0 0 0 margin: var(--spacer) 0 0 0
@ -55,7 +55,7 @@ $font-path: '/static/assets/fonts'
.app-url .app-url
color: var(--text-color-secondary) color: var(--text-color-secondary)
font-size: var(--font-size-small) font-size: var(--fs-sm)
.app-icon .app-icon
border-radius: var(--border-radius) border-radius: var(--border-radius)
@ -96,25 +96,25 @@ $font-path: '/static/assets/fonts'
margin: 0 auto 15px margin: 0 auto 15px
position: relative position: relative
img, .authorize__app-image_placeholder img, .authorize__app-img_placeholder
height: 100px height: 100px
width: 100px width: 100px
.authorize__app-image .authorize__app-img
background: #7596d9 background: #7596d9
margin-right: 20px margin-right: 20px
.authorize__app-image_placeholder .authorize__app-img_placeholder
background: #7596d9 background: #7596d9
margin-right: 20px margin-right: 20px
.authorize__app-image_placeholder_icon .authorize__app-img_placeholder_icon
position: absolute position: absolute
top: 20px top: 20px
left: 33px left: 33px
color: white color: white
.authorize__person-image .authorize__person-img
background: #afd876 background: #afd876
.authorize__pictogram__arrow .authorize__pictogram__arrow
@ -220,15 +220,15 @@ ul.errorlist
h2 i h2 i
color: var(--color-warning) color: var(--color-warning)
.badge-image .badge-img
--badge-image-size: 64px --badge-img-size: 64px
margin: 0 margin: 0
transition: opacity var(--transition-speed-slow) transition: opacity var(--transition-speed-slow)
img img
border-radius: var(--border-radius-lg) border-radius: var(--border-radius-lg)
height: var(--badge-image-size) height: var(--badge-img-size)
width: var(--badge-image-size) width: var(--badge-img-size)
.badge-info .badge-info
flex: 1 flex: 1
@ -247,7 +247,7 @@ ul.badges
+list-unstyled +list-unstyled
margin: 0 margin: 0
.badge-image .badge-img
+margin(3, right) +margin(3, right)
li li
@ -261,7 +261,7 @@ ul.badges
color: var(--text-color-secondary) color: var(--text-color-secondary)
opacity: .5 opacity: .5
.badge-image .badge-img
opacity: .3 opacity: .3
.toggle-group .toggle-group
@ -290,12 +290,12 @@ ul.badges
left: -50% left: -50%
.toggle .toggle
background-color: var(--color-primary) background-color: var(--color-accent)
border-radius: 999em border-radius: 999em
padding: 0 padding: 0
&:hover &:hover
background-color: var(--color-primary) background-color: var(--color-accent)
&.btn &.btn
min-height: 30px !important min-height: 30px !important

View File

@ -1,5 +1,5 @@
<div class="col"> <div class="col">
<div class="oauth-background mb-4" style="background-image:url({{ oauth_app.background.url }})"> <div class="oauth-bg mb-4" style="background-image:url({{ oauth_app.background.url }})">
<div class="row"> <div class="row">
<div class="col-md-7 col-sm-6 mx-auto d-flex flex-column align-items-sm-start align-items-center justify-content-center text-center text-sm-left mb-sm-0"> <div class="col-md-7 col-sm-6 mx-auto d-flex flex-column align-items-sm-start align-items-center justify-content-center text-center text-sm-left mb-sm-0">

View File

@ -1,5 +1,5 @@
<div class="bid-cta"> <div class="bid-cta">
<div><p><i class="icon mr-2"> <div><p><i class="icon me-2">
<svg class="bi" xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" viewBox="0 0 16 16"> <svg class="bi" xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" viewBox="0 0 16 16">
<path d="M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14zm0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16z"></path> <path d="M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14zm0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16z"></path>
<path d="M8.93 6.588l-2.29.287-.082.38.45.083c.294.07.352.176.288.469l-.738 3.468c-.194.897.105 1.319.808 1.319.545 0 1.178-.252 1.465-.598l.088-.416c-.2.176-.492.246-.686.246-.275 0-.375-.193-.304-.533L8.93 6.588zM9 4.5a1 1 0 1 1-2 0 1 1 0 0 1 2 0z"></path> <path d="M8.93 6.588l-2.29.287-.082.38.45.083c.294.07.352.176.288.469l-.738 3.468c-.194.897.105 1.319.808 1.319.545 0 1.178-.252 1.465-.598l.088-.416c-.2.176-.492.246-.686.246-.275 0-.375-.193-.304-.533L8.93 6.588zM9 4.5a1 1 0 1 1-2 0 1 1 0 0 1 2 0z"></path>

View File

@ -39,7 +39,7 @@ Profile
{% endif %} {% endif %}
<div class="bid-user"> <div class="bid-user">
<a class="mr-4" href="{% url 'bid_main:profile' %}">{% avatar %}</a> <a class="me-4" href="{% url 'bid_main:profile' %}">{% avatar %}</a>
<div class="bid-user-info"> <div class="bid-user-info">
{% if not user.full_name %} {% if not user.full_name %}

View File

@ -54,7 +54,7 @@
<span>Cancel</span> <span>Cancel</span>
</a> </a>
{% if user.is_staff %} {% if user.is_staff %}
<a class="mr-auto btn btn-admin" href="{% url 'admin:bid_main_user_change' user.id %}"> <a class="me-auto btn btn-admin" href="{% url 'admin:bid_main_user_change' user.id %}">
Admin Admin
</a> </a>
{% endif %} {% endif %}

View File

@ -1,7 +1,7 @@
<li class="badge js-badge {{ badge.name }}{% if badge.id in private_badge_ids %} is-private{% endif %}" title="{{ badge.description }}"> <li class="badge js-badge {{ badge.name }}{% if badge.id in private_badge_ids %} is-private{% endif %}" title="{{ badge.description }}">
{% if badge.badge_img %} {% if badge.badge_img %}
<figure class="badge-image"> <figure class="badge-img">
<img src="{{ badge.badge_img.url }}" alt="{{ badge.description }}" width="{{ badge.badge_img_width }}" height="{{ badge.badge_img_height }}"/> <img src="{{ badge.badge_img.url }}" alt="{{ badge.description }}" width="{{ badge.badge_img_width }}" height="{{ badge.badge_img_height }}"/>
</figure> </figure>
{% endif %} {% endif %}

View File

@ -2,11 +2,11 @@
<label class="{{ label_class }}" for="{{ field.id_for_label }}"> <label class="{{ label_class }}" for="{{ field.id_for_label }}">
<span>{% firstof label field.label %}</span> <span>{% firstof label field.label %}</span>
{% if field.help_text and field.errors %} {% if field.help_text and field.errors %}
<span class="small subtitle ml-2">{{ field.help_text }}</span> <span class="small subtitle ms-2">{{ field.help_text }}</span>
{% endif %} {% endif %}
{% if field.field.required %} {% if field.field.required %}
<span class="form-required-indicator ml-1">*</span> <span class="form-required-indicator ms-1">*</span>
{% endif %} {% endif %}
</label> </label>
{% endspaceless %} {% endspaceless %}