Improve i18n organization and minor changes

* Improve i18n organization

* Remove the possibility to configure social and contact form
shortcodes per page

* Other minor changes

4 files changed, 26 insertions, 20 deletions

diff --git a/assets/js/postpone.js b/assets/js/postpone.js
index 529f928..71f591e 100644
--- a/assets/js/postpone.js
+++ b/assets/js/postpone.js
@@ -64,7 +64,7 @@ PALETTE.onchange = function () {
     
     executeSearch(searchQuery);
   } else {
-    info.innerHTML = '<p>{{ T "search_awaiting_search" }}</p>'
+    info.innerHTML = '<p>{{ T "searchAwaitingSearch" }}</p>'
   };
   
 
@@ -93,18 +93,18 @@ PALETTE.onchange = function () {
       // Reset info regarding the search
       info.innerHTML = '';
       
-      info.innerHTML = '<p>{{ T "search_results_for" }}: ' + searchQuery + '</p>';
+      info.innerHTML = '<p>{{ T "searchResultsFor" }}: ' + searchQuery + '</p>';
       
       if (result.length > 0) {
         if (result.length == 1) {
-          info.innerHTML += '<p>{{ T "search_one_page_found" }}.</p>'
+          info.innerHTML += '<p>{{ T "searchOnePageFound" }}.</p>'
         } else if (1 < result.length && result.length < limit + 1) {
-          info.innerHTML += '<p>' + result.length + ' {{ T "search_pages_found" }}.</p>'
+          info.innerHTML += '<p>' + result.length + ' {{ T "searchPagesFound" }}.</p>'
         } else {
-          info.innerHTML += '<p class=error>{{ T "search_too_many" }}</p>'
+          info.innerHTML += '<p class=error>{{ T "searchTooMany" }}</p>'
         }
       } else {
-        info.innerHTML += '<p class=error>{{ T "search_no_page_found" }}</p>'
+        info.innerHTML += '<p class=error>{{ T "searchNoPageFound" }}</p>'
       };
       
       if (0 < result.length && result.length < limit + 1) {
diff --git a/assets/scss/base/mixins.scss b/assets/scss/base/mixins.scss
index 9a0c83d..74bd4db 100644
--- a/assets/scss/base/mixins.scss
+++ b/assets/scss/base/mixins.scss
@@ -18,6 +18,11 @@
     1px 0 0 $color;
 }
 
+// Heading scaling
+@mixin heading-scaling($level) {
+  font-size: 1rem + $heading-scaling-factor * (6 - $level);
+}
+
 
 // Responsiveness
 @mixin respond-above($breakpoint) {
diff --git a/assets/scss/fonts/variables.scss b/assets/scss/fonts/variables.scss
index 2c95cac..f09b1d3 100644
--- a/assets/scss/fonts/variables.scss
+++ b/assets/scss/fonts/variables.scss
@@ -3,8 +3,8 @@ $heading-font:  'Oswald', sans-serif;
 $body-font:     'Open Sans', sans-serif;
 $code-font:     monospace;
 
-$font-size:         18px;
-$heading-scaling:   .25;
+$font-size:               18px;
+$heading-scaling-factor:  .25;
 
 $heading-weight:    700;
 $body-bold-weight:  700;
diff --git a/assets/scss/main.scss b/assets/scss/main.scss
index 0736063..49aa61a 100644
--- a/assets/scss/main.scss
+++ b/assets/scss/main.scss
@@ -265,7 +265,7 @@ ul {
 }

 

 

-// Heading 1

+// Main heading

 h1 {

   @include letterpress(var(--rlpress));

 }

@@ -319,7 +319,7 @@ article > header {
   h#{$i} {

     @extend %heading-base;

     

-    font-size: 1rem + $heading-scaling * (6 - $i);

+    @include heading-scaling($i);

   }

 }

 

@@ -332,6 +332,8 @@ main {
 

 code {

   font-family: $code-font;

+  

+  overflow-wrap: break-word;

 }

 

 

@@ -339,15 +341,14 @@ code {
 {{ if not (or (templates.Exists "partials/custom/site-title") (templates.Exists "partials/custom/site-title.html")) }}

   body > header {

     > a {

-      font-family: $heading-font;

-      font-size: 2.1rem;

-      font-weight: $heading-weight;

+      @extend %heading-base;

       

       transition:

         color $change-transition,

         opacity .2s ease-in-out,

         outline-color $change-transition;

       

+      @include heading-scaling(1);

       @include letterpress(var(--rlpress));

       

       display: inline-block;

@@ -902,11 +903,11 @@ video {
     border: 1px solid rgba(0,0,0,.3);

     border-radius: $border-radius;

 

-    font-family: $heading-font;

-    

     outline-offset: 2px;

     

     padding: 15px 30px 18.5px;

+    

+    @extend %heading-base;

 

     @include button-like;

     @include letterpress(var(--lpress));

@@ -1039,6 +1040,7 @@ input[type=submit] {
 

 button,

 input[type=color],

+input[type=submit],

 summary {

   cursor: pointer;

 }

@@ -1155,12 +1157,12 @@ summary {
 .label-form {

   margin-top: 1rem;

   

-  font-family: $heading-font;

   font-size: .9rem;

-  font-weight: $heading-weight;

   

   letter-spacing: .5px;

   text-transform: uppercase;

+  

+  @extend %heading-base;

 }

 

 .input-text {

@@ -1331,9 +1333,6 @@ summary {
   }

 

   input[type=submit] {

-    cursor: pointer;

-    

-    font-family: $heading-font;

     font-size: .75rem;

     text-transform: uppercase;

     letter-spacing: .05rem;

@@ -1349,6 +1348,8 @@ summary {
       color $change-transition,

       outline-color .2s ease-in-out,

       opacity .2s ease-in-out;

+    

+    @extend %heading-base;

 

     // HACK

     // Override Firefox unnecessary extra inner outline