Merge remote-tracking branch 'upstream/development' into IDI-15-content

jhung · May 17, 2012 · 62e34da · 62e34da
2 parents a6344d4 + fd55f4d
commit 62e34da
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/contact-info.php b/contact-info.php
@@ -4,7 +4,7 @@
 		<div class="idi-mailing-address">
 			Inclusive Design Institute<br/>
 			<a href="http://g.co/maps/a5tua">
-				205 Richmond Street West</a><br/>
+				205 Richmond St. West</a><br/>
 			2nd Floor<br/>
 			Toronto, ON M5V 1V3<br/>
 			Canada

diff --git a/style.css b/style.css
@@ -47,10 +47,16 @@ Version: 1.0
 
 :focus,
 .fl-site-nav-main a:focus,
-.fl-uiOptions-fatPanel .fl-toggleButton:focus  {
+.fl-uiOptions-fatPanel .fl-toggleButton:focus,
+.idi-article-list ul li a:focus,
+ul.idi-institution-list li a:focus  {
     border: 5px solid #FFCC00;
 }
 
+:active {
+    border: none;
+}
+
 .idi-no-tab-focus:focus {
     border: none;
 }
@@ -94,7 +100,9 @@ body.fl-theme-uio-bw, body.fl-theme-uio-wb { background-image: none; }
 }
 a {
     color: #0076B0;
+    border: 5px solid transparent; 
 }
+
 a:hover,
 a:focus,
 .twitter-feed-group a.twitter-follow-button:hover,
@@ -831,9 +839,13 @@ h3,
 /* Buttons at the top of the window */
 .fl-uiOptions-fatPanel {
     margin-bottom: 2em;
+    box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.30);
 }
 .fl-uiOptions-fatPanel .fl-panelBar {
+    margin: auto;
+    width: 64em;
     height: 0;
+    border: none;
 }
 .fl-uiOptions-fatPanel .fl-toggleButton {
     border: none;
@@ -850,10 +862,9 @@ h3,
     background-position: 0.4em 50%;
     background-repeat: no-repeat;
     padding-left: 25px;
-    width: 7em;
+    width: 8em;
     margin-top: 0px;
     font-weight: 400;
-    text-align: right;
 }
 /* these should not be necessary, but defaults not working? */
 .fl-theme-uio-yb .fl-uiOptions-fatPanel .fl-toggleButton { border: 1px solid yellow;  }
@@ -990,10 +1001,10 @@ ul.idi-institution-list {
 }
 ul.idi-institution-list li {
     color: #0076B0;
-    padding-bottom: .22em;
 }
 ul.idi-institution-list li a {
     display: block;
+    border-width: 2px 0px;
 }
 .fl-theme-uio-yb ul.idi-institution-list li:before { color: #FFFF00; }
 .fl-theme-uio-wb ul.idi-institution-list li:before { color: #FFFFFF; }
@@ -1096,10 +1107,10 @@ form#idiMailingListSignup input {
 }
 .idi-article-list ul li {
     list-style-type: none;
-    margin-bottom: 0.5em;
 }
 .idi-article-list ul li a {
     display: block;
+    border-width: 5px 0px;
 }
 .idi-news-article,
 .idi-news-article.idi-breadcrumbs {
@@ -1359,6 +1370,9 @@ img.idi-about-person {
     font-style: normal;
     margin-bottom: 0.3em;
 }
+.idi-project h3 a {
+    display: block;
+}
 .idi-project-leads {
     margin-left: 0.5em;
     margin-right: 2em;