github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-12-24 03:23:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'ha_custom_image_logo'

Browse source
This commit is contained in:
Henry Oswald 2016-06-21 12:07:49 +01:00
commit 5800c88d80
3 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
services/web/app/views/layout/navbar.jade
View file

@ -3,7 +3,9 @@ nav.navbar.navbar-default
.navbar-header
button.navbar-toggle(ng-init="navCollapsed = true", ng-click="navCollapsed = !navCollapsed", ng-class="{active: !navCollapsed}")
i.fa.fa-bars
if nav.title
if settings.nav.custom_logo
a(href='/', style='background-image:url("#{settings.nav.custom_logo}")').navbar-brand
else if (nav.title)
a(href='/').navbar-title #{nav.title}
else
a(href='/').navbar-brand

2
services/web/config/settings.defaults.coffee
View file

@ -15,7 +15,7 @@ httpAuthUsers[httpAuthUser] = httpAuthPass
sessionSecret = "secret-please-change"
module.exports =
module.exports = settings =
# File storage
# ------------
#

14
services/web/public/stylesheets/components/navbar.less
View file

@ -381,13 +381,15 @@
padding: 1rem 2rem;
.navbar-brand {
background-image: url('/img/logo.png');
background-size: 135px 16px;
background-repeat: no-repeat;
height: 16px;
margin-top: 10px;
padding: 0;
position: absolute;
top: 5px;
bottom: 5px;
width: 135px;
padding: 0;
background-image: url('/img/logo.png');
background-size: contain;
background-repeat: no-repeat;
background-position: left center;
}
@media
only screen and (-webkit-min-device-pixel-ratio: 2),