chore: resolved conflicts

pateljannat · pateljannat · commit e57503664cdc · 2024-06-19T17:02:22.000+05:30
diff --git a/wiki/public/js/render_wiki.js b/wiki/public/js/render_wiki.js
@@ -100,7 +100,7 @@ window.RenderWiki = class RenderWiki extends Wiki {
         this.set_nav_buttons();
         this.set_toc();
         this.set_last_updated_date();
-        //this.scrolltotop();
+        this.scrolltotop();
         this.set_add_item();
         this.add_trash_icon();
         this.set_empty_ul();
diff --git a/wiki/public/scss/wiki.scss b/wiki/public/scss/wiki.scss
@@ -839,6 +839,10 @@ h6:hover .feather-link {
 	}
 }
 
+.dropdown-toggle.wiki-options::after {
+	display: none;
+}
+
 .wiki-options {
 	width: 2rem;
 	height: 2rem;
@@ -849,10 +853,6 @@ h6:hover .feather-link {
 		width: 2rem;
 	}
 
-	.dropdown-toggle.wiki-options::after {
-		display: none;
-	}
-
 	.dropdown-menu {
 		min-width: 7.5rem;
 	}

Original file line number	Diff line number	Diff line change
`@@ -839,6 +839,10 @@ h6:hover .feather-link {`
`839`	`839`	`}`
`840`	`840`	`}`
`841`	`841`
	`842`	`+.dropdown-toggle.wiki-options::after {`
	`843`	`+ display: none;`
	`844`	`+}`
	`845`	`+`
`842`	`846`	`.wiki-options {`
`843`	`847`	`width: 2rem;`
`844`	`848`	`height: 2rem;`
`@@ -849,10 +853,6 @@ h6:hover .feather-link {`
`849`	`853`	`width: 2rem;`
`850`	`854`	`}`
`851`	`855`
`852`		`- .dropdown-toggle.wiki-options::after {`
`853`		`- display: none;`
`854`		`- }`
`855`		`-`
`856`	`856`	`.dropdown-menu {`
`857`	`857`	`min-width: 7.5rem;`
`858`	`858`	`}`