Added MutationsTableComponent styling to sass files

GEWIS · Dec 24, 2023 · 2788c51 · 2788c51
1 parent 44f7cab
commit 2788c51
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 42 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/components/Mutations/MutationsTableComponent.vue b/src/components/Mutations/MutationsTableComponent.vue
@@ -135,30 +135,4 @@ async function getMutations(take: number, skip: number):
 </script>
 
 <style lang="scss" scoped>
-:deep(.p-datatable .p-datatable-thead > tr > th) {
-  background-color: #f8f8f8;
-  border-top: none;
-  text-transform: uppercase;
-  font-family: Lato, Arial, sans-serif !important;
-  font-size: 1rem;
-  padding: 0.375rem 0;
-  line-height: 1.5;
-}
-
-:deep(.p-datatable .p-datatable-tbody > tr) {
-  background-color: #f8f8f8;
-}
-
-:deep(.p-datatable .p-paginator) {
-  background-color: #f8f8f8;
-}
-
-:deep(.p-datatable .p-datatable-tbody > tr > td) {
-  border: none;
-  padding: 0.375rem 0;
-  font-size: 1rem;
-  font-family: Lato, Arial, sans-serif !important;
-}
-
-
 </style>
diff --git a/src/styles/primevue-base/components/data/_datatable.scss b/src/styles/primevue-base/components/data/_datatable.scss
@@ -36,6 +36,7 @@
         color: $tableHeaderCellTextColor;
         background: $tableHeaderCellBg;
         transition: $listItemTransition;
+        text-transform: uppercase;
     }
 
     .p-datatable-tfoot > tr > td {
@@ -84,7 +85,7 @@
             &:hover {
                 background: $tableHeaderCellHighlightHoverBg;
                 color: $tableHeaderCellHighlightTextColor;
-    
+
                 .p-sortable-column-icon {
                     color: $tableHeaderCellHighlightTextColor;
                 }
@@ -279,14 +280,14 @@
         .p-datatable-tbody {
             > tr:nth-child(even) {
                 background: $tableBodyRowEvenBg;
-    
+
                 &.p-highlight {
                     background: $highlightBg;
                     color: $highlightTextColor;
-    
+
                     .p-row-toggler {
                         color: $highlightTextColor;
-    
+
                         &:hover {
                             color: $highlightTextColor;
                         }

diff --git a/src/styles/themes/sudosos-light/_variables_light.scss b/src/styles/themes/sudosos-light/_variables_light.scss
@@ -480,7 +480,7 @@ $tableHeaderTextColor:$shade900 !default;
 $tableHeaderFontWeight:600 !default;
 $tableHeaderPadding:1rem 1rem !default;
 
-$tableHeaderCellPadding:1rem 1rem !default;
+$tableHeaderCellPadding:0.375rem 0 !default;
 $tableHeaderCellBg:$shade100 !default;
 $tableHeaderCellTextColor:$shade900 !default;
 $tableHeaderCellFontWeight:600 !default;
@@ -503,13 +503,13 @@ $tableBodyRowHoverBg:$shade200 !default;
 $tableBodyRowTextHoverColor:$shade900 !default;
 $tableBodyCellBorder:1px solid #dee2e6 !default;
 $tableBodyCellBorderWidth:1px 0 0 0 !default;
-$tableBodyCellPadding:1rem 1rem !default;
+$tableBodyCellPadding:0.375rem 0!default;
 
-$tableFooterCellPadding:1rem 1rem !default;
+$tableFooterCellPadding:0.375rem 0 !default;
 $tableFooterCellBg:$shade100 !default;
 $tableFooterCellTextColor:$shade900 !default;
 $tableFooterCellFontWeight:600 !default;
-$tableFooterCellBorder:1px solid #dee2e6 !default;
+$tableFooterCellBorder:none !default;
 $tableFooterCellBorderWidth:1px 0 1px 0 !default;
 $tableResizerHelperBg:$primaryColor !default;
 

diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
@@ -42,17 +42,9 @@ const getUserMutations = async (take: number, skip: number) :
 </script>
 
 <style scoped lang="scss">
-<<<<<<< HEAD
-<<<<<<< HEAD
 @import '../styles/BasePage.css';
 
 .balance-component {
   margin-right: 15px;
 }
-=======
-@import "../styles/BasePage.css";
->>>>>>> 8ca1d52 (Fixed HomeView.vue en App.vue to use primeflex)
-=======
-@import "../styles/BasePage.css";
->>>>>>> ebebcec39984fc34626b1045c9aa3a239b72b534
 </style>