8000 Merge pull request #129 from daviddarnes/improve-customisation-options · EdwardZX/EdwardZX.github.io@cb67769 · GitHub
[go: up one dir, main page]
Skip to content

Commit cb67769

Browse files
daviddarnesdaviddarnes
authored
Merge pull request daviddarnes#129 from daviddarnes/improve-customisation-options
[Enhancement] Improve customisation options
2 parents 465b934 + 8af9db2 commit cb67769

File tree

4 files changed

+21
-21
lines changed

4 files changed

+21
-21
lines changed

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,11 @@ _(deprecated, not recommended)_
105105

106106
## Customising
107107

108-
When using Alembic as a theme means you can take advantage of the file overriding method. This allows you to overwrite any file in this theme with your own custom file, simply by matching the file name and path. The most common example of this would be if you want to add your own styles or change the core style settings.
108+
When using Alembic as a theme means you can take advantage of the file overriding method. This allows you to overwrite any file in this theme with your own custom file, by matching the file name and path. The most common example of this would be if you want to add your own styles or change the core style settings.
109109

110110
To add your own styles copy the [`styles.scss`](https://github.com/daviddarnes/alembic/blob/master/assets/styles.scss) into your own project with the same file path (`assets/styles.scss`). From there you can add your own styles, you can even optionally ignore the theme styles by removing the `@import "alembic";` line.
111111

112-
If you're just looking to set your own colours and fonts copy the [`_settings.scss`](https://github.com/daviddarnes/alembic/blob/master/_sass/_settings.scss) and main theme styles file [`alembic.scss`](https://github.com/daviddarnes/alembic/blob/master/_sass/alembic.scss) into your project at the same file path (`_sass/`) and change variables however you wish. The settings are a mixture of custom variables and settings from [Sassline](https://medium.com/@jakegiltsoff/sassline-v2-0-e424b2881e7e) - follow the link to find out how to configure the typographic settings.
112+
If you're looking to set your own colours and fonts you can overwrite them by matching the variable names from the [`_settings.scss`](https://github.com/daviddarnes/alembic/blob/master/_sass/_settings.scss) file in your own `styles.scss`, make sure to state them before the `@import "alembic";` line so they take effect. The settings are a mixture of custom variables and settings from [Sassline](https://medium.com/@jakegiltsoff/sassline-v2-0-e424b2881e7e) - follow the link to find out how to configure the typographic settings.
113113

114114
## Configuration
115115

‎_sass/_settings.scss

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
11
// Background colours
2-
$backgroundColour: #ffffff;
3-
$codeBackgroundColour: #fafafa;
4-
$featureBackgroundColour: #f9fafa;
2+
$backgroundColour: #ffffff !default;
3+
$codeBackgroundColour: #fafafa !default;
4+
$featureBackgroundColour: #f9fafa !default;
55
$accentColour: #05bf85;
66

77
// Text colours
8-
$headingColour: #242e2b;
9-
$bodyColour: #384743;
10-
$linkColour: #05bf85;
11-
$hoverColour: #008000;
12-
$focusColour: #fa407a;
13-
$captionColour: #a8adac;
14-
$white: #ffffff;
8+
$headingColour: #242e2b !default;
9+
$bodyColour: #384743 !default;
10+
$linkColour: #05bf85 !default;
11+
$hoverColour: #008000 !default;
12+
$focusColour: #fa407a !default;
13+
$captionColour: #a8adac !default;
14+
$white: #ffffff !default;
1515

1616
// Typography
1717
$bodytype: (
18-
font-family: 'Georgia, serif',
18+
font-family: "Georgia, serif",
1919
regular: 400,
2020
bold: 700,
2121
italic: italic,
2222
cap-height: 0.75
23-
);
23+
) !default;
2424

2525
$headingtype: (
2626
font-family: '"Merriweather", serif',
2727
regular: 400,
2828
bold: 700,
2929
cap-height: 0.75
30-
);
30+
) !default;
3131

3232
$monospacetype: (
33-
font-family: 'Menlo, monospace',
33+
font-family: "Menlo, monospace",
3434
regular: 400,
3535
cap-height: 0.68
36-
);
36+
) !default;
3737

3838
// Font import, if you're using a non-standard web font
39-
@import url('https://fonts.googleapis.com/css?family=Merriweather:400,700');
39+
@import url("https://fonts.googleapis.com/css?family=Merriweather:400,700");

‎alembic-jekyll-theme.gemspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Gem::Specification.new do |spec|
44
spec.name = "alembic-jekyll-theme"
5-
spec.version = "3.0.11"
5+
spec.version = "3.0.12"
66
spec.authors = ["David Darnes"]
77
spec.email = ["me@daviddarnes.com"]
88

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
2525
spec.add_runtime_dependency "jekyll-feed", "~> 0.9"
2626
spec.add_runtime_dependency "jekyll-commonmark", "~> 1.2"
2727
spec.add_runtime_dependency "jekyll-include-cache", "~> 0.1"
28-
spec.add_runtime_dependency "jemoji", "~> 0.9"
28+
spec.add_runtime_dependency "jemoji", "~> 0.11"
2929

3030
spec.add_development_dependency "bundler", "~> 1.14"
3131
end

‎index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,4 +93,4 @@ When using Alembic as a theme means you can take advantage of the file overridin
9393

9494
To add your own styles copy the [`styles.scss`](https://github.com/daviddarnes/alembic/blob/master/assets/styles.scss) into your own project with the same file path (`assets/styles.scss`). From there you can add your own styles, you can even optionally ignore the theme styles by removing the `@import "alembic";` line.
9595

96-
If you're just looking to set your own colours and fonts copy the [`_settings.scss`](https://github.com/daviddarnes/alembic/blob/master/_sass/_settings.scss) file into your project at the same file path (`_sass/_settings.scss`) and change variables however you wish. The settings are a mixture of custom variables and settings from [Sassline](https://medium.com/@jakegiltsoff/sassline-v2-0-e424b2881e7e) - follow the link to find out how to configure the typographic settings.
96+
If you're looking to set your own colours and fonts you can overwrite them by matching the variable names from the [`_settings.scss`](https://github.com/daviddarnes/alembic/blob/master/_sass/_settings.scss) file in your own `styles.scss`, make sure to state them before the `@import "alembic";` line so they take effect. The settings are a mixture of custom variables and settings from [Sassline](https://medium.com/@jakegiltsoff/sassline-v2-0-e424b2881e7e) - follow the link to find out how to configure 31DE the typographic settings.

0 commit comments

Comments
 (0)
0