浏览代码

🐛 fix(merge): restaurar alteracoes perdidas no conflito com branch da Ester

Durante o merge com a branch da colega Ester, as alteracoes dela foram
acidentalmente removidas. Este commit restaura as mudancas perdidas:
- main.css: variaveis CSS de cor e fonte (:root)
- index.vue: adicionar componente FaqSection na pagina principal
joykepler 3 天之前
父节点
当前提交
cc93f7b16f
共有 2 个文件被更改,包括 6 次插入0 次删除
  1. 5 0
      app/assets/main.css
  2. 1 0
      app/pages/index.vue

+ 5 - 0
app/assets/main.css

@@ -20,3 +20,8 @@ body {
 .text-gradient {
   @apply bg-radial from-white to-[#E3FA6D] bg-clip-text text-transparent;
 }
+
+:root {
+  --color-primary: #8AAB10;
+  --font-inter: 'Inter', sans-serif;
+}

+ 1 - 0
app/pages/index.vue

@@ -6,5 +6,6 @@
   <SectionRoadMap />
   <SectionExecutors />
   <SectionGallery />
+  <FaqSection />
   <!-- <SectionDestinations /> -->
 </template>