diff --git a/comments.php b/comments.php
index 7412d43..a6e1c80 100755
--- a/comments.php
+++ b/comments.php
@@ -41,8 +41,10 @@
diff --git a/js/cs.js b/js/cs.js
index f915d93..4a6d0ad 100644
--- a/js/cs.js
+++ b/js/cs.js
@@ -23,12 +23,11 @@ jQuery(document).ready(function($) {
var ext = null
var flag = null
- if (href.charAt(0) != '#' && img == 0 ){
-
+ if ((href.charAt(0) != '#' || href.charAt(0) != '?') && img == 0 ){
+
var hrefExploded = href.split('/')
base = hrefExploded[2]
-
if (base != site) {
//console.log('external link detected, adding icon...')
// is external, and is not a named anchor tag
diff --git a/js/min/cs.min.js b/js/min/cs.min.js
index c15b93b..12d5b62 100644
--- a/js/min/cs.min.js
+++ b/js/min/cs.min.js
@@ -1 +1 @@
-jQuery(document).ready(function(a){function i(i){var t=a("");t.addClass("alert alert-danger accessibility-fail-msg"),t.width(i.width+"px");var l=a("
");l.addClass("glyphicon glyphicon-ban-circle");var n=a("");n.append(' This image needs a valid Alt tag. '),t.append(l).append(n),a(i).after(t)}var t=location.href,l=t.split("/"),n=l[2],s=["3g2","3gp","avi","doc","docx","dotx","gif","jpg","jpeg","m4a","mid","midi","mov","mp3","mp4","mpg","odt","ogg","ogv","pdf","png","ppt","pptx","xls","xlsx","wav","wmv","zip","vsd"];a("#page a").each(function(){var i=a(this).attr("href").toLowerCase(),t=a(this).children("img").length,l=null,e=null,p=null,d=null;if("#"!=i.charAt(0)&&0==t){var c=i.split("/");if(l=c[2],l!=n){var g='';a(this).addClass("external").prepend(g)}e=c[c.length-1]||"";var h=e.split(".");h[1]&&a.each(s,function(i,t){t==h[1]&&(d=a(''),p=h[1],d.append("."+p))}),null!=d&&a(this).append(d)}}),a("#page img").each(function(){alt=a(this).attr("alt"),alt?(alt=alt.toLowerCase(),(alt.indexOf(".jpg")>=0||alt.indexOf(".png")>=0||alt.indexOf(".gif")>=0)&&(a(this).addClass("accessibility-fail"),i(this))):(a(this).addClass("accessibility-fail"),i(this))}),a("#page table").each(function(){a(this).addClass("table")})});
\ No newline at end of file
+jQuery(document).ready(function(a){function i(i){var t=a("");t.addClass("alert alert-danger accessibility-fail-msg"),t.width(i.width+"px");var l=a("
");l.addClass("glyphicon glyphicon-ban-circle");var n=a("");n.append(' This image needs a valid Alt tag. '),t.append(l).append(n),a(i).after(t)}var t=location.href,l=t.split("/"),n=l[2],s=["3g2","3gp","avi","doc","docx","dotx","gif","jpg","jpeg","m4a","mid","midi","mov","mp3","mp4","mpg","odt","ogg","ogv","pdf","png","ppt","pptx","xls","xlsx","wav","wmv","zip","vsd"];a("#page a").each(function(){var i=a(this).attr("href").toLowerCase(),t=a(this).children("img").length,l=null,e=null,p=null,d=null;if(("#"!=i.charAt(0)||"?"!=i.charAt(0))&&0==t){var c=i.split("/");if(l=c[2],l!=n){var h='';a(this).addClass("external").prepend(h)}e=c[c.length-1]||"";var g=e.split(".");g[1]&&a.each(s,function(i,t){t==g[1]&&(d=a(''),p=g[1],d.append("."+p))}),null!=d&&a(this).append(d)}}),a("#page img").each(function(){alt=a(this).attr("alt"),alt?(alt=alt.toLowerCase(),(alt.indexOf(".jpg")>=0||alt.indexOf(".png")>=0||alt.indexOf(".gif")>=0)&&(a(this).addClass("accessibility-fail"),i(this))):(a(this).addClass("accessibility-fail"),i(this))}),a("#page table").each(function(){a(this).addClass("table")})});
\ No newline at end of file
diff --git a/style.css b/style.css
index 9a98de5..719206f 100755
--- a/style.css
+++ b/style.css
@@ -1,12 +1,6 @@
/*
Theme Name: Cornerstone
-<<<<<<< HEAD
-Theme URI: http://github.com/uconnwebdev/cornerstone
-Author: Andrew Bacon of the UConn Web Development Lab
-Author URI: http://andrewbacon.net
-=======
Author: UConn Web Development Lab
->>>>>>> FETCH_HEAD
Description: Parent theme for University of Connecticut
Version: 1
Text Domain: cs
@@ -70,6 +64,10 @@ Text Domain: cs
/* UConn Branding
--------------------------------------------------------------*/
+#uc-header {
+ border-bottom: 1px solid #fff;
+}
+
#uc-site-header {
padding-top: 30px;
}
@@ -233,11 +231,6 @@ img {
padding: 1em;
}
-.comments-area {
- background-color: white;
- padding: 1em;
-}
-
#footer {
margin: 1.5em 0;
}
@@ -328,6 +321,10 @@ code {
margin: 0 0 1.5em;
}
+.nav-next {
+ text-align: right;
+}
+
/*--------------------------------------------------------------
10.2 Asides
--------------------------------------------------------------*/
@@ -339,12 +336,22 @@ code {
/*--------------------------------------------------------------
10.3 Comments
--------------------------------------------------------------*/
-.comment-content a {
- word-wrap: break-word;
+.comment-list {
+ padding: 0;
+ list-style-type: none;
}
-.nav-next {
- text-align: right;
+.comment {
+ padding: 1em;
+ border-top: 1px solid #ccc;
+}
+
+.comment.thread-odd {
+ background-color: #f5f5f5;
+}
+
+.comment-content a {
+ word-wrap: break-word;
}
/*--------------------------------------------------------------
diff --git a/style.scss b/style.scss
index 25e9e1e..f601900 100644
--- a/style.scss
+++ b/style.scss
@@ -84,6 +84,9 @@ url('../../global/fonts/proximanova_semibold/ProximaNova-Sbold-webfont.ttf') for
/* UConn Branding
--------------------------------------------------------------*/
+#uc-header{
+ border-bottom:1px solid #fff;
+ }
#uc-site-header {
padding-top:30px;
@@ -278,10 +281,6 @@ img {
-.comments-area {
- background-color: $contentBg;
- padding: $contentPadding;
-}
#footer {
margin:1.5em 0;
@@ -396,6 +395,11 @@ code {
margin: 0 0 1.5em;
}
+.nav-next {
+ text-align:right;
+ }
+
+
/*--------------------------------------------------------------
10.2 Asides
--------------------------------------------------------------*/
@@ -407,17 +411,31 @@ code {
/*--------------------------------------------------------------
10.3 Comments
--------------------------------------------------------------*/
-.comment-content a {
- word-wrap: break-word;
-}
-.bypostauthor {
-}
-
+.comments-area {
-.nav-next {
- text-align:right;
}
+
+
+ .comment-list {
+ padding:0;
+ list-style-type:none;
+ }
+
+ .comment {
+ padding:$contentPadding;
+ border-top:1px solid #ccc;
+ }
+ .comment.thread-odd {
+ background-color:#f5f5f5;
+ }
+
+ .comment-content a {
+ word-wrap: break-word;
+ }
+
+
+
/*--------------------------------------------------------------