Skip to content

Commit

Permalink
Merge branch 'new-design' (squash)
Browse files Browse the repository at this point in the history
Merge PR #30.

Squashed commit of the following:

commit ef2f9fa
Merge: 2898c84 06f478c
Author: Marc Ranolfi <mranolfi@...>
Date:   Thu Jan 30 00:10:31 2020 -0300

    Merge branch 'master' into new-design
    
    # Conflicts:
    #	dist/index.html

commit 2898c84
Author: Kieran Irving <changeme>
Date:   Tue Jan 28 23:23:49 2020 +0000

    Updated grammer for the Interested portion of the page & updated email link

commit 20d30e1
Author: Matthew Brent <mattjbrent@...>
Date:   Mon Jan 27 19:46:43 2020 -0500

    Add simple signup link
    
    The signup link is a mailto anchor tag, sending a message to the supplied email will automatically signup the sender for our mailing list.
    To be replaced by a PHP form in the future. This is a minimum viable implementation as a result
    
    Add styles for signup section by centering text
    Add small change to text for signup
    
    added margin-bottom to space out the signup row

commit 65e347e
Author: Matthew Brent <mattjbrent@...>
Date:   Tue Jan 21 13:09:21 2020 -0500

    Remove src/assets/img/3rd-party/logo-github-white.png

commit 26259d9
Author: Matthew Brent <mattjbrent@...>
Date:   Sat Jan 18 07:02:04 2020 -0500

    Add source maps for production build

commit 7570f49
Author: Matthew Brent <mattjbrent@...>
Date:   Fri Jan 17 20:38:50 2020 -0500

    .gitignore: Add correct path to dist/assets/css and js

commit 3b958ec
Author: Matthew Brent <mattjbrent@...>
Date:   Fri Jan 17 20:36:11 2020 -0500

    Change src/asset/img directory to src/img
    Fix lint error in 404.html
    Add dist/css and dist/js to .gitignore
    Fix incorrect Webpack prod CSS directory location

commit ec5ca2b
Author: Matthew Brent <mattjbrent@...>
Date:   Fri Jan 17 20:16:00 2020 -0500

    Disable stylelint in normalize.scss to remove duplicate name error

commit edc60ad
Author: Matthew Brent <mattjbrent@...>
Date:   Fri Jan 17 20:09:48 2020 -0500

    Add production build functionality
    
    Add post-css and config
    Add css-nano
    Exclude source maps

commit 839fba7
Author: Matthew Brent <mattjbrent@...>
Date:   Fri Jan 17 20:01:36 2020 -0500

    Stub webpack prod config file
    
    Add mini css extract plugin

commit 26cea6f
Author: Matthew Brent <mattjbrent@...>
Date:   Mon Jan 20 09:04:41 2020 -0500

    Change selector for the header links from nth-child to a specific class
    
    Update class name in index.html for header links

commit 9417ca0
Author: Matthew Brent <mattjbrent@...>
Date:   Fri Jan 17 21:36:37 2020 -0500

    updated github logo to be black instead of white
    small visual tweaks to align header logos

commit 45eb579
Author: Matthew Brent <mattjbrent@...>
Date:   Fri Jan 17 21:05:13 2020 -0500

    removed also from end of wiki card text

commit 1866236
Author: Matthew Brent <mattjbrent@...>
Date:   Fri Jan 17 21:04:32 2020 -0500

    all of the Codidact's -> All of the Codidact

commit 883c933
Author: Matthew Brent <mattjbrent@...>
Date:   Fri Jan 17 21:03:16 2020 -0500

    life -> life's

commit 7f5b053
Author: Matthew Brent <mattjbrent@...>
Date:   Fri Jan 17 21:02:38 2020 -0500

    whilst -> while

commit bda6e3d
Author: Matthew Brent <mattjbrent@...>
Date:   Fri Jan 17 21:01:55 2020 -0500

    shennanigans -> shenanigans

commit 9e55af0
Author: Matthew Brent <mattjbrent@...>
Date:   Fri Jan 17 10:05:42 2020 -0500

    removed rm -rf command and mkdir for windows compatibility, replaced with node scripts

