Skip to content

Commit

Permalink
Apply requested changes
Browse files Browse the repository at this point in the history
  • Loading branch information
sheriefvt committed Jul 20, 2017
1 parent 4605b57 commit 2dab0ed
Show file tree
Hide file tree
Showing 11 changed files with 10 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ module.exports = {
MathJax: true
},
rules: {}
};
};
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ npm-debug.log
testem.log

# idea
.idea
.idea
2 changes: 1 addition & 1 deletion .template-lintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ module.exports = {
'block-indentation': 4,
'bare-strings': false
}
};
};
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ This README outlines the details of collaborating on this OSF Reviews Ember appl

## Prerequisites

You will need the following things properly installed on your computer.
You will need the following software properly installed on your computer.

* [Git](https://git-scm.com/)
* [Node.js](https://nodejs.org/) (with NPM)
Expand Down
2 changes: 1 addition & 1 deletion app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>Reviews</title>
<title>OSF Reviews</title>
<meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1">

Expand Down
2 changes: 1 addition & 1 deletion app/styles/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ $reviews-title: #D2D2D2;
$reviews-title-hover: #D5E6ED;
$gradient-percentage: 15%;
$nav-bar-height: 25px;
$carousel-control-width: 10%;
$carousel-control-width: 10%;
5 changes: 0 additions & 5 deletions app/templates/application.hbs
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
{{new-osf-navbar signupUrl=theme.signupUrl loginAction=(action 'login')}}

{{maintenance-banner}}

{{outlet}}


{{osf-footer}}
{{osf-copyright class='text-center'}}
{{osf-mode-footer}}

2 changes: 1 addition & 1 deletion app/templates/index.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@

</div> {{!END CONTAINER}}
</div> {{!END HEADER}}
</div> {{!END INDEX}}
</div> {{!END INDEX}}
2 changes: 1 addition & 1 deletion config/environment.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,4 @@ module.exports = function(environment) {
}

return ENV;
};
};
2 changes: 1 addition & 1 deletion config/local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ prod:
PERSONAL_ACCESS_TOKEN: null
OAUTH_SCOPES: null
REDIRECT_URI: https://osf.io/login/?next=2Freviews%2F
######### end ember-osf ##########
######### end ember-osf ##########
5 changes: 1 addition & 4 deletions ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ module.exports = function(defaults) {
'bower_components/bootstrap-sass/assets/stylesheets',
'bower_components/osf-style/sass',
'bower_components/hint.css',
'bower_components/c3',
'bower_components/bootstrap-daterangepicker',
]
},
Expand Down Expand Up @@ -135,8 +134,6 @@ module.exports = function(defaults) {
});

app.import(path.join(app.bowerDirectory, 'jquery.tagsinput/src/jquery.tagsinput.js'));
app.import(path.join(app.bowerDirectory, 'c3/c3.js'));
app.import(path.join(app.bowerDirectory, 'd3/d3.js'));

app.import({
development: path.join(app.bowerDirectory, 'hint.css/hint.css'),
Expand All @@ -151,4 +148,4 @@ module.exports = function(defaults) {
app.import('vendor/assets/ember-osf.css');

return app.toTree();
};
};

0 comments on commit 2dab0ed

Please sign in to comment.