team and research update

ging · Jun 24, 2024 · fec82e9 · fec82e9
1 parent 445cba9
commit fec82e9
Show file tree

Hide file tree

Showing 10 changed files with 146 additions and 138 deletions.
diff --git a/app/globals.sass b/app/globals.sass
@@ -12,8 +12,8 @@
 @tailwind components
 @tailwind utilities
 
-* 
-  @apply border-2 border-red-300 
+// * 
+//   @apply border-2 border-red-300 
 
 
 :root 

diff --git a/app/research/page.js b/app/research/page.js
@@ -106,7 +106,7 @@ export default function Research() {
               papersFiltered instanceof Array ? papersFiltered.length : 0
             }
           />
-          <div className="papers block lg:grid lg:grid-cols-2">
+          <div className="papers">
             {papersFiltered
               .slice(0, papersToShow)
               .map(({ date, doi, author, title, journal }, ind) => {

diff --git a/app/sass/lib/_mixins.sass b/app/sass/lib/_mixins.sass
@@ -25,7 +25,11 @@
     -moz-box-shadow: 0px 10px 13px -7px rgba(0,0,0,0.08)
     box-shadow: 0px 10px 13px -7px rgba(0,0,0,0.08)
 
-
+//IMAGES
+@mixin img_cover()
+    @apply overflow-hidden
+    img
+        @apply h-full w-full object-cover
 
 
 //NAVEGACIÓN

diff --git a/app/sass/lib/_type.sass b/app/sass/lib/_type.sass
@@ -28,6 +28,7 @@ $regular: 400
 $semibold: 600
 $bold: 800
 
+
 h1
     @media screen and (min-width: 150px)
         font-family: $main_font, sans-serif

diff --git a/app/sass/partials/_publications.sass b/app/sass/partials/_publications.sass
@@ -3,10 +3,10 @@
 // Correcciones: código duplicado para select e input. 
 // Recomendado hacer mixins
 
+
 @media (min-width: 150px)  
     .research 
-        display: flex
-        flex-direction: column
+        @apply flex flex-col
         flex: 1
 
         .filters
@@ -15,11 +15,6 @@
             display: flex
             flex-direction: column
             align-items: start
-
-        // .main
-        //     min-height: calc(100vh - 150px)
-        //     padding: 5rem 0 0 0
-        //     background-color: red
 
         .research_results
             display: flex
@@ -60,7 +55,7 @@
         border-bottom: solid 1px $ca-blue-200
         justify-content: left
         .filter
-            margin: 0 0.8rem 0.8rem 0
+            margin: 0 0.5rem
             width: 100%
             text-align: right
             label
@@ -77,22 +72,17 @@
 
 
     .papers 
-        display: flex
-
-        padding-left: 0px
+        @apply grid md:grid-cols-2 gap-8
         .paper 
-
+            @apply h-full
             display: flex
             flex-direction: column
             border-bottom: $gray-300 1px solid
 
 
         .paper_main 
-            display: flex
-            flex-direction: column
-            justify-content: space-between
-
-
+            @apply flex flex-col justify-between
+
             .paper_date
                 display: flex
                 border-width: 4px
@@ -104,10 +94,10 @@
                 // border-right: 3px solid red 
                 -webkit-border-image: -webkit-gradient(linear, 0% 0%, 0% 0%, from(rgba(152, 206, 9, 1)), to(rgba(152, 206, 0, 0))) 1 100%
 
-                p
+                .year
                     // @include border-tag
-                    @apply text-gray-400 px-4
-                    font-size: 2.5rem
+                    @apply text-gray-400 pl-4
+                    font-size: 1.25rem
                     font-weight: 400
                     display: block
 
@@ -118,6 +108,7 @@
                 @apply text-ffdGreen-300
 
             .paper_subtitle 
+                font-family: 16px
                 //padding-bottom: $spacing_md
                 @apply text-gray-100
                 margin-bottom: $spacing_xsm
@@ -126,19 +117,7 @@
 
         .paper_link      
             @include icon-button-right
-            @include link-button
-            // @include button    
-            // display: flex
-            // flex-direction: row
-            // //gap: $spacing_xsm
-            // align-content: center
-            // justify-content: left
-            // margin-top: 0.6rem        
-            // a 
-                
-            //     display: flex
-            //     align-content: center
-                //margin-top: $spacing_sm          
+            @include link-button       
 
 
 
@@ -149,7 +128,7 @@
             display: flex
             flex-wrap: wrap
             gap: 4px
-            padding-bottom: $spacing_lg
+            padding-bottom: $spacing_sm
             border-bottom: solid 1px $ca-blue-100
             justify-content: space-between
             .filter
@@ -167,21 +146,15 @@
                 input
                     width: 20.6rem
     .papers 
-        display: flex
-        flex-direction: column
-        gap: $spacing_xsm
-        display: flex
-        flex-direction: column
         padding: $spacing_sm 0 $spacing_md 0
         .paper 
-            padding: $spacing_sm 0 $spacing_md 0
+            @apply h-full
+            padding-bottom: $spacing_md
 
 
 
         .paper_main 
-            display: flex
-            flex-direction: row
-            justify-content: left
+            @apply flex flex-row justify-start
             gap: $spacing_md
             .paper_date
                 display: flex
@@ -195,7 +168,7 @@
                 -webkit-border-image: -webkit-gradient(linear, 0% 0%, 0% 0%, from(rgba(152, 206, 9, 1)), to(rgba(152, 206, 0, 0))) 1 100%
 
                 h5
-                    @include border-tag
+                    // @include border-tag
                 
             .paper_content 
                 width:100%
@@ -212,8 +185,8 @@
                 font-weight: 600
 
         .button_container
-            display: flex
-            justify-content: end
+            @apply mt-4 
+            @apply flex justify-end
             .paper_link
                 @include button
                 display: flex
@@ -294,4 +267,6 @@
                             font-weight: 600
                             margin: 0
                         a
-                            display: flex
+                            display: flex
+.papers
+
diff --git a/app/sass/partials/_team.sass b/app/sass/partials/_team.sass
@@ -1,8 +1,5 @@
-// *
-//     border: 1px solid salmon
- 
 .team
-    @apply text-white
+    @apply text-white font-main-font
     main
         .teammates
             @apply sm:grid grid-cols-2 lg:grid-cols-3 gap-8 justify-between
@@ -23,9 +20,8 @@
 
                 .mate_img 
                     @apply max-h-[230px]
-                    @apply overflow-hidden
-                    img
-                        @apply h-full w-full object-cover
+                    @Iinclude img_cover()
+
 
                 .mate_info
                     @apply py-8 px-6

diff --git a/app/team/page.js b/app/team/page.js
@@ -60,9 +60,9 @@ export default function Team(props) {
                 </div>
               ) : null} */}
               {/* mail */}
-              <div className="mate_email">
+              {/* <div className="mate_email">
                 <small>{email}</small>
-              </div>
+              </div> */}
               {/* description */}
               <div className="mate_coordination">
                 <span className={position === "Coordinator" ? "coordinator" : ""}>