Merge branch 'call4desing' of gitorious.org:lorea/n1_theme into call4desing

5 files changed, 73 insertions, 18 deletions

diff --git a/views/default/css/elements/components.php b/views/default/css/elements/components.php
index c572829..daac3c7 100644
--- a/views/default/css/elements/components.php
+++ b/views/default/css/elements/components.php
@@ -43,10 +43,20 @@ margin-top: 3px;
 .elgg-item .elgg-subtext {
 	margin-bottom: 5px;
 }
-.elgg-item .elgg-content {
-	margin: 10px 5px;
+
+.elgg-item .elgg-content, .elgg-content .elgg-output, .elgg-item .elgg-output {
+	margin: 5px;
+	background-color: #f7f7f7;
+	border: 1px solid #ddd;
+	padding: 10px;
+	
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
 }
 
+
+
 /* ***************************************
 	Gallery
 *************************************** */
@@ -111,6 +121,16 @@ margin-top: 3px;
 	margin-bottom: 20px;
 }
 
+.elgg-owner-block h3 {
+	
+}
+.elgg-owner-block .elgg-subtext {
+	padding: 2px 0 9px 0;
+}
+
+
+
+
 /* ***************************************
 	Messages
 *************************************** */
@@ -172,15 +192,18 @@ margin-top: 3px;
 .elgg-river-message,
 .elgg-river-content {
 	color: #444;
-	background-color: #DDD;
-	border-right: solid 1px #BBB;
-	border-bottom: solid 1px #BBB;
+	background-color: #f7f7f7;
+	border: 1px solid #ccc;
 	border-radius: 3px;
-	font-size: 85%;
+	font-size: 100%;
 	line-height: 1.5em;
 	margin: 8px 0 5px 0;
 	padding: 5px;
 }
+
+.elgg-river-summary{
+	font-size: 94%;
+}
 .elgg-river-attachments .elgg-avatar,
 .elgg-river-attachments .elgg-icon {
 	float: left;
@@ -192,7 +215,7 @@ margin-top: 3px;
 
 .elgg-river-comments-tab {
 	display: block;
-	background-color: #DDD;
+	background-color: #f7f7f7;
 	color: #444;
 	margin-top: 5px;
 	width: auto;
@@ -209,7 +232,7 @@ margin-top: 3px;
 <?php //@todo components.php ?>
 .elgg-river-comments {
 	margin: 0;
-	background-color: #DDD;
+	background-color: #f7f7f7;
 	border-top: none;
 	border-right: solid 1px #BBB;
 	border-bottom: solid 1px #BBB;
@@ -221,6 +244,12 @@ margin-top: 3px;
 	border-radius: 3px;
 	border-top-right-radius: 0;
 }
+
+.elgg-river-comments .elgg-output {
+	border: none;
+
+}
+
 .elgg-river-comments li:first-child {
 	-webkit-border-radius: 5px 0 0;
 	-moz-border-radius: 5px 0 0;
diff --git a/views/default/css/elements/icons.php b/views/default/css/elements/icons.php
index 4094fe7..1642f26 100644
--- a/views/default/css/elements/icons.php
+++ b/views/default/css/elements/icons.php
@@ -13,7 +13,7 @@
 *************************************** */
 
 .elgg-icon {
-	background: transparent url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat left;
+	background: transparent url(<?php echo elgg_get_site_url(); ?>mod/n1_theme/_graphics/elgg_sprites.png) no-repeat left;
 	width: 16px;
 	height: 16px;
 	margin: 0 2px;
@@ -34,7 +34,7 @@
 	background-position: 0 -72px;
 }
 .elgg-icon-calendar {
-	background-position: 0 -90px;
+	background-position: 0 -91px;
 }
 .elgg-icon-cell-phone {
 	background-position: 0 -108px;
@@ -70,7 +70,7 @@
 	background-position: 0 -288px;
 }
 .elgg-icon-download {
-	background-position: 0 -306px;
+	background-position: 0 -304px;
 }
 .elgg-icon-eye {
 	background-position: 0 -324px;
@@ -148,10 +148,10 @@
 	background-position: 0 -756px;
 }
 .elgg-icon-refresh:hover {
-	background-position: 0 -774px;
+	background-position: 0 -775px;
 }
 .elgg-icon-refresh {
-	background-position: 0 -792px;
+	background-position: 0 -791px;
 }
 .elgg-icon-round-arrow-left {
 	background-position: 0 -810px;
@@ -175,7 +175,7 @@
 	background-position: 0 -918px;
 }
 .elgg-icon-search {
-	background-position: 0 -936px;
+	background-position: 0 -934px;
 }
 .elgg-icon-settings-alt:hover {
 	background-position: 0 -954px;
@@ -229,7 +229,7 @@
 	background-position: 0 -1242px;
 }
 .elgg-icon-tag {
-	background-position: 0 -1260px;
+	background-position: 0 -1242px;
 }
 .elgg-icon-thumbs-down-alt:hover {
 	background-position: 0 -1278px;
@@ -270,7 +270,7 @@
 	background-position: 0 -1476px;
 }
 .elgg-icon-users {
-	background-position: 0 -1494px;
+	background-position: 0 -1493px;
 }
 .elgg-icon-video {
 	background-position: 0 -1512px;
@@ -361,3 +361,22 @@
 	-moz-border-radius: 3px;
 	border-radius: 3px;
 }
+
+
+.elgg-owner-block .elgg-image {
+	height: 25px;	
+	background-color: #eee;
+	box-shadow: 0px 1px 2px #333;
+	padding: 1px;
+}
+
+.subgroups-icons a img {
+	width: 25px;
+	height: 25px;
+	background-color: #eee;
+	box-shadow: 0px 1px 2px #333;
+	padding: 1px;
+	margin: 0px 3px 3px 0px;
+}
+
+
diff --git a/views/default/css/elements/typography.php b/views/default/css/elements/typography.php
index 943f323..f6b8549 100644
--- a/views/default/css/elements/typography.php
+++ b/views/default/css/elements/typography.php
@@ -105,6 +105,7 @@ blockquote {
 
 h1, h2, h3, h4, h5, h6 {
 	color: #333;
+	font-weight: bold;
 }
 
 h1 { font-size: 2em; visibility: hidden;}
@@ -128,6 +129,7 @@ h6 { font-size: 0.8em; }
 	float: left;
 	max-width: 530px;
 	margin-right: 10px;
+	
 }
 .elgg-heading-basic {
 	color: #616068;
diff --git a/views/default/n1_theme/css.php b/views/default/n1_theme/css.php
index c6a94a8..db9fa46 100644
--- a/views/default/n1_theme/css.php
+++ b/views/default/n1_theme/css.php
@@ -96,8 +96,9 @@
 }
 
 .groups-profile-icon {
+	height: 201px;
 	border: 2px solid #F1F1F1;
-	box-shadow: 0px 1px 3px #666
+	box-shadow: 0px 1px 3px #666;
 }
 
 .elgg-page .cke_skin_BootstrapCK-Skin .cke_contents, .cke_skin_BootstrapCK-Skin .cke_contents iframe {
diff --git a/views/default/search/css.php b/views/default/search/css.php
index 195d3a9..4e5e88c 100644
--- a/views/default/search/css.php
+++ b/views/default/search/css.php
@@ -23,8 +23,12 @@ Search plugin
 }
 .elgg-search input[type=text] {
 	border: 0;
-	background: #EEE url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat 210px -914px;
+	background: #EEE url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat 210px -916px;
+	height: 20px;
+	font-size: 1em;
+	margin-top: 13px;
 }
+
 .search-list li {
 	padding: 5px 0 0;
 }