From 8e511b1bc7ef33c4ed01a8632b6c047461b06c4c Mon Sep 17 00:00:00 2001 From: machida Date: Wed, 28 Jan 2026 10:53:32 +0900 Subject: [PATCH] =?UTF-8?q?reset=E7=B3=BBCSS=E3=82=92=E5=89=8A=E9=99=A4?= =?UTF-8?q?=E3=81=97=E3=80=81Tailwind=E3=81=AEreset=E3=82=92=E4=BD=BF?= =?UTF-8?q?=E3=81=86=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_page-content-header-actions.css | 58 +-- app/assets/stylesheets/atoms/_a-side-nav.css | 12 +- app/assets/stylesheets/common-imports.css | 2 - .../stylesheets/initializers/_reset.css | 114 ------ app/assets/stylesheets/initializers/_ress.css | 331 ------------------ .../stylesheets/initializers/_tailwind.css | 1 - .../stylesheets/shared/blocks/_footprints.css | 7 +- 7 files changed, 46 insertions(+), 479 deletions(-) delete mode 100644 app/assets/stylesheets/initializers/_reset.css delete mode 100644 app/assets/stylesheets/initializers/_ress.css delete mode 100644 app/assets/stylesheets/initializers/_tailwind.css diff --git a/app/assets/stylesheets/application/blocks/page-content/_page-content-header-actions.css b/app/assets/stylesheets/application/blocks/page-content/_page-content-header-actions.css index 54624a54819..5b52a04b831 100644 --- a/app/assets/stylesheets/application/blocks/page-content/_page-content-header-actions.css +++ b/app/assets/stylesheets/application/blocks/page-content/_page-content-header-actions.css @@ -3,14 +3,6 @@ padding-top: .25rem; display: flex; flex-wrap: wrap; - @media (min-width: 40em) { - justify-content: space-between; - gap: .5rem; - } - @media (max-width: 35.9375em) { - justify-content: center; - gap: .25rem; - } } @media (min-width: 40em) { @@ -20,10 +12,11 @@ } } -.page-content-header-actions { - padding-top: .25rem; - display: flex; - flex-wrap: wrap; +@media (max-width: 39.9375em) { + .page-content-header-actions { + justify-content: center; + gap: .25rem; + } } .page-content-header-actions__start { @@ -36,42 +29,53 @@ } @media (min-width: 40em) { - .page-content-header-actions__start, .page-content-header-actions__end { - flex: 1 1; + .page-content-header-actions__start, + .page-content-header-actions__end { + flex: 1; gap: .5rem; } } .page-content-header-actions__end { display: flex; - @media (min-width: 40em) { +} + +@media (min-width: 40em) { + .page-content-header-actions__end { flex: 1; gap: .5rem; + justify-content: flex-end; } - @media (max-width: 35.9375em) { +} + +@media (max-width: 39.9375em) { + .page-content-header-actions__start, + .page-content-header-actions__end { gap: .25rem; } } + .page-content-header-actions__start { justify-content: flex-start; } -.page-content-header-actions__end { - @media (min-width: 40em) { - justify-content: flex-end; - } -} .page-content-header-actions__action { min-width: 5.4rem; - @media (min-width: 48em) { +} + +.page-content-header-actions__action .a-button { + padding-inline: 0; +} + +@media (min-width: 48em) { + .page-content-header-actions__action { min-width: 7rem; } - @media (max-width: 47.9375em) { - width: 50%; - } - .a-button { - padding-inline: 0; +} +@media (max-width: 47.9375em) { + .page-content-header-actions__action { + width: 50%; } } diff --git a/app/assets/stylesheets/atoms/_a-side-nav.css b/app/assets/stylesheets/atoms/_a-side-nav.css index 9941230c0ac..0e8ff4b3401 100644 --- a/app/assets/stylesheets/atoms/_a-side-nav.css +++ b/app/assets/stylesheets/atoms/_a-side-nav.css @@ -1,8 +1,5 @@ .a-side-nav { background-color: var(--base); - border: solid 1px var(--border); - border-radius: 0.25rem; - margin-top: 1rem; } @media (min-width: 64em) { @@ -17,6 +14,15 @@ } } +@media (max-width: 63.9375em) { + .a-side-nav { + margin-top: 1rem; + margin-inline: 1rem; + border-radius: 0.25rem; + border: solid 1px var(--border); + } +} + .a-side-nav__inner { display: flex; flex-direction: column; diff --git a/app/assets/stylesheets/common-imports.css b/app/assets/stylesheets/common-imports.css index 3ad287daf93..cb7bca44dc8 100644 --- a/app/assets/stylesheets/common-imports.css +++ b/app/assets/stylesheets/common-imports.css @@ -1,6 +1,4 @@ @import "./config/variables/_css-variables.css"; -@import "./initializers/_ress.css"; -@import "./initializers/_reset.css"; @import "./config/variables/_fonts.css"; @import "./config/variables/_welcome-colors.css"; @import "./config/variables/_choices.css"; diff --git a/app/assets/stylesheets/initializers/_reset.css b/app/assets/stylesheets/initializers/_reset.css deleted file mode 100644 index 7380f5b34e3..00000000000 --- a/app/assets/stylesheets/initializers/_reset.css +++ /dev/null @@ -1,114 +0,0 @@ -* { - font-family: inherit; - font-size: inherit; - line-height: inherit; -} - -html { - line-height: 1; -} - -[type='color'], -[type='date'], -[type='datetime'], -[type='datetime-local'], -[type='email'], -[type='month'], -[type='number'], -[type='password'], -[type='search'], -[type='tel'], -[type='text'], -[type='time'], -[type='url'], -[type='week'], -input:not([type]), -textarea, -select, -button { - outline: none; -} - -video, -img, -canvas, -iframe { - vertical-align: bottom; - max-width: 100%; -} - -img { - vertical-align: middle; -} - -h1, -h2, -h3, -h4, -h5, -h6, -p, -li { - line-height: inherit; - font-weight: inherit; -} - -table { - border-spacing: 0; - border-collapse: collapse; -} - -ul, -ol { - list-style: none; -} - -input[type='submit'] { - outline: none; -} - -input::placeholder, -textarea::placeholder { - color: var(--placeholder-text); - font-weight: 400; -} - -hr { - border: none; -} - -details, -details *, -summary { - box-sizing: border-box; -} - -a { - color: var(--main); - word-break: break-all; - overflow-wrap: break-word; -} - -body { - min-height: 100vh; - height: 100%; -} - -textarea { - overflow-anchor: none; -} - -p { - word-wrap: break-word; -} - -code, -kbd, -pre, -samp { - font-family: var(--monospace); -} - -em { - font-style: normal; -} diff --git a/app/assets/stylesheets/initializers/_ress.css b/app/assets/stylesheets/initializers/_ress.css deleted file mode 100644 index 0c43a07df77..00000000000 --- a/app/assets/stylesheets/initializers/_ress.css +++ /dev/null @@ -1,331 +0,0 @@ -@charset "UTF-8"; -/*! - * ress.css • v1.2.2 - * MIT License - * github.com/filipelinhares/ress - */ -/* # ================================================================= - # Global selectors - # ================================================================= */ -html { - box-sizing: border-box; - -webkit-text-size-adjust: 100%; /* iOS 8+ */ -} - -body { - overflow-y: scroll; /* All browsers without overlaying scrollbars */ -} - -*, -::before, -::after { - background-repeat: no-repeat; /* Set `background-repeat: no-repeat` to all elements and pseudo elements */ - box-sizing: inherit; -} - -::before, -::after { - text-decoration: inherit; /* Inherit text-decoration and vertical align to ::before and ::after pseudo elements */ - vertical-align: inherit; -} - -* { - padding: 0; /* Reset `padding` and `margin` of all elements */ - margin: 0; -} - -/* # ================================================================= - # General elements - # ================================================================= */ -/* Add the correct display in iOS 4-7.*/ -audio:not([controls]) { - display: none; - height: 0; -} - -hr { - overflow: visible; /* Show the overflow in Edge and IE */ -} - -/* -* Correct `block` display not defined for any HTML5 element in IE 8/9 -* Correct `block` display not defined for `details` or `summary` in IE 10/11 -* and Firefox -* Correct `block` display not defined for `main` in IE 11 -*/ -article, -aside, -details, -figcaption, -figure, -footer, -header, -main, -menu, -nav, -section, -summary { - display: block; -} - -summary { - display: list-item; /* Add the correct display in all browsers */ -} - -small { - font-size: 80%; /* Set font-size to 80% in `small` elements */ -} - -[hidden], -template { - display: none; /* Add the correct display in IE */ -} - -abbr[title] { - border-bottom: 1px dotted; /* Add a bordered underline effect in all browsers */ - text-decoration: none; /* Remove text decoration in Firefox 40+ */ -} - -a { - background-color: transparent; /* Remove the gray background on active links in IE 10 */ - -webkit-text-decoration-skip: objects; /* Remove gaps in links underline in iOS 8+ and Safari 8+ */ -} - -a:active, -a:hover { - outline-width: 0; /* Remove the outline when hovering in all browsers */ -} - -code, -kbd, -pre, -samp { - font-family: monospace; /* Specify the font family of code elements */ -} - -b, -strong { - font-weight: bolder; /* Correct style set to `bold` in Edge 12+, Safari 6.2+, and Chrome 18+ */ -} - -dfn { - font-style: italic; /* Address styling not present in Safari and Chrome */ -} - -/* Address styling not present in IE 8/9 */ -mark { - background-color: #ff0; - color: #000; -} - -/* https://gist.github.com/unruthless/413930 */ -sub, -sup { - font-size: 75%; - line-height: 0; - position: relative; - vertical-align: baseline; -} - -sub { - bottom: -0.25em; -} - -sup { - top: -0.5em; -} - -/* # ================================================================= - # Forms - # ================================================================= */ -input { - border-radius: 0; -} - -/* Apply cursor pointer to button elements */ -button, -[type=button], -[type=reset], -[type=submit], -[role=button] { - cursor: pointer; -} - -/* Replace pointer cursor in disabled elements */ -[disabled] { - cursor: default; -} - -[type=number] { - width: auto; /* Firefox 36+ */ -} - -[type=search] { - -webkit-appearance: textfield; /* Safari 8+ */ -} - -[type=search]::-webkit-search-cancel-button, -[type=search]::-webkit-search-decoration { - -webkit-appearance: none; /* Safari 8 */ -} - -textarea { - overflow: auto; /* Internet Explorer 11+ */ - resize: vertical; /* Specify textarea resizability */ -} - -button, -input, -optgroup, -select, -textarea { - font: inherit; /* Specify font inheritance of form elements */ -} - -optgroup { - font-weight: bold; /* Restore the font weight unset by the previous rule. */ -} - -button { - overflow: visible; /* Address `overflow` set to `hidden` in IE 8/9/10/11 */ -} - -/* Remove inner padding and border in Firefox 4+ */ -button::-moz-focus-inner, -[type=button]::-moz-focus-inner, -[type=reset]::-moz-focus-inner, -[type=submit]::-moz-focus-inner { - border-style: 0; - padding: 0; -} - -/* Replace focus style removed in the border reset above */ -button:-moz-focusring, -[type=button]::-moz-focus-inner, -[type=reset]::-moz-focus-inner, -[type=submit]::-moz-focus-inner { - outline: 1px dotted ButtonText; -} - -button, -html [type=button], -[type=reset], -[type=submit] { - -webkit-appearance: button; /* Correct the inability to style clickable types in iOS */ -} - -button, -select { - text-transform: none; /* Firefox 40+, Internet Explorer 11- */ -} - -/* Remove the default button styling in all browsers */ -button, -input, -select, -textarea { - background-color: transparent; - border-style: none; - color: inherit; -} - -/* Style select like a standard input */ -select { - -moz-appearance: none; /* Firefox 36+ */ - -webkit-appearance: none; /* Chrome 41+ */ -} - -select::-ms-expand { - display: none; /* Internet Explorer 11+ */ -} - -select::-ms-value { - color: currentColor; /* Internet Explorer 11+ */ -} - -legend { - border: 0; /* Correct `color` not being inherited in IE 8/9/10/11 */ - color: inherit; /* Correct the color inheritance from `fieldset` elements in IE */ - display: table; /* Correct the text wrapping in Edge and IE */ - max-width: 100%; /* Correct the text wrapping in Edge and IE */ - white-space: normal; /* Correct the text wrapping in Edge and IE */ -} - -::-webkit-file-upload-button { - -webkit-appearance: button; /* Correct the inability to style clickable types in iOS and Safari */ - font: inherit; /* Change font properties to `inherit` in Chrome and Safari */ -} - -[type=search] { - -webkit-appearance: textfield; /* Correct the odd appearance in Chrome and Safari */ - outline-offset: -2px; /* Correct the outline style in Safari */ -} - -/* # ================================================================= - # Specify media element style - # ================================================================= */ -img { - border-style: none; /* Remove border when inside `a` element in IE 8/9/10 */ -} - -/* Add the correct vertical alignment in Chrome, Firefox, and Opera */ -progress { - vertical-align: baseline; -} - -svg:not(:root) { - overflow: hidden; /* Internet Explorer 11- */ -} - -audio, -canvas, -progress, -video { - display: inline-block; /* Internet Explorer 11+, Windows Phone 8.1+ */ -} - -/* # ================================================================= - # Accessibility - # ================================================================= */ -/* Hide content from screens but not screenreaders */ -@media screen { - [hidden~=screen] { - display: inherit; - } - [hidden~=screen]:not(:active):not(:focus):not(:target) { - position: absolute !important; - clip: rect(0 0 0 0) !important; - } -} -/* Specify the progress cursor of updating elements */ -[aria-busy=true] { - cursor: progress; -} - -/* Specify the pointer cursor of trigger elements */ -[aria-controls] { - cursor: pointer; -} - -/* Specify the unstyled cursor of disabled, not-editable, or otherwise inoperable elements */ -[aria-disabled] { - cursor: default; -} - -/* # ================================================================= - # Selection - # ================================================================= */ -/* Specify text selection background color and omit drop shadow */ -::-moz-selection { - background-color: #b3d4fc; /* Required when declaring ::selection */ - color: #000; - text-shadow: none; -} - -::selection { - background-color: #b3d4fc; /* Required when declaring ::selection */ - color: #000; - text-shadow: none; -} - -/*# sourceMappingURL=_ress.css.map */ diff --git a/app/assets/stylesheets/initializers/_tailwind.css b/app/assets/stylesheets/initializers/_tailwind.css deleted file mode 100644 index 0df3abd06d7..00000000000 --- a/app/assets/stylesheets/initializers/_tailwind.css +++ /dev/null @@ -1 +0,0 @@ -@import "tailwindcss/utilities"; diff --git a/app/assets/stylesheets/shared/blocks/_footprints.css b/app/assets/stylesheets/shared/blocks/_footprints.css index a6003d99541..5a2985a28a5 100644 --- a/app/assets/stylesheets/shared/blocks/_footprints.css +++ b/app/assets/stylesheets/shared/blocks/_footprints.css @@ -17,7 +17,12 @@ display: flex; gap: 0.5rem; flex-wrap: wrap; - margin-top: 0.75rem; +} + +@media (max-width: 47.9375em) { + .user-icons__items { + margin-top: 0.75rem; + } } .user-icons-item {