commit a5ef328
Author: Matthew Brent <mattjbrent@...>
Date:   Fri Jan 17 00:03:02 2020 -0500

    Added most of the remaining mobile fixes
    
    Adds all section heading styles before images
    Adds responsive fixes for cards
    Adds additional typography fixes

commit c8114c3
Author: Matthew Brent <mattjbrent@...>
Date:   Thu Jan 16 23:34:13 2020 -0500

    adds card styles for get involved
    
    also adds corrected github logo

commit 9975a4f
Author: Matthew Brent <mattjbrent@...>
Date:   Thu Jan 16 22:36:59 2020 -0500

    Added white logos for cards
    
    also adds basic markup for card

commit eb2c180
Author: Matthew Brent <mattjbrent@...>
Date:   Thu Jan 16 22:24:36 2020 -0500

    adds small space between footer logo and tagline

commit 4cdc246
Author: Matthew Brent <mattjbrent@...>
Date:   Thu Jan 16 22:22:07 2020 -0500

    Adds footer styles
    
    centers content
    updated text on footer to match hero

commit ed15f10
Author: Matthew Brent <mattjbrent@...>
Date:   Thu Jan 16 21:34:28 2020 -0500

    Added white angled svg into markup for hero
    made small adjustment to padding for hero text to better match design

commit 8ca8620
Author: Matthew Brent <mattjbrent@...>
Date:   Thu Jan 16 21:26:21 2020 -0500

    fixed height for hero
    
    Uses css flex and makes hero image absolute positioning to overflow image and add correct height for hero

commit 6634f5b
Author: Matthew Brent <mattjbrent@...>
Date:   Thu Jan 16 21:16:37 2020 -0500

    Adds reset styles to text to remove default margin and padding
    
    also adds correct letter spacing and line height for titles

commit fb5913f
Author: Matthew Brent <mattjbrent@...>
Date:   Thu Jan 16 21:08:32 2020 -0500

    Adds correct color to hero title and text
    
    also slightly reduces heading size to match design

commit 55928f9
Author: Matthew Brent <mattjbrent@...>
Date:   Thu Jan 16 21:05:04 2020 -0500

    Adds default font weight and size for paragraph
    
    also adds ampersand back into title

commit 510a88e
Author: Matthew Brent <mattjbrent@...>
Date:   Thu Jan 16 20:58:15 2020 -0500

    fixed size of hero image
    sets width to 100% so it is contained within flex parent

commit 677fa19
Author: Matthew Brent <mattjbrent@...>
Date:   Thu Jan 16 20:54:11 2020 -0500

    Reordered attributes for links and added title to links

commit 6b31e83
Author: Matthew Brent <mattjbrent@...>
Date:   Thu Jan 2 21:34:11 2020 -0500

    Adds font weights for headings
    Adds class support for headings using BEM modifier class for heading class

commit 60743d8
Author: Matthew Brent <mattjbrent@...>
Date:   Thu Jan 2 21:20:00 2020 -0500

    Adds span and column grid styles
    
    Adds styles to allow column layout as well as column spanning for more unique layouts

commit c63bd14
Author: Matthew Brent <mattjbrent@...>
Date:   Thu Jan 2 21:01:34 2020 -0500

    Moved grid styles into its own file
    
    Moves existing styles from main.scss into a more appropriately named grid.scss file

commit d6e5262
Author: Matthew Brent <mattjbrent@...>
Date:   Mon Dec 23 09:24:18 2019 -0500

    Adds webpack dev server for local dev and adds basic styles for hero section
    - Adds webpack dev server to allow relative links for scss image urls currently at port 3000
    - Adds basic styles for the hero section - this needs refining

commit 1aa1788
Author: Matthew Brent <mattjbrent@...>
Date:   Sat Dec 21 21:12:55 2019 -0500

    Adds intitial styles for hero
    
    - adds background color gradient for hero
    - encountered issue with webpack and relative images used in scss, fixing now

commit 62afb5d
Author: Matthew Brent <mattjbrent@...>
Date:   Sat Dec 21 20:50:47 2019 -0500

    Adds styles for header
    
    - Adds mobile-first styles for header
    - Logo ajusted slightly from design - 10 px wider for mobile optimization
    - Logos wrap for mobile, using some JS would be optimal here to move or remove social media icons on scroll down and on scroll up bring back in

