Cleanup&Credits

Clean up and adding credits into read me

README.md

@@ -13,9 +13,10 @@ Basic Features
 - Combines the _s Wordpress Starter Theme and Bootstrap
 - Comes with Bootstrap SASS source files and additonal scss files. Nicely sorted and ready to add your own variables/customize the Bootstrap variables.
 - Uses a single and minified CSS file 
-- Font Awesome Icon Font integrated
-- Off-Canvas navigation - By Jasny Bootstrap Plugin (activate it by adding a widget to widget position "Off Canvas" - It works but did not looks good at the moment... )
-- Comes with extra slider script - By owl.carousel
+- Font Awesome Icon Font integrated (V 4.2.0): http://fortawesome.github.io/Font-Awesome/
+- Off-Canvas navigation - By Jasny Bootstrap Plugin (V 3.1.3): http://jasny.github.io/bootstrap/
+(activate it by adding a widget to widget position "Off Canvas" - It works but did not looks good at the moment... )
+- Comes with extra slider script - By owl.carousel (V 2.0.0-beta.2.4): http://www.owlcarousel.owlgraphic.com/
 - Simple RTL file
 - Jetpack ready
 - Child Theme ready (A basic starter Child Theme will be released in the future as a separate Repository)

content.php

@@ -23,7 +23,6 @@
 	<div class="entry-content">
 
             <?php
-                /* translators: %s: Name of current post */
                 the_excerpt();
             ?>
 

header.php

@@ -40,13 +40,8 @@
 
                              <div class="container">
 
-<<<<<<< HEAD
-                                <div class="col-md-<?php if ( is_active_sidebar( 'off-canvas' ) ): ?>11<?php else : ?>12<?php endif; ?>">
-                                 
-=======
                                 <div class="col-xs-<?php if ( is_active_sidebar( 'off-canvas' ) ): ?>11<?php else : ?>12<?php endif; ?>">
 
->>>>>>> testing
                                 <div class="navbar-header">
 
                                     <!-- .navbar-toggle is used as the toggle for collapsed navbar content -->
@@ -74,23 +69,9 @@
                                     )
                                 ); ?>
 
-<<<<<<< HEAD
-                        </div> <!-- .col-md-11 end -->
-                                 <?php if ( is_active_sidebar( 'off-canvas' ) ): ?>
-                        <div class="col-md-1 text-right">
-                            <!-- Off Canvas Toggle -->
-                            <a class="off-canvas-toggle-link" data-toggle="offcanvas" data-target=".navmenu" data-canvas="body">
-                                menu
-                            </a>
-                        </div>
-                                 <?php else : ?>
-
-                                 <?php endif; ?>
-=======
                         </div> <!-- .col-md-11 or col-md-12 end -->
 
 
->>>>>>> testing
                                  
                     </div> <!-- .container -->
                 

sass/understrap/understrap.scss

@@ -9,11 +9,11 @@ body { padding-top: 50px; }
 .sticky, .gallery-caption, .bypostauthor {
 font-size:inherit;
 }
-<<<<<<< HEAD
+
 // Workaround for Jasny off canvas nav on right hand side
 .navmenu-fixed-right {
   left: auto !important;
-=======
+}
 
 //Jasny Off-Canvas menu fixed right problems workaround
  .navmenu-fixed-right {
@@ -26,5 +26,4 @@ font-size:inherit;
   line-height:30px;
   padding:10px;
   color:#fff;
->>>>>>> testing
 }