tests

andrece · Oct 17, 2013 · 861784f · 861784f
1 parent bd4c3e8
commit 861784f
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 17 deletions.
diff --git a/css/main.css b/css/main.css
diff --git a/css/main.less b/css/main.less
@@ -242,24 +242,31 @@ header#masthead {
 		line-height: 14px;
 		margin-top: 20px;
 	}
+	.logo {
+		float: left;
+		width: auto;
+		max-height: 32+120;
+		margin-right: 20px;
+		display: none;
+	}
 	h1 {
 		font-weight: normal;
-		margin: 40px 0;
+		margin: 60px 0;
 		float: left;
 		a {
 			font-family: 'OpenSansCondensedBold';
 			text-transform: uppercase;
 			display: block;
 			line-height: 32px;
-			font-size: 26px;
+			font-size: 32px;
 			color: #fff
 		}
 	}
 	.slogan {
 		float: left;
 		color: #fff;
 		font-style: italic;
-		margin: 40px;
+		margin: 60px 40px;
 		line-height: 32px;
 	}
 	.project-by {
@@ -277,7 +284,7 @@ header#masthead {
 		}
 	}
 	#searchform {
-		margin: 37px 0 36px;
+		margin: 57px 0 0;
 		input[type=text] {
 			border: 0;
 			border-bottom: 1px solid transparent;
@@ -1184,6 +1191,7 @@ header#masthead {
 	height: 100%;
 	width: 35%;
 	min-width: 300px;
+	max-width: 640px;
 	z-index: 1000;
 	word-wrap: break-word;
 	overflow: auto;
@@ -1228,7 +1236,9 @@ header#masthead {
 	object embed,
 	iframe,
 	img {
-		width: 100%;
+		min-width: 100%;
+		min-height: 100%;
+		width: auto;
 		height: auto;
 	}
 	.sharing {
@@ -1704,7 +1714,7 @@ aside#submit-call {
 
 aside#main-widgets {
 	background: #111;
-	padding: 15px 0;
+	padding: 30px 0;
 	margin: 0 0 15px;
 	color: #f0f0f0;
 	h3 {

diff --git a/css/site.css b/css/site.css
@@ -297,7 +297,7 @@ textarea {
         }
 
 .media-limit {
-  height: 120px;
+  height: 180px;
   margin: 0 0 15px;
   overflow: hidden;
   /*background-color: #f5f5f5;*/
@@ -308,7 +308,10 @@ textarea {
 #sidebar img,
 #sidebar video,
 #sidebar iframe {
-  max-width: 100%;
+  width: auto;
+  height: auto;
+  min-height: 100%;
+  min-width: 100%;
   }
 #sidebar h2.title {
   color: #fff;

diff --git a/functions.php b/functions.php
@@ -26,6 +26,8 @@ function infoamazonia_setup() {
 		'name' => __('Main widgets', 'infoamazonia'),
 		'id' => 'main-sidebar',
 		'description' => __('Widgets used on front and inside pages.', 'infoamazonia'),
+		'before_widget' => '<div class="four columns row">',
+		'after_widget' => '</div>',
 		'before_title' => '<h3>',
 		'after_title' => '</h3>'
 	));

diff --git a/header.php b/header.php
@@ -39,6 +39,7 @@
 				if(function_exists('qtrans_getLanguage'))
 					$lang = qtrans_getLanguage();
 				?>
+				<img src="<?php echo get_stylesheet_directory_uri(); ?>/img/logo_03b.png" class="logo" />
 				<h1><a href="<?php echo home_url('/' . $lang); ?>" title="<?php echo bloginfo('name'); ?>"><?php bloginfo('name'); ?></a></h1>
 				<p class="slogan"><?php bloginfo('description'); ?></p>
 				<?php get_search_form(); ?>

diff --git a/img/logo_02.png b/img/logo_02.png
diff --git a/img/logo_02b.png b/img/logo_02b.png
diff --git a/img/logo_03.png b/img/logo_03.png
diff --git a/img/logo_03b.png b/img/logo_03b.png
diff --git a/section-main-widget.php b/section-main-widget.php
@@ -1,9 +1,9 @@
 <?php if(is_active_sidebar('main-sidebar')) : ?>
 	<aside id="main-widgets">
-		<div class="limiter clearfix">
-			<ul class="widgets">
+		<div class="container">
+			<div class="widgets">
 				<?php dynamic_sidebar('main-sidebar'); ?>
-			</ul>
+			</div>
 		</div>
 	</aside>
 <?php endif; ?>