Merge branch 'release/4.1.11'

* release/4.1.11: compiling assets wip wip Updated the navbar branding
austintoddj · Mar 11, 2019 · d772a13 · d772a13
2 parents 3f123ab + df8616a
commit d772a13
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 10 deletions.
diff --git a/public/css/app.css b/public/css/app.css
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,6 +1,6 @@
 {
     "/js/app.js": "/js/app.js?id=85577627b51c6fe6aace",
-    "/css/app.css": "/css/app.css?id=4ee7db11d1a503a78968",
+    "/css/app.css": "/css/app.css?id=140492a908e5683b1787",
     "/js/app.js.map": "/js/app.js.map?id=28b80c57c98ffab2c36d",
     "/favicon.png": "/favicon.png?id=39d853e8c2bdbc38fde3"
 }
diff --git a/resources/sass/app.scss b/resources/sass/app.scss
@@ -42,12 +42,9 @@ a, .btn-link {
   font-family: $font-family-sans-serif;
 }
 
-.logo {
-  font-family: $font-family-serif;
+.logo i {
   font-size: 20px;
-  span {
-    color: $light-grey;
-  }
+  color: rgb(33, 37, 41) !important;
 }
 
 input, textarea, select {

diff --git a/resources/views/components/nav/navbar.blade.php b/resources/views/components/nav/navbar.blade.php
@@ -4,7 +4,9 @@
             <nav class="navbar navbar-light justify-content-between flex-nowrap flex-row py-1">
                 <!-- Left Side Of Navbar -->
                 <a class="navbar-brand logo mr-4 font-weight-bold py-0 @hasSection('context') d-none d-md-block @endif"
-                   href="{{ route('canvas.index') }}"><span>C</span>anvas</a>
+                   href="{{ route('canvas.index') }}">
+                    <i class="fas fa-align-left"></i>
+                </a>
 
                 <ul class="navbar-nav mr-auto flex-row float-right">
                     <li class="text-muted font-weight-bold">

diff --git a/resources/views/tags/index.blade.php b/resources/views/tags/index.blade.php
@@ -19,7 +19,7 @@
                                style="margin-top: -8px">
                                 <i class="fas fa-search"></i>
                             </a>
-                            <div class="dropdown-menu dropdown-menu-right py-0" aria-labelledby="dropdownMenuButton">
+                            <div class="dropdown-menu dropdown-menu-right py-0" style="min-width: 15rem;" aria-labelledby="dropdownMenuButton">
                                 <form class="pl-2 pr-4 mr-5">
                                     <div class="form-group mb-0">
                                         <input v-model="search"

diff --git a/resources/views/topics/index.blade.php b/resources/views/topics/index.blade.php
@@ -19,7 +19,7 @@
                                style="margin-top: -8px">
                                 <i class="fas fa-search"></i>
                             </a>
-                            <div class="dropdown-menu dropdown-menu-right py-0" aria-labelledby="dropdownMenuButton">
+                            <div class="dropdown-menu dropdown-menu-right py-0" style="min-width: 15rem;" aria-labelledby="dropdownMenuButton">
                                 <form class="pl-2 pr-4 mr-5">
                                     <div class="form-group mb-0">
                                         <input v-model="search"