commit 279eb3e
Author: Matthew Brent <mattjbrent@...>
Date:   Sat Dec 21 20:16:04 2019 -0500

    Removes erroneously added extra indentation rule in .styelintrc

commit fdab347
Author: Matthew Brent <mattjbrent@...>
Date:   Sat Dec 21 20:15:05 2019 -0500

    Fixes missed assets path
    
    Corrects a couple of incorrect assets paths previously added

commit 80b3374
Author: Matthew Brent <mattjbrent@...>
Date:   Sat Dec 21 20:10:52 2019 -0500

    Moved src-assets into src/assets and cleaned up images
    
    Added images back into correct directories

commit 61ff723
Merge: 848bbcf 90a6476
Author: Matthew Brent <mattjbrent@...>
Date:   Sat Dec 21 19:51:18 2019 -0500

    Merge branch 'master' into css-grid
    
    Fixes a couple of merge conflicts
    - combines the stylelint config and elint config conflicts
    - addresses index.html conflict, ensuring analytics tag is left in but the old markup is replaced with the new one
    - fixes logo conflicts

commit 848bbcf
Author: Matthew Brent <mattjbrent@...>
Date:   Mon Dec 16 21:28:04 2019 -0500

    Adds robust scss file structure with stubbing of variables and grid structure - to be built up
    - Refactors main.css into main.scss
    - Adds _filename.scss for variables that dont get compiled into css
    - Adds several basic variables and mixins for responsive, color and typography
    - Adds scss update for stylelint which adds support for mixins etc
    - Small fix to markup for header in index.html that addresses the full-width content

commit 5570a1f
Author: Matthew Brent <mattjbrent@...>
Date:   Thu Dec 5 20:52:02 2019 -0500

    Added gitignore to dist css and js to ensure built files arent tracked.
    
    Ensuring dist files arent tracked ensures development files dont get accidentally added into production.
    This allows us to build the correct assets on deployment

commit b639d6e
Author: Matthew Brent <mattjbrent@...>
Date:   Thu Dec 5 20:46:33 2019 -0500

    Moved wepack config into config directory and added babel config

commit 62a6417
Author: Matthew Brent <mattjbrent@...>
Date:   Thu Dec 5 20:41:48 2019 -0500

    added babel plugins and webpack cli plugin

commit bacc289
Author: Matthew Brent <mattjbrent@...>
Date:   Thu Dec 5 20:37:22 2019 -0500

    Hooked up npm script in package.json to build webpack dev assets. Also added small convenience script to remove old css and js assets in dist

commit 4be17a6
Author: Matthew Brent <mattjbrent@...>
Date:   Thu Dec 5 20:30:20 2019 -0500

    Removed normalize.css and added in normalize.scss

commit b859926
Author: Matthew Brent <mattjbrent@...>
Date:   Thu Dec 5 20:27:17 2019 -0500

    Moved styles to scss file and removed primary.css from dist.

commit 2cd181a
Author: Matthew Brent <mattjbrent@...>
Date:   Thu Dec 5 20:17:58 2019 -0500

    Added eslint config settings in .eslintrc

commit 0e87ed6
Author: Matthew Brent <mattjbrent@...>
Date:   Thu Dec 5 20:05:59 2019 -0500

    Added eslint plugins to enable format on save in IDE as well as standardized project linting
    
    These plugins will not affect the build size of assets in any way. Configuration should
    be easy and low maintenance

commit 535f23c
Author: Matthew Brent <mattjbrent@...>
Date:   Thu Dec 5 20:01:30 2019 -0500

    Added correct printwidth and added webpack config for sass setup
    
    we could have set up sass only with npm and left JS for another time
    but it makes sense to add now as we will no doubt need JS at some point

commit 59492df
Author: Matthew Brent <mattjbrent@...>
Date:   Thu Dec 5 19:28:19 2019 -0500

    Added node-sass (the C version - libsass), Webpack and sass-loader)
    
    This will also enable us to use postCSS to levarage targeting browsers and vendor-prefixes automatically:x

