codecombat · Bryukh · Mar 31, 2025 · Mar 31, 2025 · Mar 31, 2025 · Apr 1, 2025
diff --git a/app/styles/common/common.sass b/app/styles/common/common.sass
@@ -223,27 +223,27 @@ kbd
     width: 60px
     height: 60px
 
-.star
+.achievements-star
   display: inline-block
   background: transparent url(/images/achievements/star.png) no-repeat center
   background-size: contain
   width: 80px
   height: 80px
   margin: 0px 2px
 
-  &.star-20
+  &.achievements-star-20
     width: 20px
     height: 20px
 
-  &.star-30
+  &.achievements-star-30
     width: 30px
     height: 30px
 
-  &.star-40
+  &.achievements-star-40
     width: 40px
     height: 40px
 
-  &.star-50
+  &.achievements-star-50
     width: 50px
     height: 50px
 .popover

diff --git a/app/styles/play/campaign-view.sass b/app/styles/play/campaign-view.sass
@@ -194,7 +194,7 @@ $gameControlMargin: 30px
         width: 170%
         left: -35%
 
-      img.star
+      img.level-star
         width: 100%
         bottom: 4%
         position: absolute
@@ -925,24 +925,26 @@ $gameControlMargin: 30px
     top: 10px
     right: 30px
     text-align: right
-    font-size: 24px
+    font-size: 26px
     color: white
     text-shadow: 0px 2px 1px black, 0px -2px 1px black, -2px 0px 1px black, 2px 0px 1px black
-    height: 33px
-    line-height: 33px
+    height: 40px
+    line-height: 40px
 
-
     .stats-row
       margin-bottom: 10px
       margin-top: 10px
 
     .user-status-line
       position: relative
+      display: flex
+      align-items: center
+      justify-content: flex-end
 
       .btn.btn-illustrated
         margin-left: 10px
         min-width: 90px
-        height: 33px
+        height: 40px
         color: white
 
         option
@@ -953,18 +955,24 @@ $gameControlMargin: 30px
         margin-right: 10px
 
       .gem, .player-hero-icon
-        position: absolute
-        top: 1px
+        position: relative
+        top: auto
 
       #gems-count
-        margin-left: 40px
+        margin-left: 5px
+        display: inline-flex
+        align-items: center
 
       .player-level
         margin-left: 5px
+        display: inline-flex
+        align-items: center
 
       .player-name
-        margin-left: 45px
+        margin-left: 5px
         margin-right: 10px
+        display: inline-flex
+        align-items: center
 
       a
         color: white
@@ -981,15 +989,9 @@ $gameControlMargin: 30px
         display: inline-block
         width: 30px
         height: 30px
-        margin: 0px 2px
-
-      .level-indicator
-        margin-left: 15px
-        color: white
-        display: inline-block
-        margin: 0 2px
-
-      .player-hero-icon
+        margin: 0px 4px
+        transform: scale(1.33)  // Scale up by 1.33 to get from 30px to ~40px
+        transform-origin: center center
         margin-left: 10px
         background-position: (-4 * $spriteSheetSize) 0
 
@@ -1009,8 +1011,13 @@ $gameControlMargin: 30px
           background-position: (-11 * $spriteSheetSize) 0
         &.sorcerer
           background-position: (-12 * $spriteSheetSize) 0
-
-
+
+      .level-indicator
+        margin-left: 15px
+        color: white
+        display: inline-block
+        margin: 0 2px
+
 
   .campaign-control-button
     position: absolute
@@ -1691,7 +1698,7 @@ body[lang^="en"] #campaign-view .user-status-catalyst .user-status-line .languag
 
 .utility-controls-catalyst
   position: absolute
-  left: 20px
+  right: 20px
   bottom: 20px
   z-index: 10
   display: flex

diff --git a/app/templates/play/campaign-view.pug b/app/templates/play/campaign-view.pug
@@ -142,7 +142,7 @@ if showGameDevAlert
             img.hero-portrait(src="/file/db/thang.type/" + level.unlocksHero + "/portrait.png")
           a(href=level.type == 'hero' ? '#' : level.disabled ? "/play" : "/play/" + (level.levelPath || 'level') + "/" + level.slug, disabled=level.disabled, data-level-slug=level.slug, data-level-path=level.levelPath || 'level', data-level-name=level.name)
           if levelStatus === 'complete'
-            img.star(src="/images/pages/play/star.png")
+            img.level-star(src="/images/pages/play/star.png")
           if editorMode
             - var kindKey = ((level.kind && level.kind[0]) || "").toUpperCase();
             //if kindKey
@@ -549,9 +549,8 @@ if showGameDevAlert
             span.gem.gem-30
             span#gems-count.spr= me.gems()
           if view.shouldShow('level')
-            .rtl-allowed
-              span.star.star-30
-              span.player-level.spr= me.level()
+            span.achievements-star.achievements-star-30
+            span.player-level.spr= me.level()
           if me.get('anonymous')
             button.btn.btn-illustrated.login-button.btn-warning(data-i18n="login.log_in")
             button.btn.btn-illustrated.signup-button.btn-danger(data-i18n="signup.sign_up")
@@ -568,11 +567,11 @@ if showGameDevAlert
               span.m7-off(data-i18n="play.beta_levels_turn_off")
 
     .utility-controls-catalyst.header-font.picoctf-hide
+      select.language-dropdown.btn.btn-inverse#language-button(data-i18n="[title]play_level.language", title="Languages")
       button.btn.btn-lg.btn-inverse.picoctf-hide#volume-button(data-i18n="[title]play.adjust_volume", title="Adjust volume")
         .glyphicon.glyphicon-volume-off
         .glyphicon.glyphicon-volume-down
         .glyphicon.glyphicon-volume-up
-      select.language-dropdown.btn.btn-inverse#language-button(data-i18n="[title]play_level.language", title="Languages")
   else
     .user-status.header-font.picoctf-hide
       .user-status-line

diff --git a/app/views/play/CampaignView.js b/app/views/play/CampaignView.js
@@ -1997,6 +1997,7 @@ class CampaignView extends RootView {
     if (application.getHocCampaign()) { return false }
     if (me.isInHourOfCode()) { return false }
     if (userUtils.isInLibraryNetwork() || userUtils.libraryName()) { return false }
+    if (this.isCatalyst) { return false }
     const latest = window.serverConfig.latestAnnouncement
     const myLatest = me.get('lastAnnouncementSeen')
     if (typeof latest !== 'number') { return }
@@ -2174,7 +2175,9 @@ class CampaignView extends RootView {
     }
 
     if (what === 'anonymous-classroom-signup') {
-      return me.isAnonymous() && (me.level() < 8) && me.promptForClassroomSignup() && !this.editorMode && this.terrain !== 'junior' && !storage.load('hid-anonymous-classroom-signup-dialog')
+      return me.isAnonymous() && !this.isCatalyst &&
+        (me.level() < 8) && me.promptForClassroomSignup() &&
+        !this.editorMode && this.terrain !== 'junior' && !storage.load('hid-anonymous-classroom-signup-dialog')
     }
 
     if (what === 'amazon-campaign') {