final changes beefore live demo

Signed-off-by: madwings <[email protected]>

.htaccess

@@ -42,7 +42,7 @@
 		AddOutputFilterByType DEFLATE application/xml
 		AddOutputFilterByType DEFLATE application/xhtml+xml
 		AddOutputFilterByType DEFLATE application/rss+xml
-		AddOutputFilterByType DEFLATE application/javascript
-		AddOutputFilterByType DEFLATE application/x-javascript    
+		AddOutputFilterByType DEFLATE application/javascript 
+		AddOutputFilterByType DEFLATE application/x-font-ttf
     </IfModule>
 </IfModule>

application/language/bulgarian/header_footer_lang.php

@@ -1,7 +1,8 @@
 <?php  defined('BASEPATH') OR exit('No direct script access allowed');
 
 $lang['title'] = 'НАО Рожен';
-$lang['title_header'] = 'национална астрономическа обсерватория - рожен';
+$lang['title_header_1'] = 'национална астрономическа';
+$lang['title_header_2'] = 'обсерватория - рожен';
 $lang['home'] = 'Начало';
 $lang['news'] = 'Новини';
 $lang['observatory'] = 'Обсерваторията';

application/language/english/header_footer_lang.php

@@ -1,7 +1,8 @@
 <?php  defined('BASEPATH') OR exit('No direct script access allowed');
 
 $lang['title'] = 'NAO Rozhen';
-$lang['title_header'] = 'national astronomy observatory - rozhen';
+$lang['title_header_1'] = 'national astronomy';
+$lang['title_header_2'] = 'observatory - rozhen';
 $lang['home'] = 'Home';
 $lang['news'] = 'News';
 $lang['observatory'] = 'Observatory';

application/views/site/header.php

@@ -36,9 +36,9 @@
 				</div>
 
 				<div class="row" id="NAOHeader">
-					<div class="col-lg-8 col-lg-offset-2">
-						<p class="text-uppercase text-center" id="NAOHeaderTitle">
-						<?php echo lang('title_header'); ?></p>
+					<div class="col-lg-8 col-lg-offset-2 text-center text-uppercase" id="header-title">
+						<p><?php echo lang('title_header_1'); ?></p>
+						<p><?php echo lang('title_header_2'); ?></p>
 					</div>
 					<div id="clocks" class="col-lg-2">
 						<div class="col-lg-6">
@@ -56,7 +56,8 @@
 		</div>
 		<!--NAVIGATION-->
 		<div id='nav-container'>
-			<div  class="navBorderTop"></div>
+			<div class="nav-border-black"></div>
+            <div class="nav-border-white"></div>
 			<nav class="navbar text-uppercase" role="navigation" id="nav">
 				<div class="container" id="navContainer">
 					<div class="row">
@@ -75,7 +76,7 @@
 								</button>
 							</div>
 							<div class="collapse navbar-collapse" id="navigation">
-								<ul class="nav navbar-nav ">
+								<ul class="nav navbar-nav nav-pills">
 									<li><a href="#"><?php echo lang('home'); ?></a></li>
 									<li><a href="#"><?php echo lang('news'); ?></a></li>
 									<li><a href="#"><?php echo lang('observatory'); ?></a></li>
@@ -89,7 +90,8 @@
 					</div>
 				</div>
 			</nav>
-			<div  class="navBorderTop"></div>
+			<div class="nav-border-black"></div>
+            <div class="nav-border-white"></div>
 		</div>
 		<!--END OF NAVIGATION-->
 	</header>

application/views/site/home.php

@@ -11,13 +11,13 @@
 						<span class="text-uppercase text-center" id="partnersHeader"><?php echo lang('partners'); ?></span>
 						<a href="http://www.smolyan.bg/" target="_blank">
 							<div class="leftIcons">
-								<img src="assets/images/icons/iconSmolyan.png" alt="iconSmolyan">
+								<img src="assets/images/icons/iconSmolyan.png" alt="Smolyan">
 								<p class="text-uppercase text-center"><?php echo lang('smolyan'); ?></p>
 							</div>
 						</a>
 						<a href="http://chepelare.org/" target="_blank">
 							<div class="leftIcons">
-								<img src="assets/images/icons/iconChepelare.png" alt="iconChepelare">
+								<img src="assets/images/icons/icon-chepelare.png" alt="Chepelare">
 								<p class="text-uppercase text-center"><?php echo lang('chepelare'); ?></p>
 							</div>
 						</a>
@@ -177,9 +177,10 @@
 									</a>
 								</div>
 							</article>
-						</div><!--End of Left Articles-->
-
-						<div class="col-lg-6"> <!-- Right aricles-->
+						</div>
+						<!--End of Left Articles-->
+						<!-- Right aricles-->
+						<div class="col-lg-6"> 
 							<article class="rightArticles">
 								<div class="list-group">
 									<a href="#" class="list-group-item">
@@ -206,9 +207,10 @@
 									</a>
 								</div>
 							</article>