commit 7372bd8
Author: Matthew Brent <mattjbrent@...>
Date:   Wed Dec 4 21:06:00 2019 -0500

    Added Redt Hat Display font from google fonts, added Hero background image
    
    3 Google font weights are added as per design. Old CSS has also been removed from the CSS file

commit c11e012
Author: Matthew Brent <mattjbrent@...>
Date:   Wed Dec 4 20:50:20 2019 -0500

    Added brand mark and hero text to index.html
    
    Text elements here only contain classes if its necessary. For example it shouldn't be expected that p elements contain classes.

commit cab4988
Author: Matthew Brent <mattjbrent@...>
Date:   Wed Dec 4 20:42:16 2019 -0500

    Adds github, discourse, discord and wiki icons. Adds Codidact logo to footer and header
    
    Icons are added at 2x resolution for high DPI devices. srcset is too much effort here as the size is so small.
    Codidact logos are exported as SVGs for crispness.

commit 5b2c511
Author: Matthew Brent <mattjbrent@...>
Date:   Wed Dec 4 20:07:36 2019 -0500

    Added content wrapper
    
    content-wrapper class will define the column grid. It can live on an row element or on an inner element if required by the design

commit ea842f9
Author: Matthew Brent <mattjbrent@...>
Date:   Wed Dec 4 20:00:37 2019 -0500

    Added initial markup for sections, header and footer
    
    The markup structure is using classes for style selectors instead of markup for semantic reasons, that way developers can choose between tags such as div, section etc. as required

commit f10f620
Author: ranolfi <mranolfi@...>
Date:   Fri Nov 29 16:21:59 2019 -0300

    dist/404.html: add 'min-width' to paragraph (re: 0675d36)
    
    From review: #6 (review)

commit 669f542
Author: ranolfi <mranolfi@...>
Date:   Fri Nov 29 06:04:15 2019 -0300

    dist/404.html: add negative 'margin-top' to title for better vert-alignment
    
    (I suppose it could be done via a <div> element surrounding both the '<h1>' title and the text, as well.)

commit 58f08e4
Author: ranolfi <mranolfi@...>
Date:   Fri Nov 29 06:01:47 2019 -0300

    dist/404.html: Fix conflicting 'margin' CSS property for 'body' (re: 0675d36)

commit c367464
Author: ranolfi <mranolfi@...>
Date:   Fri Nov 29 05:20:03 2019 -0300

    dist/index.html: Add 'title' attribute for links to GitHub, forum and chat

commit 7b76f99
Author: ranolfi <mranolfi@...>
Date:   Fri Nov 29 05:15:38 2019 -0300

    dist/index.html: refactor - standardize order of attributes in '<img>' tag

commit 3560896
Author: ranolfi <mranolfi@...>
Date:   Fri Nov 29 05:02:03 2019 -0300

    dist/index.html: (minor) fix `GitHub` capitalization in 'alt' attribute

commit ea547ff
Author: ranolfi <mranolfi@...>
Date:   Fri Nov 29 04:59:04 2019 -0300

    dist/index.html: Remove indentation within '<p>' tag
    
    See: #5 (comment)

commit 6f6e315
Author: ranolfi <mranolfi@...>
Date:   Fri Nov 29 04:57:40 2019 -0300

    dist/index.html: Make subtitle text a little more succint

commit f01d94c
Author: ranolfi <mranolfi@...>
Date:   Fri Nov 29 04:56:18 2019 -0300

    dist/404.html: refactor (CSS style)
    
    Multiple selectors on the same line. Per: #5 (comment)

commit 0675d36
Author: ranolfi <mranolfi@...>
Date:   Fri Nov 29 04:35:19 2019 -0300

    dist/404.html: Restore title margin to default and increase paragraph width
    
    This also makes width responsive. Applies to media with width > 280px only. The result is easier on the eyes.

commit d80f136
Author: ranolfi <mranolfi@...>
Date:   Fri Nov 29 03:48:02 2019 -0300

    README.md: typo and grammar fixes
  • Loading branch information
