Upgrade to version 12

kcaran · Aug 29, 2020 · 4e56670 · 4e56670
1 parent 84fac5a
commit 4e56670
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 4 deletions.
diff --git a/css/shaarli.css b/css/shaarli.css
@@ -4472,6 +4472,16 @@ pre {
       padding: 4px 12px; }
     .linklist-item-infos-controls-item a:hover {
       border: 1px solid #0b5ea6; }
+  .linklist-item-infos-controls-item a.fold-button {
+    border: none; }
+    .linklist-item-infos-controls-item a.fold-button .fa {
+      display: inline-block;
+      border-radius: 3px;
+      border: 1px solid #fff;
+      font-size: 24px;
+      padding: 4px 12px; }
+      .linklist-item-infos-controls-item a.fold-button .fa:hover {
+        border: 1px solid #0b5ea6; }
 
 .linkqrcode a:before {
   font-family: "ForkAwesome";

diff --git a/js/markdown.min.js b/js/markdown.min.js
diff --git a/js/shaarli.min.js b/js/shaarli.min.js
diff --git a/js/thumbnails_update.min.js b/js/thumbnails_update.min.js
diff --git a/linklist.html b/linklist.html
@@ -148,7 +148,7 @@ <h2 class="pure-u-3-5">
 			</div>
 
                <span class="linklist-item-infos-controls-item">
-                 <a href="#" aria-label="{$strFold}" title="{$strFold}" class="fold-button fa fa-chevron-up" aria-hidden="true"></a>
+                 <a href="#" aria-label="{$strFold}" title="{$strFold}" class="fold-button" aria-hidden="true"><i class="fa fa-chevron-up" aria-hidden="true"></i></a>
                </span>
 		</div>
 		</div>

diff --git a/page.header.html b/page.header.html
@@ -201,4 +201,4 @@
   </div>
 {/if}
 
-  <div class="clear"></div>
+  <div class="clear">KAC {$links_per_page}</div>
diff --git a/sass/shaarli.scss b/sass/shaarli.scss
@@ -936,6 +936,22 @@ pre {
 			border: 1px solid $blue;
 		}
 	}
+
+	// This is needed for the js to work correctly
+	a.fold-button {
+		border: none;
+		.fa {
+			display: inline-block;
+			border-radius: 3px;
+			border: 1px solid $white;
+			font-size: 24px;
+			padding: 4px 12px;
+
+			&:hover {
+				border: 1px solid $blue;
+			}
+		}
+	}
 }
 
 // Replace QR Code png with icon
-Original file line number
+Diff line change
@@ Expand Up / @@ -148,7 +148,7 @@ <h2 class="pure-u-3-5"> @@
     			</div>
                    <span class="linklist-item-infos-controls-item">
-                     <a href="#" aria-label="{$strFold}" title="{$strFold}" class="fold-button fa fa-chevron-up" aria-hidden="true"></a>
+                     <a href="#" aria-label="{$strFold}" title="{$strFold}" class="fold-button" aria-hidden="true"><i class="fa fa-chevron-up" aria-hidden="true"></i></a>
                    </span>
     		</div>
     		</div>
@@ Expand Down @@