-						</div><!--End of Right Articles-->
-					</section><!--End of Section with articles-->
-
+						</div>
+						<!--End of Right Articles-->
+					</section>
+					<!--End of Section with articles-->					
 					<!--Carousel Slider-->
 					<div class="carousel slide" id="myCarousel">
 						<div class="carousel-inner" id="carouselInner">
@@ -283,8 +285,7 @@
 								</div>
 							</div>
 							<div class="item con">
-								<div class="col-md-4 pad">
-
+								<div class="col-md-4 pad">								
 										<div class="imgContainer boxShadow">
 											<img class="pics img-responsive" src="assets/images/icons/pic15.png" alt="pic15">
 											<div class="hoverImg">
@@ -301,17 +302,19 @@
 						<a class="right carousel-control" id="rightArrowSlide" href="#myCarousel" data-slide="next"></a>
 						<img  id="leftArrowShadow" src="assets/images/icons/leftShadowArrowSlide.png" alt="">
 						<img class="" id="rightArrowShadow" src="assets/images/icons/rightShadowArrowSlide.png" alt="">
-					</div><!--End of Carousel Slider-->	
+					</div>
+					<!--End of Carousel Slider-->	
 				</div>
-
 				<!--Right Aside-->
 				<aside class="col-lg-2" id="rightAside">
-					<a href="#" ><img id="pragmaticLogo" src="assets/images/icons/pragmaticLogo.png" alt="weather"></a>
+					<a href="http://pragmatic.bg/" target="_blank">
+						<img id="pragmaticLogo" src="assets/images/icons/pragmatic-logo.png" alt="Pragmatic">
+					</a>
 					<span class="text-uppercase"><?php echo lang('weather_title'); ?></span>
 					<div id="weatherReg">
-						<a href="#"><img  src="assets/images/icons/weather.png" alt="weather"></a>
+						<a href="#"><img  src="assets/images/icons/weather.png" alt="Weather"></a>
 					</div>
-					<a href="#"><img src="assets/images/icons/weather2.png" alt="weather"></a>
+					<a href="#"><img src="assets/images/icons/weather2.png" alt="Weather"></a>
 					<div id="cam">
 						<a href="#">
 							<h6 class="text-uppercase" ><?php echo lang('rcc'); ?></h6>
@@ -321,8 +324,10 @@
 					<a href="#">
 						<img src="assets/images/icons/fb.png" alt="fb" >
 					</a>
-				</aside><!--End of right Aside-->
-			</div>
-
-		</div><!--End of container-->
-	</div><!--End of content-->
+				</aside>
+				<!--End of right Aside-->
+			</div>		
+		</div>
+		<!--End of container-->
+	</div>
+	<!--End of content-->

assets/css/main.css

@@ -1,3 +1,13 @@
+@font-face {
+	font-family: 'play-regular';
+	src: url('../fonts/play-regular.ttf');
+}
+
+@font-face {
+	font-family: 'play-bold';
+	src: url('../fonts/play-bold.ttf');
+}
+
 body{
 	background-image: url("../images/icons/starrysky.png");
     background-repeat: repeat; 
@@ -61,11 +71,11 @@ header {
 	margin-bottom: 53px;
 }
 
-#NAOHeaderTitle{
+#header-title{
 	font-size: 25px;
 	color: #a4a2a6;
-	font-family: "GulimChe", sans-serif;
-	font-weight: bold;
+	font-family: play-regular;
+	letter-spacing: 2px;
 }
 
 
@@ -83,19 +93,20 @@ How to justify navbar-nav in Bootstrap 3
 	float:none;
 }*/
 
-.navBorderTop{
-	background-image: url("../images/icons/navBorder.png");
-	background-repeat: repeat-x;
-	height: 2px;
+.nav-border-black {
+	height: 1px;
+	background: linear-gradient( to right, rgba(0,0,0, 0.0), rgba(0,0,0, 0.4), rgba(0,0,0, 0.0));
+}
 
+.nav-border-white {
+	height: 1px;
+	background: linear-gradient( to right, rgba(255,255,255, 0.0), rgba(255,255,255, 1), rgba(255,255,255, 0.0));
 }
 
 #nav{
 	min-height: 40px;
-	background-color: rgba(67, 76, 83, 0.1);
 	margin-bottom: 0px;
-	/*height: 40px;
-	background: linear-gradient( to right, rgba(255,255,255, 0.0), rgba(255,255,255, 0.8), rgba(255,255,255, 0.0));*/
+	background: linear-gradient( to right, rgba(255,255,255, 0.0), rgba(255,255,255, 0.8), rgba(255,255,255, 0.0));
 }
 
 #navigation {
@@ -105,9 +116,8 @@ How to justify navbar-nav in Bootstrap 3
 #navigation a{
 	font-family: "corbel";
 	font-weight: bold;
-	font-size: 15px;
 	color: #434c53;
-	text-shadow: 0px 1px 0px rgba(223, 223, 223, 1);
+	text-shadow: 0px 1px 0px rgba(255, 255, 255, 1);
 	padding:10px 15px 10px 15px;
 	opacity: 1;
 }