Skip to content
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.

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

Redesign csharpguidelines #197

Merged
merged 1 commit into from
Oct 24, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@ _site
.sass-cache
.jekyll-metadata


.idea/
/node_modules/
6 changes: 5 additions & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ GEM
execjs (2.7.0)
faraday (0.14.0)
multipart-post (>= 1.2, < 3)
ffi (1.9.18)
ffi (1.9.18-x64-mingw32)
forwardable-extended (2.6.0)
gemoji (3.0.0)
Expand Down Expand Up @@ -196,6 +197,8 @@ GEM
minitest (5.10.1)
multipart-post (2.0.0)
net-dns (0.8.0)
nokogiri (1.8.2)
mini_portile2 (~> 2.3.0)
nokogiri (1.8.2-x64-mingw32)
mini_portile2 (~> 2.3.0)
octokit (4.8.0)
Expand Down Expand Up @@ -229,10 +232,11 @@ GEM
unicode-display_width (1.3.0)

PLATFORMS
ruby
x64-mingw32

DEPENDENCIES
github-pages

BUNDLED WITH
1.16.1
1.17.3
1 change: 1 addition & 0 deletions _includes/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

<!-- For all browsers -->
<link rel="stylesheet" href="{{ '/assets/css/main.css' | relative_url }}">
<link href="https://fonts.googleapis.com/css?family=Montserrat:300,400,700,800&display=swap" rel="stylesheet">

<!--[if lte IE 9]>
<style>
Expand Down
2 changes: 1 addition & 1 deletion _layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
Free for personal and commercial use under the MIT license
https://github.com/mmistakes/minimal-mistakes/blob/master/LICENSE.txt
-->
<html lang="{{ site.locale | slice: 0,2 | default: "en" }}" class="no-js">
<html lang="{{ site.locale | slice: 0,2 | default: 'en' }}" class="no-js">
<head>
{% include head.html %}
{% include head/custom.html %}
Expand Down
52 changes: 52 additions & 0 deletions _sass/custom/_generic.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
h1,
h2,
h3,
h4 {
font-family: $font-family !important;
font-weight: 900 !important;
color: $black !important;
}

h1 {
font-size: 45px !important;
line-height: 56px !important;
}

h2 {
font-size: 21px !important;
line-height: 31px !important;
}

p,
li {
font-family: $font-family;
font-size: 16px !important;
line-height: 32px !important;

code {
font-size: 16px;
line-height: 32px;
}
}

.page__hero--overlay {
h1 {
color: $blue !important;
}
}

.nav__sub-title {
font-family: $font-family;
font-size: 18px;
font-weight: 900;
}

.nav__items {
a {
font-family: $font-family;

&:hover {
color: $blue;
}
}
}
11 changes: 11 additions & 0 deletions _sass/custom/_variables.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
$blue: #5fc1e8;
$blue-light: #cfecff;

$light-gray: #f2f2f2;
$medium-gray: #dcdcdc;
$dark-gray: #8d8d8f;
$black: #272727;
$white: #fff;

$global-font-size: rem-calc(16);
$font-family: 'Montserrat', sans-serif;
2 changes: 2 additions & 0 deletions _sass/custom/main.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@import "variables";
@import "generic";
3 changes: 3 additions & 0 deletions _sass/minimal-mistakes.scss
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,6 @@
@import "minimal-mistakes/archive";
@import "minimal-mistakes/sidebar";
@import "minimal-mistakes/print";

//Custom styling by Aviva Solutions 2019
@import "custom/main";
15 changes: 9 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@
"type": "git",
"url": "git://github.com/mmistakes/minimal-mistakes.git"
},
"keywords": ["jekyll", "theme", "minimal"],
"keywords": [
"jekyll",
"theme",
"minimal"
],
"author": "Michael Rose",
"license": "MIT",
"bugs": {
Expand All @@ -22,11 +26,10 @@
"uglify-js": "^2.6.1"
},
"scripts": {
"uglify":
"uglifyjs assets/js/vendor/jquery/jquery-3.3.1.min.js assets/js/plugins/jquery.fitvids.js assets/js/plugins/jquery.greedy-navigation.js assets/js/plugins/jquery.magnific-popup.js assets/js/plugins/jquery.smooth-scroll.min.js assets/js/_main.js -c -m -o assets/js/main.min.js",
"uglify": "uglifyjs assets/js/vendor/jquery/jquery-3.3.1.min.js assets/js/plugins/jquery.fitvids.js assets/js/plugins/jquery.greedy-navigation.js assets/js/plugins/jquery.magnific-popup.js assets/js/plugins/jquery.smooth-scroll.min.js assets/js/_main.js -c -m -o assets/js/main.min.js",
"add-banner": "node banner.js",
"watch:js":
"onchange \"assets/js/**/*.js\" -e \"assets/js/main.min.js\" -- npm run build:js",
"build:js": "npm run uglify && npm run add-banner"
"watch:js": "onchange \"assets/js/**/*.js\" -e \"assets/js/main.min.js\" -- npm run build:js",
"build:js": "npm run uglify && npm run add-banner",
"watch": "LANG=\"en_US.UTF-8\" LC_ALL=\"en_US.UTF-8\" bundle exec jekyll serve -H 0.0.0.0 --incremental --watch -o"
}
}