diff --git a/files/assets/css/admin/badges.css b/files/assets/css/admin/badges.css new file mode 100644 index 0000000000..366c0ccc5a --- /dev/null +++ b/files/assets/css/admin/badges.css @@ -0,0 +1,6 @@ +@media (max-width: 767.98px) { + table { + display: inline-block; + overflow: auto; + } +} diff --git a/files/assets/css/main.css b/files/assets/css/main.css index 156d41538f..c88c355e31 100644 --- a/files/assets/css/main.css +++ b/files/assets/css/main.css @@ -6484,45 +6484,6 @@ body > .container { padding-right: 20px !important; } -@media (max-width: 767.98px) { - table { - display: inline-block; - overflow: auto; - } -} - -.shop-tabs { - padding-top: 50px; -} - -@media (max-width: 768px) { - #shop-banner { - width: 80%; - } - .shop-tabs { - padding-top: 30px; - } -} - -.shop-tab { - display: inline-flex; - max-width: 46.6%; - letter-spacing: 3px; - border-radius: 0; -} - -.shop-tab.active { - background-color: var(--primary) !important; - pointer-events: none !important; - cursor: default !important; -} - -.star1 circle {r: 0.5;} -.star2 circle {r: 0.75;} -.star3 circle {r: 1.0;} -.star4 circle {r: 1.2;} -.star5 circle {r: 1.5;} - .emoji2 { /*background: None!important;*/ width:60px; @@ -6583,3 +6544,23 @@ body > .container { display: inline-block; } } + +@media (min-width: 1000px) { + #logo-WPD { + width: 100px; + margin-left: 0.5rem !important; + } +} + +@media (min-width: 380px) { + #logo-rDrama { + width: 100px; + margin-left: 0.5rem !important; + } +} + +@media (max-width: 768px) { + #livecommit { + font-size: 0.8rem; + } +} diff --git a/files/assets/fistmas/css/banner.css b/files/assets/fistmas/css/banner.css index fd8cd37610..3588019bbc 100644 --- a/files/assets/fistmas/css/banner.css +++ b/files/assets/fistmas/css/banner.css @@ -22,6 +22,12 @@ .star4 {animation-duration: 6s;} .star5 {animation-duration: 8s;} +.star1 circle {r: 0.5;} +.star2 circle {r: 0.75;} +.star3 circle {r: 1.0;} +.star4 circle {r: 1.2;} +.star5 circle {r: 1.5;} + @media (max-width: 767.98px) { .star { animation: none; diff --git a/files/templates/admin/badge_admin.html b/files/templates/admin/badge_admin.html index 144d013612..1f63d2fd61 100644 --- a/files/templates/admin/badge_admin.html +++ b/files/templates/admin/badge_admin.html @@ -3,6 +3,8 @@ {% block pagetype %}message{% endblock %} {% block content %} + + {% if error %}{{macros.alert(error, true)}}{% endif %} {% if msg %}{{macros.alert(msg, false)}}{% endif %} diff --git a/files/templates/header.html b/files/templates/header.html index d08f9fd51b..be4dfaa6a7 100644 --- a/files/templates/header.html +++ b/files/templates/header.html @@ -70,9 +70,9 @@
{% if SITE_NAME == 'WPD' and IS_FISTMAS() %} - + logo {% else %} - + logo {% endif %}
diff --git a/files/templates/home.html b/files/templates/home.html index 528e632314..522843c4a5 100644 --- a/files/templates/home.html +++ b/files/templates/home.html @@ -177,7 +177,7 @@ {% endif %} -
+
Live Commit: {{gitref[0]}}