Skip to content

Commit

Permalink
Merge branch 'hotfix/0.107.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
brianjgeiger committed Apr 24, 2017
2 parents 3594e91 + 8a6b806 commit 12081d8
Show file tree
Hide file tree
Showing 8 changed files with 39 additions and 1 deletion.
7 changes: 7 additions & 0 deletions app/styles/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,13 @@ $logo-dir: 'img/provider_logos/';
background-image: url($logo-dir + 'scielo-dark-small.png');
}

.provider-lawarxiv {
background-image: url($logo-dir + 'lawarxiv-white.png');
}
.provider-lawarxiv-dark {
background-image: url($logo-dir + 'lawarxiv-dark.png');
}

.preprint-advisory {
background-color: #f3f5f7;
border-bottom: 1px solid #e0e6ea;
Expand Down
3 changes: 3 additions & 0 deletions app/styles/brands/_brand.scss
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ $logo-dir: '../img/provider_logos/';
color: $theme-color-2;
}

.navbar-toggle .icon-bar {
background-color: $theme-color-2;
}
a {
color: $theme-color-2;
}
Expand Down
14 changes: 14 additions & 0 deletions app/styles/brands/lawarxiv.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
@import 'brand';

@include brand(
#ceccca, // Color, theme color #1 (header backgrounds, hover backgrounds)
black, // Color, theme color #2 (text color mostly, usually white or black)
#e1994e, // Color, theme color #3 (navbar color, preferably a dark color)
black, // Color, theme color #4 (used in link colors)
#b85922, // Color, theme color #5 (text color that contrasts with #2, usually black or white)
$logo-dir + 'lawarxiv-logo.png', // String, path to the rectangular provider logo
$logo-dir + 'lawarxiv-dark.png', // String, path to the square provider logo
false, // Boolean, whether to use the white share logo or not
true, // Boolean, whether to use theme color 4 or theme color 2 for the navbar link color
true // Boolean, whether to use the contracts link color (theme color 4)
);
5 changes: 5 additions & 0 deletions app/templates/components/preprint-navbar-branded.hbs
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" id='preprint-branded-collapse-button' data-toggle="collapse" aria-label={{t 'components.preprint-navbar.toggle'}} data-target="#preprint-navbar-links">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
{{#link-to (route-prefix 'index') slug=theme.id class="navbar-brand" invokeAction=(action "click" "link" "Navbar - Brand")~}}
<span class="navbar-image"></span>
<span class="navbar-title">{{model.name}} {{t "global.preprints"}}</span>
Expand Down
11 changes: 10 additions & 1 deletion config/environment.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ module.exports = function(environment) {
},
{
id: 'bitss',
// Does not use a provider domain
logoSharing: {
path: '/assets/img/provider_logos/bitss-small.png',
type: 'image/png',
Expand Down Expand Up @@ -114,6 +113,16 @@ module.exports = function(environment) {
height: 488
},
permissionLanguage: 'arxiv_non_endorsement'
},
{
id: 'lawarxiv',
logoSharing: {
path: 'assets/img/provider_logos/lawarxiv-logo.png',
type: 'image/png',
width: 1200,
height: 488
},
permissionLanguage: 'arxiv_non_endorsement'
}
],
},
Expand Down
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 12081d8

Please sign in to comment.