Skip to content

Commit

Permalink
段落ブロックスタイルのパディングのimportant解除
Browse files Browse the repository at this point in the history
  • Loading branch information
yhira committed Jun 5, 2023
1 parent acad45d commit 7378531
Show file tree
Hide file tree
Showing 5 changed files with 61 additions and 22 deletions.
14 changes: 10 additions & 4 deletions amp.css
Expand Up @@ -2664,10 +2664,16 @@ label.screen-reader-text {
.has-box-style {
padding: var(--cocoon-box-padding);
}
.has-box-style.has-background {
padding: var(--cocoon-box-padding);
}

.has-border {
padding: var(--cocoon-box-padding);
}
.has-border.has-background {
padding: var(--cocoon-box-padding);
}

/*拡張クラスを追加するスタイルシート*/
.badge,
Expand Down Expand Up @@ -2925,7 +2931,7 @@ label.screen-reader-text {
.memo-box,
.comment-box,
.common-icon-box {
padding: 20px 20px 20px 72px;
--cocoon-box-padding: 20px 20px 20px 72px;
border-radius: 4px;
position: relative;
display: block;
Expand Down Expand Up @@ -9564,7 +9570,7 @@ https://codepen.io/nxworld/pen/oLdoWb

.is-style-stapler-box {
position: relative;
padding: 35px 20px 15px;
--cocoon-box-padding: 35px 20px 15px;
border: 1px solid #ccc;
box-shadow: 1px 1px 2px #ccc;
}
Expand All @@ -9590,7 +9596,7 @@ https://codepen.io/nxworld/pen/oLdoWb

.is-style-stapler-top-left-box {
position: relative;
padding: 20px 20px 20px 35px;
--cocoon-box-padding: 20px 20px 20px 35px;
background-color: #fff;
color: #555555;
border: 1px solid #ccc;
Expand All @@ -9611,7 +9617,7 @@ https://codepen.io/nxworld/pen/oLdoWb

.is-style-hole-punch-box {
position: relative;
padding: 40px 20px 15px;
--cocoon-box-padding: 40px 20px 15px;
border: 1px solid #ccc;
box-shadow: 1px 1px 2px #ccc;
}
Expand Down
36 changes: 27 additions & 9 deletions css/admin.css
Expand Up @@ -2937,9 +2937,15 @@ body.wp-admin {
.admin-settings .demo .has-box-style {
padding: var(--cocoon-box-padding);
}
.admin-settings .demo .has-box-style.has-background {
padding: var(--cocoon-box-padding);
}
.admin-settings .demo .has-border {
padding: var(--cocoon-box-padding);
}
.admin-settings .demo .has-border.has-background {
padding: var(--cocoon-box-padding);
}
.admin-settings .demo .badge,
.admin-settings .demo .ref,
.admin-settings .demo .reffer,
Expand Down Expand Up @@ -3138,7 +3144,7 @@ body.wp-admin {
.admin-settings .demo .memo-box,
.admin-settings .demo .comment-box,
.admin-settings .demo .common-icon-box {
padding: 20px 20px 20px 72px;
--cocoon-box-padding: 20px 20px 20px 72px;
border-radius: 4px;
position: relative;
display: block;
Expand Down Expand Up @@ -8973,7 +8979,7 @@ body.wp-admin {
}
.admin-settings .demo .is-style-stapler-box {
position: relative;
padding: 35px 20px 15px;
--cocoon-box-padding: 35px 20px 15px;
border: 1px solid #ccc;
box-shadow: 1px 1px 2px #ccc;
}
Expand All @@ -8995,7 +9001,7 @@ body.wp-admin {
}
.admin-settings .demo .is-style-stapler-top-left-box {
position: relative;
padding: 20px 20px 20px 35px;
--cocoon-box-padding: 20px 20px 20px 35px;
background-color: #fff;
color: #555555;
border: 1px solid #ccc;
Expand All @@ -9014,7 +9020,7 @@ body.wp-admin {
}
.admin-settings .demo .is-style-hole-punch-box {
position: relative;
padding: 40px 20px 15px;
--cocoon-box-padding: 40px 20px 15px;
border: 1px solid #ccc;
box-shadow: 1px 1px 2px #ccc;
}
Expand Down Expand Up @@ -11251,9 +11257,15 @@ body.wp-admin {
.admin-settings .demo .has-box-style {
padding: var(--cocoon-box-padding);
}
.admin-settings .demo .has-box-style.has-background {
padding: var(--cocoon-box-padding);
}
.admin-settings .demo .has-border {
padding: var(--cocoon-box-padding);
}
.admin-settings .demo .has-border.has-background {
padding: var(--cocoon-box-padding);
}
.admin-settings .demo .badge,
.admin-settings .demo .ref,
.admin-settings .demo .reffer,
Expand Down Expand Up @@ -11452,7 +11464,7 @@ body.wp-admin {
.admin-settings .demo .memo-box,
.admin-settings .demo .comment-box,
.admin-settings .demo .common-icon-box {
padding: 20px 20px 20px 72px;
--cocoon-box-padding: 20px 20px 20px 72px;
border-radius: 4px;
position: relative;
display: block;
Expand Down Expand Up @@ -17287,7 +17299,7 @@ body.wp-admin {
}
.admin-settings .demo .is-style-stapler-box {
position: relative;
padding: 35px 20px 15px;
--cocoon-box-padding: 35px 20px 15px;
border: 1px solid #ccc;
box-shadow: 1px 1px 2px #ccc;
}
Expand All @@ -17309,7 +17321,7 @@ body.wp-admin {
}
.admin-settings .demo .is-style-stapler-top-left-box {
position: relative;
padding: 20px 20px 20px 35px;
--cocoon-box-padding: 20px 20px 20px 35px;
background-color: #fff;
color: #555555;
border: 1px solid #ccc;
Expand All @@ -17328,7 +17340,7 @@ body.wp-admin {
}
.admin-settings .demo .is-style-hole-punch-box {
position: relative;
padding: 40px 20px 15px;
--cocoon-box-padding: 40px 20px 15px;
border: 1px solid #ccc;
box-shadow: 1px 1px 2px #ccc;
}
Expand Down Expand Up @@ -20347,9 +20359,15 @@ textarea[name="the_page_memo"] {
.components-popover__content .has-box-style {
padding: var(--cocoon-box-padding);
}
.components-popover__content .has-box-style.has-background {
padding: var(--cocoon-box-padding);
}
.components-popover__content .has-border {
padding: var(--cocoon-box-padding);
}
.components-popover__content .has-border.has-background {
padding: var(--cocoon-box-padding);
}
.components-popover__content .admin-settings .demo .badge, .admin-settings .demo .components-popover__content .badge,
.components-popover__content .admin-settings .demo .ref,
.admin-settings .demo .components-popover__content .ref,
Expand Down Expand Up @@ -20554,7 +20572,7 @@ textarea[name="the_page_memo"] {
.components-popover__content .memo-box,
.components-popover__content .comment-box,
.components-popover__content .common-icon-box {
padding: 20px 20px 20px 72px;
--cocoon-box-padding: 20px 20px 20px 72px;
border-radius: 4px;
position: relative;
display: block;
Expand Down
10 changes: 6 additions & 4 deletions scss/_box-style.scss
Expand Up @@ -174,7 +174,8 @@
// ホチキス
.is-style-stapler-box {
position: relative;
padding: 35px 20px 15px;
--cocoon-box-padding: 35px 20px 15px;
// padding: 35px 20px 15px;
border: 1px solid #ccc;
box-shadow: 1px 1px 2px #ccc;
}
Expand All @@ -194,7 +195,8 @@
// ホチキス左上
.is-style-stapler-top-left-box {
position: relative;
padding: 20px 20px 20px 35px;
--cocoon-box-padding: 20px 20px 20px 35px;
// padding: 20px 20px 20px 35px;
background-color: #fff;
color: #555555;
border: 1px solid #ccc;
Expand All @@ -215,8 +217,8 @@
// 穴あけパンチ
.is-style-hole-punch-box {
position: relative;
padding: 40px 20px 15px;
// background-color: #fffffc;
--cocoon-box-padding: 40px 20px 15px;
// padding: 40px 20px 15px;
border: 1px solid #ccc;
box-shadow: 1px 1px 2px #ccc;
}
Expand Down
9 changes: 8 additions & 1 deletion scss/_extension.scss
@@ -1,10 +1,16 @@
//ボックスのスタイル装飾
.has-box-style{
padding: var(--cocoon-box-padding);
&.has-background{
padding: var(--cocoon-box-padding);
}
}
//ボックスのボーダー装飾
.has-border{
padding: var(--cocoon-box-padding);
&.has-background{
padding: var(--cocoon-box-padding);
}
}

/*拡張クラスを追加するスタイルシート*/
Expand Down Expand Up @@ -242,7 +248,8 @@ $marker_u_blue: $marker_blue;
.comment-box,
.common-icon-box{
//background-color: #F4F3EB;
padding: 20px 20px 20px 72px;
--cocoon-box-padding: 20px 20px 20px 72px;
// padding: 20px 20px 20px 72px;
border-radius: 4px;
position: relative;
display: block;
Expand Down
14 changes: 10 additions & 4 deletions style.css
Expand Up @@ -2689,10 +2689,16 @@ label.screen-reader-text {
.has-box-style {
padding: var(--cocoon-box-padding);
}
.has-box-style.has-background {
padding: var(--cocoon-box-padding);
}

.has-border {
padding: var(--cocoon-box-padding);
}
.has-border.has-background {
padding: var(--cocoon-box-padding);
}

/*拡張クラスを追加するスタイルシート*/
.badge,
Expand Down Expand Up @@ -2950,7 +2956,7 @@ label.screen-reader-text {
.memo-box,
.comment-box,
.common-icon-box {
padding: 20px 20px 20px 72px;
--cocoon-box-padding: 20px 20px 20px 72px;
border-radius: 4px;
position: relative;
display: block;
Expand Down Expand Up @@ -9589,7 +9595,7 @@ https://codepen.io/nxworld/pen/oLdoWb

.is-style-stapler-box {
position: relative;
padding: 35px 20px 15px;
--cocoon-box-padding: 35px 20px 15px;
border: 1px solid #ccc;
box-shadow: 1px 1px 2px #ccc;
}
Expand All @@ -9615,7 +9621,7 @@ https://codepen.io/nxworld/pen/oLdoWb

.is-style-stapler-top-left-box {
position: relative;
padding: 20px 20px 20px 35px;
--cocoon-box-padding: 20px 20px 20px 35px;
background-color: #fff;
color: #555555;
border: 1px solid #ccc;
Expand All @@ -9636,7 +9642,7 @@ https://codepen.io/nxworld/pen/oLdoWb

.is-style-hole-punch-box {
position: relative;
padding: 40px 20px 15px;
--cocoon-box-padding: 40px 20px 15px;
border: 1px solid #ccc;
box-shadow: 1px 1px 2px #ccc;
}
Expand Down

0 comments on commit 7378531

Please sign in to comment.