Multiple changes

jackarmley · Mar 4, 2012 · dc8b6dc · dc8b6dc
1 parent eac1fee
commit dc8b6dc
Show file tree

Hide file tree

Showing 17 changed files with 9 additions and 11 deletions.
diff --git a/eesys/expressionengine/templates/default_site/home.group/index.html b/eesys/expressionengine/templates/default_site/home.group/index.html
@@ -13,7 +13,7 @@
 			<h1 id="gl-section_title">My name's Jack; I'm a web designer</h1>
 			<div id="gl-content_wrapper" class="clearfix">
 				<div id="pg-home_intro">
-					<p class="app-page_title app-division">My idea of a good time is writing a nice bit of semantic markup, or some extensible <abbr title="Cascading Style Sheets">CSS</abbr></p>
+					<p class="app-page_title app-division">I relish the challenge of building beautiful, usable websites that people love to visit.</p>
 					<div class="app-division clearfix">
 						<article class="mod-gridunit gu-float gu-three">
 							{exp:channel:entries channel="work" disable="categories|member_data|pagination" status="Featured" sort="desc" limit="1" dynamic="no" show_future_entries="yes"}

diff --git a/eesys/expressionengine/templates/default_site/work.group/index.html b/eesys/expressionengine/templates/default_site/work.group/index.html
@@ -35,7 +35,7 @@ <h1><a href="{title_permalink='work/detail'}" title="Read more">{title}</a></h1>
 							{work-thumb limit="1"}
 								<figure>
 									<a href="{title_permalink='work/detail'}" title="Read more">
-										<img src="{-matrix-work-thumb_image}" alt="{-matrix-work-thumb_alt}" {if entry_id!="50"}class="app-border"{/if} />
+										<img src="{-matrix-work-thumb_image}" alt="{-matrix-work-thumb_alt}" {if -matrix-work-thumb_border!="no"}class="app-border"{/if} />
 									</a>
 								</figure>
 							{/work-thumb}

diff --git a/managed_assets/device_templates/iPad GUI PSD 2.psd b/managed_assets/device_templates/iPad GUI PSD 2.psd
diff --git a/managed_assets/work/slide-browserbook_01.jpg b/managed_assets/work/slide-browserbook_01.jpg
diff --git a/managed_assets/work/slide-browserbook_02.jpg b/managed_assets/work/slide-browserbook_02.jpg
diff --git a/managed_assets/work/slide-dunhill_01.png b/managed_assets/work/slide-dunhill_01.png
diff --git a/managed_assets/work/slide-dunhill_02.png b/managed_assets/work/slide-dunhill_02.png
diff --git a/managed_assets/work/slide-dunhill_03.png b/managed_assets/work/slide-dunhill_03.png
diff --git a/managed_assets/work/slide-snowcone_01.gif b/managed_assets/work/slide-snowcone_01.gif
diff --git a/managed_assets/work/slide-snowcone_02.gif b/managed_assets/work/slide-snowcone_02.gif
diff --git a/managed_assets/work/thumb-browserbooklet.jpg b/managed_assets/work/thumb-browserbooklet.jpg
diff --git a/managed_assets/work/thumb-dunhill.png b/managed_assets/work/thumb-dunhill.png
diff --git a/managed_assets/work/thumb-snowcone.gif b/managed_assets/work/thumb-snowcone.gif
diff --git a/managed_assets/work/thumb-snowcone.png b/managed_assets/work/thumb-snowcone.png
diff --git a/v2/css/less/links.less b/v2/css/less/links.less
@@ -34,6 +34,7 @@ Links
 		}
 		article h1 a{
 			border-bottom:none;
+			box-shadow:none;
 		}		
 
 			p a:hover:after,

diff --git a/v2/css/less/modular.less b/v2/css/less/modular.less
@@ -346,16 +346,11 @@
 					color:@col-recessive;
 
 					&:hover{cursor:pointer;}
+
+					&.active{
+						color:@col-base;
+					}
 				}
 
-				a
-				li
-				.active{
-					background:#ddd;
-					color:@col-charcol;
-					text-shadow:0 1px 0 #fff;
-					.border-radius(0.25em);
-				}
-
 			}
 
diff --git a/v2/css/less/responsive.less b/v2/css/less/responsive.less
@@ -56,6 +56,7 @@
 			height:auto;
 			margin:0 0 @base-lineheight 0;
 			box-shadow:none;
+			border-bottom-style:solid;
 		}
 			#gl-header_pri h1{
 				font-size:2em;
@@ -64,6 +65,7 @@
 				margin:0;
 				background:#fff;
 				text-shadow:none;
+				color:@col-base;
 
 				a,
 				a:link,