Skip to content

Various fixes and updates #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tofu-rocketry merged 7 commits into from
Oct 5, 2018
Merged

Various fixes and updates #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
24ea0af
Add lang tag to default layout
tofu-rocketry Oct 3, 2018
6703690
Add 'safe' to config and remove serving options
tofu-rocketry Oct 3, 2018
5079b8d
Update Ruby version to match GH pages
tofu-rocketry Oct 3, 2018
b8827d5
Update badges
tofu-rocketry Oct 3, 2018
e3802d3
Fix markdown
tofu-rocketry Oct 3, 2018
080ca59
Update URL in config to HTTPS
tofu-rocketry Oct 4, 2018
d5e48bf
Move style.css to main.css to avoid overwriting
tofu-rocketry Oct 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
language: ruby
rvm: 2.4.2
rvm: 2.5.1

sudo: false
cache: bundler
Expand Down
12 changes: 4 additions & 8 deletions _config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ subheading: APEL client and server source code
description: "GitHub Page for the APEL project."
analytics: #Google analytics code in the format XX-nnnnnnnn-n
baseurl: "" #important: start with /
url: "http://apel.github.io"
url: "https://apel.github.io"

safe: true

# Travis bundles gems in the vendor directory which Jekyll will fail on if it's not excluded.
exclude: [vendor]
Expand All @@ -26,13 +28,7 @@ colors: #in hex code if not noted else
link_hover: "#01b2fe"
footer_heading: "#ffffff"
footer_content: "#bfc9d3"

# Serving
detach: false
port: 8080
host: 0.0.0.0
baseurl: "" # does not include hostname


### CONTACT SETTINGS ###

# Social networks usernames. Many more available: google-plus, flickr, linkedin, etc). Shown in footer.
Expand Down
2 changes: 1 addition & 1 deletion _includes/head.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<link href="{{ "/assets/css/bootstrap.css" | prepend: site.baseurl }}" rel="stylesheet">

<!-- Custom styles for this template -->
<link href="{{ "/assets/css/style.css" | prepend: site.baseurl }}" rel="stylesheet">
<link href="{{ "/assets/css/main.css" | prepend: site.baseurl }}" rel="stylesheet">
<link href="{{ "/assets/css/font-awesome.min.css" | prepend: site.baseurl }}" rel="stylesheet">

<!-- Custom CSS -->
Expand Down
2 changes: 1 addition & 1 deletion _layouts/default.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html>
<html lang="en">

{% include head.html %}

Expand Down
0 assets/css/style.css → assets/css/main.css
View file
Open in desktop
File renamed without changes.
26 changes: 15 additions & 11 deletions index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ subheading: APEL
project-url: https://github.com/apel
---

#Welcome to APEL
# Welcome to APEL

This is the GitHub Page for the APEL project.

Expand All @@ -15,18 +15,22 @@ The accounting information is gathered from different sensors into a central acc

Statistics are available for view in different detail by Users, VO Managers, Site Administrators and anonymous users according to well defined access rights.

##Software Status
## Software Status

###APEL
[![Build Status](https://travis-ci.org/apel/apel.svg?branch=dev)](https://travis-ci.org/apel/apel)
[![Coverage Status](https://coveralls.io/repos/apel/apel/badge.svg?branch=dev)](https://coveralls.io/r/apel/apel?branch=dev)
[![Code Health](https://landscape.io/github/apel/apel/dev/landscape.svg?style=flat)](https://landscape.io/github/apel/apel/dev)
### APEL
[![GitHub release](https://img.shields.io/github/release/apel/apel.svg)](https://github.com/apel/apel/releases/latest)
[![GitHub issues](https://img.shields.io/github/issues-raw/apel/apel.svg)](https://github.com/apel/apel/issues)

###SSM
[![Build Status](https://travis-ci.org/apel/ssm.svg?branch=dev)](https://travis-ci.org/apel/ssm)
[![Coverage Status](https://coveralls.io/repos/apel/ssm/badge.svg?branch=dev)](https://coveralls.io/r/apel/ssm?branch=dev)
[![Code Health](https://landscape.io/github/apel/ssm/dev/landscape.svg?style=flat)](https://landscape.io/github/apel/ssm/dev)
[![Build Status](https://travis-ci.org/apel/apel.svg?branch=dev)](https://travis-ci.org/apel/apel)
[![Coverage Status](https://coveralls.io/repos/github/apel/apel/badge.svg?branch=dev)](https://coveralls.io/github/apel/apel?branch=dev)
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/b614b03d576a4f5cbb6efa2e64e5f7ef)](https://www.codacy.com/app/apel/apel)
[![Maintainability](https://api.codeclimate.com/v1/badges/03094b74f5fc4f728bc7/maintainability)](https://codeclimate.com/github/apel/apel/maintainability)

### SSM
[![GitHub release](https://img.shields.io/github/release/apel/ssm.svg)](https://github.com/apel/ssm/releases/latest)
[![GitHub issues](https://img.shields.io/github/issues-raw/apel/ssm.svg)](https://github.com/apel/ssm/issues)
[![GitHub issues](https://img.shields.io/github/issues-raw/apel/ssm.svg)](https://github.com/apel/ssm/issues)

[![Build Status](https://travis-ci.org/apel/ssm.svg?branch=dev)](https://travis-ci.org/apel/ssm)
[![Coverage Status](https://coveralls.io/repos/github/apel/ssm/badge.svg?branch=dev)](https://coveralls.io/github/apel/ssm?branch=dev)
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/cc3e808664ee41638938aa5c660a88ae)](https://www.codacy.com/app/apel/ssm)
[![Maintainability](https://api.codeclimate.com/v1/badges/34aa04f3583afce2ceb2/maintainability)](https://codeclimate.com/github/apel/ssm/maintainability)