Include footer image and style accordingly (#187)

minio · Aug 30, 2016 · 62b112a · 62b112a
1 parent 4c42a75
commit 62b112a
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 6 deletions.
diff --git a/app/assets/javascripts/hub.coffee b/app/assets/javascripts/hub.coffee
@@ -58,7 +58,7 @@ $(document).on 'page:change', ->
     return
 
   # Open
-  $body.on 'click', '*:not("a") > img:not(".img-preview__img")', ->
+  $body.on 'click', '*:not("a") > img:not(".img-preview__img"):not(".footer__img")', ->
     $imgSrc = $(this).attr('src')
     $imgWrap =  '<div class="img-preview">' +
                   '<div class="img-preview__close img-preview__close--back"></div>' +

diff --git a/app/assets/stylesheets/includes/base.scss b/app/assets/stylesheets/includes/base.scss
@@ -71,7 +71,7 @@ a {
 }
 
 *:not(a) {
-  & > img {
+  & > img:not([class]) {
     border-radius: 2px;
     max-width: 800px;
     width: 100%;

diff --git a/app/assets/stylesheets/includes/footer.scss b/app/assets/stylesheets/includes/footer.scss
@@ -12,3 +12,16 @@
     color: darken($footer-color, 10%);
   }
 }
+
+.footer__img {
+  display: inline-block;
+  max-width: 100px;
+  max-height: 50px;
+  vertical-align: text-bottom;
+  margin-left: 10px;
+
+  @media (max-width: $screen-xs-max) {
+    display: block;
+    margin: 10px auto 0;
+  }
+}
diff --git a/app/assets/stylesheets/includes/lightbox.scss b/app/assets/stylesheets/includes/lightbox.scss
@@ -1,5 +1,5 @@
 *:not(a) {
-  img {
+  img:not([class]) {
     &:not(.img-preview__img) {
       @include transition(box-shadow, 300ms);
       cursor: pointer;

diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
@@ -1,9 +1,12 @@
 <footer id="footer">
 	<% if @mybrand %>
-			<%=  @mybrand.footer_text %>
+        <%=  @mybrand.footer_text %>
+
+        <% if !@mybrand.footer_img.blank? %>
+            <img class="footer__img" src="<%= @mybrand.footer_img %>" alt="">
+        <% end %>
 
 	<% else %>
-		 	Doctor is licensed under Apache 2.0 License.
+        Doctor is licensed under Apache 2.0 License.
 	<% end %>
-
 </footer>