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.

Sign up for GitHub

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

メンテナスモードのアラートのスタイル調整 #5506

Merged
merged 1 commit into from
Aug 8, 2022
Merged

メンテナスモードのアラートのスタイル調整 #5506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
211 changes: 105 additions & 106 deletions html/template/default/assets/css/style.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion html/template/default/assets/css/style.css.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion html/template/default/assets/css/style.min.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion html/template/default/assets/css/style.min.css.map
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion html/template/default/assets/scss/component/_1.1.heading.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@import "../mixins/media";
@import "../mixins/variables";
/*
見出し

Expand Down
1 change: 0 additions & 1 deletion html/template/default/assets/scss/component/_2.2.closebutton.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@import "../mixins/variables";
/*
アイコンボタン

Expand Down
1 change: 0 additions & 1 deletion html/template/default/assets/scss/component/_2.3.otherbutton.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@import "../mixins/variables";
@import "../mixins/media";
@import "../mixins/btn";

Expand Down
1 change: 0 additions & 1 deletion html/template/default/assets/scss/component/_3.1.inputText.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@import "../mixins/variables";
@import "../mixins/forms";
@import "../mixins/media";
/*
Expand Down
1 change: 0 additions & 1 deletion html/template/default/assets/scss/component/_4.1.icon.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@import "../mixins/variables";
/*
アイコン

Expand Down
1 change: 0 additions & 1 deletion html/template/default/assets/scss/component/_5.1.grid.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@import "../mixins/variables";
@import "../mixins/clearfix";
@import "../mixins/media";

Expand Down
1 change: 0 additions & 1 deletion html/template/default/assets/scss/component/_5.2.layout.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@import "../mixins/variables";
@import "../mixins/projects";
@import "../mixins/clearfix";
@import "../mixins/media";
Expand Down
1 change: 0 additions & 1 deletion html/template/default/assets/scss/component/_7.2.search.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@import "../mixins/media";
@import "../mixins/variables";
@import "../mixins/projects";

@mixin pager(){
Expand Down
1 change: 0 additions & 1 deletion html/template/default/assets/scss/component/_7.3.cart.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@import "../mixins/variables";
@import "../mixins/media";
@import "../mixins/animation";
@import "../mixins/projects";
Expand Down
1 change: 0 additions & 1 deletion html/template/default/assets/scss/component/_9.1.mypage.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@import "../mixins/projects";
@import "../mixins/variables";
@import "../mixins/media";
/*
マイページ
Expand Down
1 change: 0 additions & 1 deletion html/template/default/assets/scss/mixins/_btn.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@import "../mixins/variables";
@import "../mixins/_projects";
$padding-base-vertical: 6px !default;
$padding-base-horizontal: 12px !default;
Expand Down
15 changes: 0 additions & 15 deletions html/template/default/assets/scss/mixins/_projects.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,6 @@
}
}

//** bootstrap-sass(https://github.com/twbs/bootstrap-sass) からの移植

$font-size-base: 0.875rem;
$font-family-sans-serif: Roboto, "游ゴシック", YuGothic, "Yu Gothic", "ヒラギノ角ゴ ProN W3", "Hiragino Kaku Gothic ProN", Arial, "メイリオ", Meiryo, sans-serif !default;
$line-height-base: 1.428571420 !default; // 20/14
$padding-base-vertical: 6px !default;
$line-height-computed: floor(($font-size-base * $line-height-base)) px !default;
$input-height-base: ($line-height-computed + ($padding-base-vertical * 2) + 2) px !default;
$input-border: #ccc !default;
//** Border color for inputs on focus
$input-border-focus: #66afe9 !default;

//** Placeholder text color
$input-color-placeholder: #999 !default;

@mixin form-control-focus($color: $input-border-focus) {
$color-rgba: rgba(red($color), green($color), blue($color), .6);
&:focus {
Expand Down
15 changes: 14 additions & 1 deletion html/template/default/assets/scss/mixins/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

// MediaQuery
$tablet: 480px;
$desktop: 768px;
Expand All @@ -14,3 +13,17 @@ $clrRightGray: #B8BEC4;
$clrExtraGray: #636378;
$clrDarkGray:#525263;

//** bootstrap-sass(https://github.com/twbs/bootstrap-sass) からの移植

$font-size-base: 0.875rem;
$font-family-sans-serif: Roboto, "游ゴシック", YuGothic, "Yu Gothic", "ヒラギノ角ゴ ProN W3", "Hiragino Kaku Gothic ProN", Arial, "メイリオ", Meiryo, sans-serif !default;
$line-height-base: 1.428571420 !default; // 20/14
$padding-base-vertical: 6px !default;
$line-height-computed: floor(($font-size-base * $line-height-base)) px !default;
$input-height-base: ($line-height-computed + ($padding-base-vertical * 2) + 2) px !default;
$input-border: #ccc !default;
//** Border color for inputs on focus
$input-border-focus: #66afe9 !default;

//** Placeholder text color
$input-color-placeholder: #999 !default;
4 changes: 2 additions & 2 deletions html/template/default/assets/scss/project/_11.2.header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -833,7 +833,7 @@ Styleguide 11.2.7

.ec-maintenanceAlert {
background: steelblue;
height: 5rem;
height: 50px;
position: fixed;
top: 0;
width: 100%;
Expand All @@ -854,6 +854,6 @@ Styleguide 11.2.7
vertical-align: top;
}
& +* {
margin-top: 5rem;
margin-top: 50px;
}
}
1 change: 0 additions & 1 deletion html/template/default/assets/scss/project/_20.1.404.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@import "../mixins/variables";
@import "../mixins/media";
@import "../mixins/animation";
/*
Expand Down
2 changes: 1 addition & 1 deletion html/template/default/assets/scss/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
@import url('../../../../../node_modules/normalize.css/normalize.css');
@import "mixins/variables";
@import "../../../../../node_modules/bootstrap/scss/bootstrap";

body {
font-family: Roboto, "游ゴシック", YuGothic, "Yu Gothic", "ヒラギノ角ゴ ProN W3", "Hiragino Kaku Gothic ProN", Arial, "メイリオ", Meiryo, sans-serif;
color:#525263;
transition: z-index 0ms 5.28455ms;
background: #f6f6f6;
Expand Down