Andrew's git / newtab.git / diff
?
remove sites.js and tidy up HTML
authorAndrew Lorimer <andrew@lorimer.id.au>
Sun, 18 Aug 2019 11:09:24 +0000 (21:09 +1000)
committerAndrew Lorimer <andrew@lorimer.id.au>
Sun, 18 Aug 2019 11:09:24 +0000 (21:09 +1000)
main.js patch | blob | history
newtab.html patch | blob | history
sites.js [deleted file] patch | blob | history
style.css patch | blob | history
diff --git a/main.js b/main.js
index 01b293c0d282dd4c8d36ee30acf1d3688afa4fe0..34f7cdc94057ea8dbc4efb8f65c4006621f395dd 100644 (file)
--- a/main.js
+++ b/main.js
@@ -129,7 +129,6 @@ function genItem(ul, nme, url) {
   var img = document.createElement("img");
   img.className = "icon";
   img.src = "https://www.google.com/s2/favicons?domain=" + url;
   var img = document.createElement("img");
   img.className = "icon";
   img.src = "https://www.google.com/s2/favicons?domain=" + url;
-  img.alt = extractDomain(url, 1);
 
   var link = document.createElement("a");
   link.className = "item";
 
   var link = document.createElement("a");
   link.className = "item";
diff --git a/newtab.html b/newtab.html
index 247621dcbf5056f4b617ab8d440012faf90b7342..b572bfeeadb0f01bcae18e0f63eaf8e66dd1878c 100644 (file)
--- a/newtab.html
+++ b/newtab.html
@@ -1,21 +1,26 @@
 <!DOCTYPE html>
 <html>
 <!DOCTYPE html>
 <html>
+
   <head>
   <head>
+
     <title>New Tab</title>
     <meta charset="utf-8">
     <meta name=viewport content="width=device-width, initial-scale=1">
 
     <title>New Tab</title>
     <meta charset="utf-8">
     <meta name=viewport content="width=device-width, initial-scale=1">
 
-    <script type="text/javascript" src="sites.js" ></script>
     <script type="text/javascript" src="main.js" ></script>
     <script type="text/javascript" src="main.js" ></script>
-    <script type="text/javascript" src="colours.js" ></script>
     <script type="text/javascript" src="sortable.min.js"></script>
 
     <link rel="stylesheet" href="style.css">
     <script type="text/javascript" src="sortable.min.js"></script>
 
     <link rel="stylesheet" href="style.css">
+
   </head>
 
   <body>
   </head>
 
   <body>
+
     <span id="edit">e</span>
     <span id="addcol">+</span>
     <span id="edit">e</span>
     <span id="addcol">+</span>
-    <div class="favorites" id="links" style="min-height: 283px;"></div>
+
+    <div id="links"></div>
+    
   </body>
   </body>
+
 </html>
 </html>
diff --git a/sites.js b/sites.js
deleted file mode 100644 (file)
index 1598be3..0000000
--- a/sites.js
+++ /dev/null
@@ -1,49 +0,0 @@
-function extractDomain(url, y) {
-  var domain;
-
-  //remove protocol
-  if (url.indexOf("://") > -1) {
-    domain = url.split('/')[2];
-  }
-  else {
-    domain = url.split('/')[0];
-  }
-
-  //remove port number
-  domain = domain.split(':')[0];
-
-  if (y == 1) {
-
-    d = splitHostname(domain);
-
-    if (d.subdomain != "www" && d.subdomain != "") {
-      return d.subdomain;
-    }
-    else {
-      return d.domain;
-    }
-
-  } else {
-    return domain;
-  }
-}
-
-function addhttp(url) {
-  if (!/^(f|ht)tps?:\/\//i.test(url)) {
-    url = "http://" + url;
-  }
-  return url;
-}
-
-function splitHostname(h) {
-  var result = {};
-  var urlParts = new RegExp('([a-z\-0-9]{2,63})\.([a-z\.]{2,5})$').exec(h);
-  if (urlParts == null) {
-    console.log("Error formatting link " + h);
-    return "";
-  }
-  result.domain = urlParts[1];
-  result.type = urlParts[2];
-  result.subdomain = h.replace(result.domain + '.' + result.type, '').slice(0, -1);;
-  return result;
-}
diff --git a/style.css b/style.css
index 8e6fb747db7b305107c45b8ec5db80f4e760be3e..f36e5d6c966119c50e7e4b32512c9ae4399d9da9 100644 (file)
--- a/style.css
+++ b/style.css
@@ -22,7 +22,7 @@ body {
   justify-content: center;
 }
 
   justify-content: center;
 }
 
-.favorites {
+#links {
   display: flex;
   flex-direction: row;
   display: -webkit-flex;
   display: flex;
   flex-direction: row;
   display: -webkit-flex;