revert unrelated changes

CuriousMagpie · Jul 25, 2024 · 93cf130 · 93cf130
1 parent b07a497
commit 93cf130
Show file tree

Hide file tree

Showing 4 changed files with 395 additions and 274 deletions.
diff --git a/Dockerfile-Dev b/Dockerfile-Dev
@@ -3,10 +3,12 @@ FROM node:20
 # Install global packages
 RUN npm install -g gulp-cli mocha
 
-# Copy package.json and package-lock.json into image, then install
-# dependencies.
-COPY . /usr/src/habitica
+# Copy package.json and package-lock.json into image
 WORKDIR /usr/src/habitica
+COPY ["package.json", "package-lock.json", "./"]
+# Copy the remaining source files in.
+COPY . /usr/src/habitica
+# Install dependencies
 RUN npm install
 RUN npm run postinstall
 RUN npm run client:build

diff --git a/website/client/src/components/header/menu.vue b/website/client/src/components/header/menu.vue
@@ -13,7 +13,7 @@
       type="dark"
     >
       <b-navbar-brand
-        class="brand pl-2"
+        class="brand"
         aria-label="Habitica"
       >
       <router-link to="/">
@@ -47,7 +47,7 @@
       <b-collapse
         id="menu_collapse"
         v-model="menuIsOpen"
-        class="collapse navbar-collapse pl-2"
+        class="collapse navbar-collapse"
       >
         <b-navbar-nav class="menu-list">
           <b-nav-item
@@ -342,22 +342,22 @@
             </div>
           </li>
         </b-navbar-nav>
-        <div class="currency-tray form-inline pl-6">
+        <div class="currency-tray form-inline">
           <div
             v-if="userHourglasses > 0"
             class="item-with-icon"
           >
             <div
               v-b-tooltip.hover.bottom="$t('mysticHourglassesTooltip')"
-              class="top-menu-icon svg-icon mr-1"
+              class="top-menu-icon svg-icon"
               v-html="icons.hourglasses"
             ></div>
             <span>{{ userHourglasses }}</span>
           </div>
           <div class="item-with-icon">
             <a
               v-b-tooltip.hover.bottom="$t('gems')"
-              class="top-menu-icon svg-icon gem mr-6"
+              class="top-menu-icon svg-icon gem"
               :aria-label="$t('gems')"
               href="#buy-gems"
               @click.prevent="showBuyGemsModal()"
@@ -368,14 +368,14 @@
           <div class="item-with-icon gold">
             <div
               v-b-tooltip.hover.bottom="$t('gold')"
-              class="top-menu-icon svg-icon gold"
+              class="top-menu-icon svg-icon"
               :aria-label="$t('gold')"
               v-html="icons.gold"
             ></div>
             <span>{{ Math.floor(user.stats.gp * 100) / 100 }}</span>
           </div>
         </div>
-        <div class="form-inline desktop-only margin-adj">
+        <div class="form-inline desktop-only">
           <a
             v-b-tooltip.hover.bottom="$t('sync')"
             class="item-with-icon"
@@ -391,7 +391,7 @@
             ></div>
           </a>
           <notification-menu class="item-with-icon" />
-          <user-dropdown class="item-with-icon mr-2" />
+          <user-dropdown class="item-with-icon" />
         </div>
       </b-collapse>
     </b-navbar>
@@ -653,7 +653,6 @@ body.modal-open #habitica-menu {
     font-size: 16px;
     font-weight: normal;
     white-space: nowrap;
-    margin-right:24px;
 
     span {
       font-weight: bold;
@@ -674,13 +673,19 @@ body.modal-open #habitica-menu {
       display: inline-block;
       width: 24px;
       height: 24px;
+      margin-right: 12px;
+      margin-left: 12px;
     }
   }
 
   a.item-with-icon:focus {
     outline: none;
   }
 
+  .menu-icon {
+    margin-left: 24px;
+  }
+
   @keyframes rotateGemColors {
     /* Gems are green by default, so we rotate through ROYGBIV starting with green. */
     20% {
@@ -708,8 +713,16 @@ body.modal-open #habitica-menu {
     }
   }
 
-  .gem, .gold {
-    margin-right: 8px;
+  .message-count {
+    background-color: $blue-50;
+    border-radius: 50%;
+    height: 20px;
+    width: 20px;
+    float: right;
+    color: $white;
+    text-align: center;
+    font-weight: bold;
+    font-size: 12px;
   }
 
   .message-count.top-count {
@@ -719,11 +732,6 @@ body.modal-open #habitica-menu {
     top: -0.5em;
     padding: .2em;
   }
-
-  .margin-adj {
-    margin-left: 24px;
-  }
-
 </style>
 
 <script>

diff --git a/website/client/src/components/header/messageCount.functional.vue b/website/client/src/components/header/messageCount.functional.vue
@@ -12,13 +12,13 @@
 .message-count {
   background-color: $red-50;
   border-radius: 50%;
+  height: 20px;
+  width: 20px;
+  float: right;
   color: $white;
+  text-align: center;
   font-weight: bold;
   font-size: 12px;
-  height: 20px;
-  left: 12px;
-  text-align: center;
-  width: 20px;
 
   svg {
     width: 12px;