From: Rubén Beltran del Río Date: Wed, 1 Aug 2018 03:35:42 +0000 (+0000) Subject: Merge branch 'hotfix/1.0.1' into 'master' X-Git-Url: https://git.r.bdr.sh/rbdr/dead-drop/commitdiff_plain/4546edbd1634cde4c9ffe90459269c17ba9f8bfb?hp=b0b2aee1145b50a58c22d39627df717d45c6338f Merge branch 'hotfix/1.0.1' into 'master' Add Gitlab pages support See merge request rbdr/dead-drop!4 --- diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..39589ea --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,14 @@ +image: node:8 + +stages: + - deploy + +pages: + stage: deploy + script: + - mv pages public + artifacts: + paths: + - public + only: + - master diff --git a/CHANGELOG.md b/CHANGELOG.md index 82f3e55..e829b9b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +## [1.0.1] +### Added +- Gitlab pages support + ## 1.0.0 ### Added - Application SID Checking @@ -17,4 +21,5 @@ and this project adheres to [Semantic Versioning](http://semver.org/). - This CHANGELOG - Readme +[1.0.1]: https://github.com/olivierlacan/keep-a-changelog/compare/1.0.0...1.0.1 [Unreleased]: https://github.com/olivierlacan/keep-a-changelog/compare/master...develop diff --git a/package.json b/package.json index 5bda8c4..164ac5b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dead-drop", - "version": "1.0.0", + "version": "1.0.1", "description": "A voice communication system", "main": "lib/dead_drop.js", "repository": "git@github.com:rbdr/dead-drop.git", diff --git a/pages/css/style.css b/pages/css/style.css new file mode 100644 index 0000000..d3883fc --- /dev/null +++ b/pages/css/style.css @@ -0,0 +1,43 @@ +body { + background-color: #85CCDA; +} + +h1, .cta, .phone { + font-family: 'Bungee Shade', sans-serif; + text-align: center; + width: 75%; + margin: 0 auto; +} + +h1 { + font-size: 64pt; + color: #fff; + margin: 24px auto; +} + +p, ul { + font-size: 14pt; + font-family: 'Roboto', sans-serif; + margin: 0; + color: #4C5F65; +} + +.description { + text-align: center; + margin: 50px 0; +} + +.usage { + margin: 10px auto 50px; + width: 25%; +} + +.phone { + font-size: 48pt; +} + +.cta { + margin: 24px auto; + font-size: 48pt; + color: #fff; +} diff --git a/pages/index.html b/pages/index.html new file mode 100644 index 0000000..3b97c11 --- /dev/null +++ b/pages/index.html @@ -0,0 +1,29 @@ + + + + + + + ｄｅａｄ ｄｒｏｐ + + + + + + +

DEAD DROP

+

+ Buzón de voz colaborativo. Deja un mensaje. Escucha un mensaje al azar. +

+ +

(33) 4160-0915

+

Llama Ahora!

+ +