Merge pull request #727 from rufener/fix_preavis_table

Fix table column sizes in preavis
sitn · Mar 21, 2023 · 8dd5358 · 8dd5358
2 parents a81d482 + 66ff123
commit 8dd5358
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/front/src/components/PreavisExternes/PreavisExternesEdit.vue b/front/src/components/PreavisExternes/PreavisExternesEdit.vue
@@ -1,4 +1,4 @@
-<style src="./preavisExternesEdit.css" scoped></style>
+<style src="./preavisExternesEdit.css"></style>
 <template src="./preavisExternesEdit.html"></template>
 
 

diff --git a/front/src/components/PreavisExternes/preavisExternesEdit.css b/front/src/components/PreavisExternes/preavisExternesEdit.css
@@ -1,45 +1,45 @@
-.preavisEdit {
+#preavisEdit.preavisEdit {
     width: 90%;
     margin: auto;
     height: calc(100vh - 80px);
 }
 
-.preavisHeader {
+#preavisEdit .preavisHeader {
     position: fixed;
     margin-top: 0px;
     width: calc(90% - 33px);
 }
 
-.preavisContent {
+#preavisEdit .preavisContent {
     position: relative; top: 70px;
 }
 
-.title {
+#preavisEdit .title {
     font-weight: bold;
-    width: 180px;
+    width: 180px !important;
 }
 
-.content {
-    width: 400px;
+#preavisEdit .content {
+    width: 400px !important;
 }
 
-.tg {
+#preavisEdit .tg {
     border-collapse: collapse;
     border-spacing: 0;
 }
 
-.tg tr {
+#preavisEdit .tg tr {
     height: 45px;
 }
 
-.tg td {
+#preavisEdit .tg td {
     border-color: black;
     border-style: solid;
     border-width: 1px;
     padding: 10px;
 }
 
-#mapContainer {
+#preavisEdit #mapContainer {
     width: 95%;
     margin: auto;
     height: 370px; /*valeur empirique*/
@@ -49,11 +49,11 @@
     border-style: solid;
 }
 
-.highlightDecision {
+#preavisEdit .highlightDecision {
     background-color: yellow;
 }
 
-.dragdrop {
+#preavisEdit .dragdrop {
     height: 200px; /*valeur empirique*/
     border: 1px;
     border-radius: 10px;
@@ -64,7 +64,7 @@
     background-color: lightgray;
 }
 
-.map{
+#preavisEdit .map{
     width: 100%;
     height: 100%;
     float: left;

diff --git a/front/src/components/PreavisExternes/preavisExternesEditComments.html b/front/src/components/PreavisExternes/preavisExternesEditComments.html
@@ -21,10 +21,10 @@
                         <md-table-empty-state md-label="Aucun commentaire"></md-table-empty-state>
 
                         <md-table-row slot="md-table-row" slot-scope="{ item }">
-                            <md-table-cell style="width: 15%;" md-label="Date">{{ item.date }}</md-table-cell>
-                            <md-table-cell style="width: 20%;" md-label="Operateur">{{ item.operateur }}</md-table-cell>
-                            <md-table-cell style="width: 60%;" md-label="Message">{{ item.message }}</md-table-cell>
-                            <md-table-cell style="width: 5%;"><md-button v-if="item.unread === true" class="md-primary md-elevation-2" title="Marquer comme lu" style="min-width: fit-content;" @click="remark_read(item)"><b>Lu</b></md-button></md-table-cell>
+                            <md-table-cell style="width: 15% !important;" md-label="Date">{{ item.date }}</md-table-cell>
+                            <md-table-cell style="width: 20% !important;" md-label="Operateur">{{ item.operateur }}</md-table-cell>
+                            <md-table-cell style="width: 60% !important;" md-label="Message">{{ item.message }}</md-table-cell>
+                            <md-table-cell style="width: 5% !important;"><md-button v-if="item.unread === true" class="md-primary md-elevation-2" title="Marquer comme lu" style="min-width: fit-content;" @click="remark_read(item)"><b>Lu</b></md-button></md-table-cell>
                         </md-table-row>
                     </md-table>
                 </div>