From bdd345274940b4c351bde207dbe7b2d09c9566dd Mon Sep 17 00:00:00 2001
From: Kevin MacMartin <prurigro@gmail.com>
Date: Sat, 12 Dec 2015 01:33:28 -0500
Subject: [PATCH] Add a placeholder logo and favicon so it's apparent where
 they'll show up, add a light text colour to the less variables, and add more
 realistic default styling for the nav

---
 public/favicon.ico                      | Bin 0 -> 4286 bytes
 public/favicon.png                      | Bin 0 -> 477 bytes
 public/img/logo.png                     | Bin 0 -> 807 bytes
 resources/assets/less/elements/nav.less |  38 +++++++++++++++++++++++-
 resources/assets/less/var.less          |   8 +++--
 resources/views/elements/nav.blade.php  |  15 +---------
 6 files changed, 43 insertions(+), 18 deletions(-)
 create mode 100644 public/img/logo.png

diff --git a/public/favicon.ico b/public/favicon.ico
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..21f408dcfa73cb5d0f0c8899e0e05c70d7c12ed6 100644
GIT binary patch
literal 4286
zcmZQzU<5)11qKkwutI==L5zWcK?8_^LJST-3=$_2NCMTp1mXu!d<IBU3f2P+cmT!E
zfV3$P;{vikiT_9#<Q7W737`SUX4>L0aMXU(uo?}2Jc)%!snPU@nx;ncAMS)RTK=G>
zm4PmQUf_-@qGgT(Rgzo(fb{*Q5dWjleq^^(gH1~Qr-ps#W{_h4cVO7f2jV4U;)Otc
zuYefY4W!sljr4zffbAcx{{}YxN5g+K{0Fl98BKr0r$0HgvidWSPbs(nGypmN?U4<9
S@c%zM*_eTW{Q)v2!z=*oHIXv_

literal 0
HcmV?d00001

diff --git a/public/favicon.png b/public/favicon.png
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..84f9236f38e533463bf3d28419ef01e2195afeb8 100644
GIT binary patch
literal 477
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSY)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYmNj^kiEpy*OmP~4-cC(+Y=|3e?TFg%#er@=ltB<)VvZPmw{o=x=k|~
z7#M>*T^vIyZoR#`F_YPl!QrC6&?7VJonKre6?)SRQrO-<(B)yvf2dTTx#=M1@r1qX
z;c`qbxn*M(N_~#iWj>#7V$tsXbz|8B@nU;(Mh*r>1qPM|1_1^p2L@_zKIGq%v-!8}
zmd`%6?Khck+-mQ`V*K}yFXlTwe`WMj>QBh-NM?(W>fakuuPHycdh0hEHJpLNj0&&C
w;m74xzdrC=-8<lFczrp?`j2sUukroizVTP*x@zRMHU=Q@boFyt=akR{02lvxxBvhE

literal 0
HcmV?d00001

diff --git a/public/img/logo.png b/public/img/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..b541e4747c051b379ab8885209cbf7c9d86afd2f
GIT binary patch
literal 807
zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|G$6&6<n8Xl@E-&h>|H(?D8gCb
z5n0T@z%2~Ij105pNB{-dOFVsD+3)l4ut{m1Z<LGy3h`uyM3gw^=jNv7l>oU6413mX
zn#sVxG{@7$F{I+w+q;HbEe0a47mphx7)qa7lxC@C+B-G4XTeg9AKi19BONB4cU`Sg
z8Z~Ka!Pf)p#Lp+MzVYSs-oras7+4qt7#u+Eq!xp*fJK3!0q8Ua4hCv5sAH1)UiN#x
z)lX)zd|;)(Z3ldn_w(*h`6<O{Ry^sXq0REA|1Hw5zFODN9B0#iR-Y(8Q^!9jAw1ZO
cWSIV!A@X*sttTIcJSe?-y85}Sb4q9e0M*`l;{X5v

literal 0
HcmV?d00001

diff --git a/resources/assets/less/elements/nav.less b/resources/assets/less/elements/nav.less
index 9ba693f..28ddfe3 100644
--- a/resources/assets/less/elements/nav.less
+++ b/resources/assets/less/elements/nav.less
@@ -1,3 +1,39 @@
-nav {
+nav.navbar {
+    background-color: @c_base;
     z-index: 1;
+
+    .navbar-logo {
+        top: 25px;
+        left: 15px;
+        width: 150px;
+        height: 150px;
+        background-image: url('/img/logo.png');
+        background-size: contain;
+        background-position: center center;
+        background-repeat: no-repeat;
+    }
+
+    #navbar {
+        box-shadow: none;
+        border: none;
+
+        ul.nav {
+            li {
+                a {
+                    color: @c_text_light;
+                    font-weight: bold;
+                    text-decoration: none;
+                }
+
+                &:hover a { color: @c_text; }
+                &.active a { color: @c_text; }
+                &.active a, &.active:hover a, &:hover a, &:focus a { background-color: transparent; }
+            }
+        }
+    }
+
+    .navbar-toggle {
+        border: none;
+        &, &:hover, &:focus { background-color: transparent; }
+     }
 }
diff --git a/resources/assets/less/var.less b/resources/assets/less/var.less
index e90b3a7..6a410d4 100644
--- a/resources/assets/less/var.less
+++ b/resources/assets/less/var.less
@@ -4,6 +4,8 @@
  |
  */
 
-@c_text: #111; // text colour
-@c_base: #0088cc; // base colour
-@c_accent: #f5f5f5; // accent colour
+// Colours
+@c_text:       #111; // text
+@c_text_light: #fff; // light text
+@c_base:       #0088cc; // base
+@c_accent:     #f5f5f5; // accent
diff --git a/resources/views/elements/nav.blade.php b/resources/views/elements/nav.blade.php
index a333a2d..9f8bccb 100644
--- a/resources/views/elements/nav.blade.php
+++ b/resources/views/elements/nav.blade.php
@@ -7,26 +7,13 @@
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
             </button>
-            <a class="navbar-brand" href="#">Hypothetical Creations</a>
+            <div class="navbar-logo"></div>
         </div>
         <div id="navbar" class="navbar-collapse collapse">
             <ul class="nav navbar-nav navbar-right">
                 <li class="active"><a href="#">Home</a></li>
                 <li><a href="#">About</a></li>
                 <li><a href="#">Contact</a></li>
-                <li class="dropdown">
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Dropdown <span class="caret"></span></a>
-                    <ul class="dropdown-menu">
-                        <li class="dropdown-header">Section A</li>
-                        <li><a href="#">Dropdown Option A1</a></li>
-                        <li><a href="#">Dropdown Option A2</a></li>
-                        <li><a href="#">Dropdown Option A3</a></li>
-                        <li role="separator" class="divider"></li>
-                        <li class="dropdown-header">Section B</li>
-                        <li><a href="#">Dropdown Option B1</a></li>
-                        <li><a href="#">Dropdown Option B2</a></li>
-                    </ul>
-                </li>
             </ul>
         </div>
     </div>