Skip to content
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
7 changes: 6 additions & 1 deletion conf/config.sass
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
// テーマCSSのカスタマイズ (SASS形式)
//
// _default.sass の値を上書きする。@use では他のモジュールの変数を
// default.$name: value の形で書き換える。app.sass が default -> config -> main... の
// 順に @use しているので、上書きは main 以降の評価に反映される。
@use 'default'

$themeColor: #689B8C
default.$themeColor: #689B8C
2 changes: 2 additions & 0 deletions src/sass/_bottom.sass
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
@charset "utf-8"
@use 'default' as *
@use 'functions' as *

/* ページネーション

Expand Down
18 changes: 18 additions & 0 deletions src/sass/_functions.sass
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
@charset "utf-8"
@use "sass:math"
@use 'default' as *

// _main.sass にあった rem()。
// @import なら暗黙で全体から見えていたが、@use では読み込んだ側からしか見えない。
// _main / _top / _side / _result / _bottom から使うのでここへ分けた。
// CSS を出さないモジュールなので、@use する位置は出力順に影響しない。
//
// $standard-rem は呼び出し時に評価されるため、conf 側の config.sass が
// 上書きした値がそのまま効く。

// CSSフレームワークに対応するために演算済みのremを出力する
@function rem($value)
@if $standard-rem == false
@return $value * 1rem
@else
@return math.div(math.ceil($value * 0.625 * 100), 100) * 1rem
10 changes: 2 additions & 8 deletions src/sass/_main.sass
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
@charset "utf-8"
@use "sass:math"

// CSSフレームワークに対応するために演算済みのremを出力する
@function rem($value)
@if $standard-rem == false
@return $value * 1rem
@else
@return math.div(ceil($value * 0.625 * 100) , 100) * 1rem
@use 'default' as *
@use 'functions' as *

*
box-sizing: border-box
Expand Down
1 change: 1 addition & 0 deletions src/sass/_result.sass
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@charset "utf-8"
@use 'functions' as *

/* 検索結果
.emresults
Expand Down
1 change: 1 addition & 0 deletions src/sass/_side.sass
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@charset "utf-8"
@use 'functions' as *

/* サイドバー
.emside
Expand Down
2 changes: 2 additions & 0 deletions src/sass/_top.sass
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
@charset "utf-8"
@use 'default' as *
@use 'functions' as *
@use "sass:math"

/* トップ(検索ボックス)*/
Expand Down
18 changes: 9 additions & 9 deletions src/sass/app.sass
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
@charset "utf-8"

@import 'forced-color'
@import 'default'
@use 'forced-color'
@use 'default'

@import 'config'
@use 'config'

@import 'main'
@import 'top'
@import 'side'
@import 'result'
@import 'bottom'
@use 'main'
@use 'top'
@use 'side'
@use 'result'
@use 'bottom'

@import 'index'
@use 'index'