Merge branch 'master' of github.com:DecentralCardGame/frontend into 2…

…83-signup-cannot-be-clicked-when-authenticating-a-new-account

src/components/elements/AbilityComponent.vue

@@ -8,7 +8,7 @@
         v-for="(entry, index) in ability.interaction"
         id="interaction"
         :key="index"
-        class="text-[24px] flex flex-row justify-start items-center"
+        class="text-[16px] flex flex-row justify-start items-center"
       >
         <div
           id="pre"
@@ -66,15 +66,15 @@
         <div
           v-else
           id="btn.label"
-          class="m-2 py-2 px-4 text-[24px] text-normal uppercase bg-transparent hover:bg-white hover:bg-opacity-70 hover:text-[#D82027] border-2 border-gray-300 hover:cursor-pointer"
+          class="m-2 py-2 px-4 text-[16px] text-normal uppercase bg-transparent hover:bg-white hover:bg-opacity-70 hover:text-[#D82027] border-2 border-gray-300 hover:cursor-pointer"
           @click="showAbilityModal(ability, entry.btn)"
         >
           {{ entry.btn.label }}
         </div>
         {{ entry.post }}
       </div>
       <div
-        class="m-2 py-2 px-4 text-[24px] text-center border-2 border-gray-300 bg-transparent cursor-pointer hover:bg-black hover:text-white border-2 border-gray-300"
+        class="m-2 py-2 px-4 text-[16px] text-center border-2 border-gray-300 bg-transparent cursor-pointer hover:bg-black hover:text-white border-2 border-gray-300"
         @click="deleteAbility()"
       >
         X

src/components/elements/AboutProgressbar.vue

@@ -23,6 +23,6 @@ const elems: NavigationElement[] = [
   { routeName: "/about/roadmap", display: "Roadmap" },
   { routeName: "/about/team", display: "Team" },
   { routeName: "/about/tokens", display: "CC Tokens" },
-  { routeName: "/about/whitepaper", display: "Card Creator" },
+  { routeName: "/about/whitepaper", display: "Whitepaper" },
 ];
 </script>

src/components/elements/CCButton/BaseCCButton.vue

@@ -1,27 +1,8 @@
 <template>
   <div>
     <button
-      :class="[
-        'w-80',
-        'h-14',
-        'rounded',
-        'shadow-xl',
-        'shadow-black/25',
-        'text-center',
-        'text-lg',
-        'font-bold',
-        'font-[roboto]',
-        'uppercase',
-        getTextColor(type),
-        getButtonColor(type),
-        'active:bg-[#552026]',
-        'active:text-white',
-        'active:border-0',
-        'hover:text-black',
-        'hover:bg-white',
-        'hover:border-black',
-        'hover:border-4',
-      ]"
+      class="w-72 h-12 rounded shadow-xl shadow-black/25 text-center text-base font-bold font-[roboto] uppercase active:bg-[#552026] active:text-white active:border-0 hover:text-black hover:bg-white hover:border-black hover:border-4"
+      :class="[getTextColor(type), getButtonColor(type)]"
       @click="emit('click')"
     >
       <slot />

src/components/elements/Dropdown/Dropdown.vue

@@ -8,7 +8,7 @@
     ]"
     @click="toggleDropdown"
   >
-    <div class="p-2 flex">
+    <div class="p-1 px-3 flex">
       {{ displayButton() }}
       <img
         class="w-4 pr-1 rotate-180 my-auto"

src/components/elements/Teaser/FadeTeaserBig.vue

@@ -1,6 +1,6 @@
 <template>
   <FadeTeaser
-    class="h-[50rem] xl:h-[80rem]"
+    class="h-[55rem] xl:h-[80rem]"
     pic-class-left="left-[-15rem] md:left-[-10rem]"
     pic-class-right="right-[-15rem] md:right-[-10rem]"
   >

src/components/elements/Teaser/TeaserHeader.vue

@@ -1,12 +1,12 @@
 <template>
   <div class="flex flex-col text-center justify-center">
     <h2
-      class="text-6xl font-bold"
+      class="text-5xl font-bold"
       :class="headingClass"
     >
       <slot name="heading" />
     </h2>
-    <div class="text-black text-3xl pt-4">
+    <div class="text-black text-2xl pt-4">
       <slot name="content" />
     </div>
   </div>

src/components/modals/AbilityModal.vue

@@ -224,7 +224,6 @@ export default {
       };
       let valids = R.filter((ability) => abilityIsValid(ability), options);
 
-      console.log("valid keywords:", valids);
       return valids;
     },
     getIcon(option) {
@@ -371,10 +370,8 @@ export default {
       let atRules = R.curry(atPath)(this.cardRules.Card);
 
       let selection = filterSelection2(this.dialog.options, this.selected);
-      console.log(selection);
       let pathAtSelection = R.concat(this.dialog.rulesPath, [selection.index]);
       let objAtSelection = atRules(pathAtSelection);
-      console.log(this.cardRules.Card, selection.index, this.dialog.rulesPath);
       let interactionText = atPath(
         this.cardRules.Card,
         R.append(selection.index, this.dialog.rulesPath)
@@ -452,13 +449,11 @@ export default {
       let ability = R.assocPath(path, object, this.ability);
 
       if (updateKeywords) {
-        console.log("keywords before: ", this.ability.keywords);
 
         ability.keywords = ability.keywords
           ? R.concat(ability.keywords, R.keys(object))
           : R.keys(object);
 
-        console.log("keywords after: ", ability.keywords);
       }
 
       this.$emit("update:ability", ability);

src/components/partials/PageMenu.vue

@@ -1,11 +1,11 @@
 <template>
-  <div class="h-32 bg-black flex space-x-10 px-10">
+  <div class="h-24 bg-black flex space-x-10 px-10">
     <router-link
       class="my-auto"
       to="/"
     >
       <img
-        class="h-16 object-contain"
+        class="h-12 object-contain"
         :src="CCLogo"
         alt="CC logo"
       >
@@ -38,7 +38,8 @@
       'flex-row',
       'uppercase',
       'text-white',
-      'text-xl',
+      'text-lg',
+      'h-13',
       'font-bold',
       'max-md:flex-col',
       'max-md:' + (state.barShown ? 'visible' : 'hidden'),
@@ -47,7 +48,7 @@
     <router-link
       v-for="elem in elems"
       :to="elem.routeName"
-      class="px-10 py-5 hover:underline"
+      class="px-8 py-4 hover:underline"
       active-class="text-yellow-500"
     >
       {{ elem.display }}