From 8ae392c87dea9b47bbcecccb26cad21449f7526c Mon Sep 17 00:00:00 2001 From: Lulubul Date: Sat, 26 Jan 2019 13:47:44 +0200 Subject: [PATCH 01/54] Add donate button #52 --- src/app/components/header/header.component.scss | 8 ++++++++ src/app/components/header/header.template.html | 6 ++++++ 2 files changed, 14 insertions(+) diff --git a/src/app/components/header/header.component.scss b/src/app/components/header/header.component.scss index 7a5f0d9..f2e88f7 100644 --- a/src/app/components/header/header.component.scss +++ b/src/app/components/header/header.component.scss @@ -80,6 +80,14 @@ .nav { > li { + + &.highlight { + background-color: $secondary; + > a { + color: white; + } + } + @media ($screen-sm) { margin-left: ($distance / 6); } diff --git a/src/app/components/header/header.template.html b/src/app/components/header/header.template.html index 9472b9a..49fc642 100644 --- a/src/app/components/header/header.template.html +++ b/src/app/components/header/header.template.html @@ -42,6 +42,12 @@ Despre Centru +
  • + + + Donează + +
    • From 5aebfd4f96c9566ccb08fdf24f243280320ab16d Mon Sep 17 00:00:00 2001 From: Florin Tomozei Date: Sat, 26 Jan 2019 15:31:39 +0200 Subject: [PATCH 02/54] add copywebpackplugin to expose the assets both in dev server and prod build --- package.json | 1 + webpack.config.js | 4 +++- webpack.prod.js | 4 +++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 6d015d7..0f489fe 100644 --- a/package.json +++ b/package.json @@ -44,6 +44,7 @@ }, "devDependencies": { "angular2-template-loader": "0.5.0", + "copy-webpack-plugin": "^4.6.0", "css-loader": "0.25.0", "file-loader": "0.9.0", "html-webpack-plugin": "2.22.0", diff --git a/webpack.config.js b/webpack.config.js index ed79338..0a227a6 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,6 +1,7 @@ var webpack = require('webpack'); var HtmlWebpackPlugin = require('html-webpack-plugin'); const DefinePlugin = require('webpack/lib/DefinePlugin'); +const CopyWebpackPlugin = require('copy-webpack-plugin'); module.exports = { entry: { @@ -53,6 +54,7 @@ module.exports = { }), new DefinePlugin({ SERVER_ADDRESS: JSON.stringify("http://localhost:8080/api/") - }) + }), + new CopyWebpackPlugin([ { from: 'src/app/assets', to: 'assets' } ]) ] }; diff --git a/webpack.prod.js b/webpack.prod.js index 6a547e7..22d44c3 100644 --- a/webpack.prod.js +++ b/webpack.prod.js @@ -2,6 +2,7 @@ var webpack = require('webpack'); var HtmlWebpackPlugin = require('html-webpack-plugin'); const DefinePlugin = require('webpack/lib/DefinePlugin'); const UglifyJsPlugin = require('webpack/lib/optimize/UglifyJsPlugin'); +const CopyWebpackPlugin = require('copy-webpack-plugin'); module.exports = { entry: { @@ -56,6 +57,7 @@ module.exports = { }), new DefinePlugin({ SERVER_ADDRESS: JSON.stringify("http://api.centrucivic.ro/api/"), - }) + }), + new CopyWebpackPlugin([ { from: 'src/app/assets', to: 'assets' } ]) ] }; \ No newline at end of file From e73583316b34b8b4633d6fd1009b9d108a4ec215 Mon Sep 17 00:00:00 2001 From: Florin Tomozei Date: Sat, 26 Jan 2019 15:31:55 +0200 Subject: [PATCH 03/54] add branding section and logo --- src/app/assets/images/code4romania.png | Bin 0 -> 3435 bytes src/app/components/header/header.component.scss | 15 +++++++++++++++ src/app/components/header/header.template.html | 6 ++++++ 3 files changed, 21 insertions(+) create mode 100644 src/app/assets/images/code4romania.png diff --git a/src/app/assets/images/code4romania.png b/src/app/assets/images/code4romania.png new file mode 100644 index 0000000000000000000000000000000000000000..0b8e8f7317d58b4a06ecd1fb220a6e4c33a66b13 GIT binary patch literal 3435 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 literal 0 HcmV?d00001 diff --git a/src/app/components/header/header.component.scss b/src/app/components/header/header.component.scss index 7a5f0d9..d1c98be 100644 --- a/src/app/components/header/header.component.scss +++ b/src/app/components/header/header.component.scss @@ -1,5 +1,20 @@ @import '../../assets/scss/variables'; +.header-branding { + text-align: center; + font-size: 16px; + padding: 6px; + .logo { + display: inline-block; + vertical-align: middle; + margin-left: 10px; + img { + display: block; + width: 62px; + } + } +} + .navbar-custom { background: $primary; border: 0; diff --git a/src/app/components/header/header.template.html b/src/app/components/header/header.template.html index 9472b9a..240a03e 100644 --- a/src/app/components/header/header.template.html +++ b/src/app/components/header/header.template.html @@ -1,3 +1,9 @@ +
    + an app developed by + +