aboutsummaryrefslogtreecommitdiff
path: root/_scss
diff options
context:
space:
mode:
Diffstat (limited to '_scss')
-rw-r--r--_scss/base/_bootstrap.scss3
-rw-r--r--_scss/base/_main.scss2
-rw-r--r--_scss/base/_normalize.scss1
-rw-r--r--_scss/base/_sakura.scss (renamed from _scss/sakura/_theme.scss)2
m---------_scss/bootstrap0
m---------_scss/bootswatch0
-rw-r--r--_scss/components/_github.scss4
-rw-r--r--_scss/components/_image.scss4
8 files changed, 3 insertions, 13 deletions
diff --git a/_scss/base/_bootstrap.scss b/_scss/base/_bootstrap.scss
deleted file mode 100644
index e608e9f..0000000
--- a/_scss/base/_bootstrap.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-@import 'bootswatch/cosmo/_variables.scss';
-@import 'bootstrap/assets/stylesheets/bootstrap';
-@import 'bootswatch/cosmo/_bootswatch.scss';
diff --git a/_scss/base/_main.scss b/_scss/base/_main.scss
index d84c289..810b2d4 100644
--- a/_scss/base/_main.scss
+++ b/_scss/base/_main.scss
@@ -1,3 +1 @@
@import 'components/core';
-@import 'components/github';
-@import 'components/image';
diff --git a/_scss/base/_normalize.scss b/_scss/base/_normalize.scss
new file mode 100644
index 0000000..b96534d
--- /dev/null
+++ b/_scss/base/_normalize.scss
@@ -0,0 +1 @@
+@import 'normalize/main';
diff --git a/_scss/sakura/_theme.scss b/_scss/base/_sakura.scss
index f248c15..5a6edcb 100644
--- a/_scss/sakura/_theme.scss
+++ b/_scss/base/_sakura.scss
@@ -6,3 +6,5 @@ $color-text: #4a4a4a;
$font-family-sans-serif: Verdana, Geneva, sans-serif;
$font-family-serif: serif;
$font-size-base: 1.8rem;
+
+@import 'sakura/main';
diff --git a/_scss/bootstrap b/_scss/bootstrap
deleted file mode 160000
-Subproject 5d6b2ebba0c2a5885ce2f0e01e9218db3d3b5e4
diff --git a/_scss/bootswatch b/_scss/bootswatch
deleted file mode 160000
-Subproject 4b0d3762f309326a6d66fa4ea18945a7fc11f8e
diff --git a/_scss/components/_github.scss b/_scss/components/_github.scss
deleted file mode 100644
index 87c0b27..0000000
--- a/_scss/components/_github.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-.github-avatar {
- max-height: 16px;
- max-width: 16px;
-}
diff --git a/_scss/components/_image.scss b/_scss/components/_image.scss
deleted file mode 100644
index c2f15eb..0000000
--- a/_scss/components/_image.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-img {
- max-width: 100%;
- width: auto;
-}