Merge branch 'master' into newmc

diff --git a/css/custom.css b/css/custom.css
index 93acc89a5bda0cd9f440dfbc12e91ac85b1c68fe..73affe610e019a885dc9642812c5e948f7b54a4c 100644 (file)
--- a/css/custom.css
+++ b/css/custom.css
@@ -11,30 +11,6 @@ footer{
        color: #777;
 }
 
-#logo {
-       margin: 5em auto 2em;
-       display: block;
-}
-
-h1 {
-       font-size: 2em !important;
-}
-
-.txtstuff {
-    overflow: hidden;
-}
-
-.hiddendiv {
-    display: none;
-    white-space: pre-wrap;
-    word-wrap: break-word;
-    overflow-wrap: break-word; /* future version of deprecated 'word-wrap' */
-}
-
-a.thumbnail {
-       border: none !important;
-}
-
 div.container-fluid {
        padding: 0 15px;
 }
@@ -55,11 +31,6 @@ a.dropdown-toggle{
        table-layout: fixed;
 }
 
-#clock{
-       float: right;
-       margin-right: 1em;
-}
-
 nav li{
        padding: 5px;
 }

diff --git a/css/themes/cyborg.css b/css/themes/cyborg.css
index ac0b0a5724d99c08edcfde1f6f49403bc4a96088..e02b2dbbb2e6b64579a972cc89111aa4444ceac5 100644 (file)
--- a/css/themes/cyborg.css
+++ b/css/themes/cyborg.css
@@ -456,27 +456,27 @@ h6 .small,
 }
 h1,
 .h1 {
-  font-size: 56px;
+  font-size: 36px;
 }
 h2,
 .h2 {
-  font-size: 45px;
+  font-size: 30px;
 }
 h3,
 .h3 {
-  font-size: 34px;
+  font-size: 24px;
 }
 h4,
 .h4 {
-  font-size: 24px;
+  font-size: 18px;
 }
 h5,
 .h5 {
-  font-size: 20px;
+  font-size: 14px;
 }
 h6,
 .h6 {
-  font-size: 16px;
+  font-size: 12px;
 }
 p {
   margin: 0 0 10px;

diff --git a/js/90-autoresize.js b/js/90-autoresize.js
deleted file mode 100644 (file)
index e40ef4e..0000000
--- a/js/90-autoresize.js
+++ /dev/null
@@ -1,20 +0,0 @@
-(function(){
-       'use strict';
-
-       $( document ).ready(function() {
-               var hiddenDiv = $(document.createElement('div'));
-
-               hiddenDiv.addClass('hiddendiv common');
-
-               $('body').append(hiddenDiv);
-
-               $("textarea.autoresize").on('keyup', function () {
-                       var content = $(this).val();
-
-                       content = content.replace(/\n/g, '<br>');
-                       hiddenDiv.html(content + '<br class="lbr">');
-
-                       $(this).css('height', hiddenDiv.height()+23);
-               });
-       });
-})();