ranolfi authored Jan 30, 2020
1 parent 06f478c commit 7c2670d
Show file tree
Hide file tree
Showing 52 changed files with 12,458 additions and 2,681 deletions.
22 changes: 22 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"extends": ["eslint:recommended", "plugin:prettier/recommended"],
"plugins": ["prettier"],
"rules": {
"prettier/prettier": "error",
"max-len": [
"error",
{
"code": 120,
"ignoreComments": true
}
]
},
"parserOptions": {
"ecmaVersion": 6,
"sourceType": "module"
},
"env": {
"browser": true,
"node": true
}
}
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
node_modules
.DS_Store
.vscode
dist/assets/css
dist/assets/js
1 change: 1 addition & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
"trailingComma": "es5",
"tabWidth": 4,
"semi": true,
"singleQuote": false,
"printWidth": 120
}
9 changes: 7 additions & 2 deletions .stylelintrc
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
{
"extends": "stylelint-config-standard",
"rules": {
"font-family-name-quotes": "always-unless-keyword",
"indentation": 4,
"at-rule-no-unknown": null,
"scss/at-rule-no-unknown": true,
"font-family-name-quotes": "always-unless-keyword",
"string-quotes": ["double", { "avoidEscape": false }]
}
},
"plugins": [
"stylelint-scss"
]
}
48 changes: 48 additions & 0 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
module.exports = api => {
const isTest = api.env("test");

if (isTest) {
return {
presets: [
[
"@babel/preset-env",
{
targets: {
node: "current",
},
},
],
],
};
} else {
return {
presets: [["@babel/preset-env", { modules: false }]],
plugins: ["@babel/plugin-proposal-class-properties"],
overrides: [
{
test: ["./config"],
presets: [
[
"@babel/preset-env",
{
modules: false,
targets: {
browsers: [
"last 2 Chrome versions",
"last 2 Firefox versions",
"last 2 Safari versions",
"last 2 iOS versions",
"last 1 Android version",
"last 1 ChromeAndroid version",
],
},
useBuiltIns: "usage",
corejs: 3,
},
],
],
},
],
};
}
};
31 changes: 31 additions & 0 deletions config/dev.webpack.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
const webpack = require("webpack");
const path = require("path");

module.exports = {
entry: path.resolve(__dirname, "../src/js/index.js"),

output: {
path: path.resolve(__dirname, "../dist"),
filename: "assets/js/[name].js",
},

module: {
rules: [
{
test: /\.js$/,
exclude: /node_modules/,
use: ["babel-loader"],
},
{
test: /\.scss$/,
use: [{ loader: "style-loader" }, { loader: "css-loader" }, { loader: "sass-loader" }],
},
],
},
devServer: {
contentBase: ["./dist"],
port: 3000,
},
devtool: "cheap-eval-source-map",
watch: true,
};
40 changes: 40 additions & 0 deletions config/prod.webpack.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
/* eslint-disable-next-line */
const webpack = require("webpack");
const path = require("path");
const MiniCssExtractPlugin = require("mini-css-extract-plugin");

module.exports = {
entry: path.resolve(__dirname, "../src/js/index.js"),

output: {
path: path.resolve(__dirname, "../dist"),
filename: "assets/js/[name].js",
},

module: {
rules: [
{
test: /\.js$/,
exclude: /node_modules/,
use: ["babel-loader"],
},
{
test: /\.scss$/,
use: [
{ loader: "style-loader" },
MiniCssExtractPlugin.loader,
{ loader: "css-loader", options: { sourceMap: true } },
{ loader: "postcss-loader", options: { sourceMap: true } },
{ loader: "sass-loader", options: { sourceMap: true } },
],
},
],
},
plugins: [
new MiniCssExtractPlugin({
filename: "assets/css/[name].css",
sourceMap: true,
}),
],
devtool: "source-map",
};
6 changes: 4 additions & 2 deletions dist/404.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
line-height: 1.2;
}

html, body {
html,
body {
margin: 0;
}

Expand Down Expand Up @@ -41,7 +42,8 @@
}

@media only screen and (max-width: 280px) {
body, p {
body,
p {
width: 95%;
}

Expand Down
101 changes: 0 additions & 101 deletions dist/assets/css/primary.css

This file was deleted.

Binary file modified dist/assets/img/3rd-party/logo-discord-chat.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions dist/assets/img/3rd-party/logo-discord-white.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions dist/assets/img/3rd-party/logo-discourse-white.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 7c2670d

Please sign in to comment.