Skip to content

Commit

Permalink
refactor: stylelintを全ファイルに適用
Browse files Browse the repository at this point in the history
  • Loading branch information
@knknk98 @yuta-ike
knknk98 authored and yuta-ike committed Jan 18, 2022
1 parent a732ccb commit 8af3621
Show file tree
Hide file tree
Showing 14 changed files with 721 additions and 459 deletions.
97 changes: 62 additions & 35 deletions app/front/assets/scss/admin.scss
View file
Original file line number Diff line number Diff line change
@@ -1,83 +1,95 @@
/*管理画面*/
/* 管理画面 */
.drawer-menu-wrapper {
position: fixed;
z-index: $z-modal;
right: 0;
z-index: $z-modal;
display: none;
height: 100%;
background-color: $bg;
word-break: break-all;
display: none;
background-color: $bg;

@media screen and (min-width: $large) {
display: block;
}

.drawer-menu {
padding: 16px 30px;
display: flex;
flex-direction: column;
height: 100%;
width: 100%;
height: 100%;
padding: 16px 30px;

&__header {
display: flex;
flex-direction: column;

.start-button {
display: flex;
justify-content: center;
align-items: center;
justify-content: center;
padding: 1.5rem 0;
margin-top: 2rem;
font-size: 18px;
background-color: white;
border: 1px solid transparent;
border-radius: 4px;
font-size: 18px;
margin-top: 2rem;
transition: all 0.3s;

&__label {
margin-right: 0.5rem;
}

&:hover {
background-color: #fbfbfb;
border-color: $gray;
}
}

.room-info {
flex: 1;
min-width: 0;

.room-title {
font-size: 150%;
}

.room-url {
display: flex;

button {
display: flex;
align-items: center;
padding: 1rem 1.5rem;
margin: 1em 1em 1em 0;
font-size: 14px;
background-color: white;
border: 1px solid transparent;
border-radius: 4px;
font-size: 14px;
transition: all 0s;

&:hover {
background-color: #fbfbfb;
border-color: $gray;
}

.room-text {
text-align: left;
margin-right: 0.5rem;
text-align: left;

& > .bold {
font-weight: bold;
}
}

.copy-button {
border: none;
background: none;
color: $text-gray;

// width: 1.5em;
// height: 1.5em;
align-items: center;
justify-content: center;
color: $text-gray;
background: none;
border: none;

&.check-icon {
color: #3ba73b;
Expand All @@ -87,11 +99,12 @@
}
}
}

&__topic-list {
margin-top: 30px;
// flex: 1 1 0;
overflow-y: scroll;
font-size: 120%;
margin-top: 30px;

.topic {
display: flex;
Expand All @@ -104,61 +117,69 @@

.ongoing {
background-color: white;

.label {
border: solid transparent 2px;
background-color: #f6666e;
color: white;
background-color: #f6666e;
border: solid transparent 2px;
}
}

.paused {
background-color: white;

.label {
box-sizing: border-box;
color: #f6666e;
background-color: white;
border: solid #f6666e 2px;
box-sizing: border-box;
}
}

.finished {
background-color: $gray;
}

.not-started {
background-color: white;
color: $disabled-gray;
background-color: white;
}

.topic-number {
padding-left: 10px;
min-width: 3em;
width: 5%;
min-width: 3em;
padding-left: 10px;
}

.topic-name {
flex: 1 1 0;
display: flex;
flex: 1 1 0;
align-items: center;

.label {
display: inline-block;
flex-shrink: 0;
padding: 0 8px;
margin-left: 1rem;
font-size: 50%;
font-weight: bold;
padding: 0px 8px;
border-radius: 24px;
margin-left: 1rem;
display: inline-block;
vertical-align: middle;
flex-shrink: 0;
border-radius: 24px;
}
}

.topic-infos {
display: flex;
flex-direction: row;
margin-left: 1rem;

.topic-info {
width: 4em;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
justify-content: center;
width: 4em;

& .text-mini {
font-size: 12px;
}
Expand All @@ -169,15 +190,16 @@
display: flex;
justify-content: center;
margin-left: 1rem;

button {
width: 40px;
height: 40px;
display: flex;
align-items: center;
justify-content: center;
border-radius: 100%;
border: none;
width: 40px;
height: 40px;
color: $black;
border: none;
border-radius: 100%;
transition: all 0.1s;

&:hover {
Expand All @@ -198,24 +220,29 @@
}
}
}

&__footer {
margin-top: 1rem;

.end-button {
display: flex;
justify-content: center;
align-items: center;
justify-content: center;
padding: 1em;
background-color: white;
border: 1px solid transparent;
border-radius: 4px;
transition: all 0.2s;

&:hover {
background-color: #fbfbfb;
border-color: $gray;
}

&__icon {
color: #dd4848;
}

&__label {
margin-right: 0.5rem;
}
Expand All @@ -226,6 +253,6 @@

@media screen and (min-width: 880px) {
.room-info {
padding: 0px;
padding: 0;
}
}
2 changes: 1 addition & 1 deletion app/front/assets/scss/app.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
@import "sidebar";
@import "sidebar_drawer";
@import "sushiselect";
@import "lp";
@import "lp";
47 changes: 24 additions & 23 deletions app/front/assets/scss/common.scss
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
body {
font-family: "M PLUS 1p", sans-serif;
touch-action: manipulation; // ダブルタップによるズームは抑止
-webkit-font-smoothing: antialiased;
color: $black;
font-size: 0.9rem;
color: $black;
touch-action: manipulation; // ダブルタップによるズームは抑止
background: white;
-webkit-font-smoothing: antialiased;
}

.material-icons {
Expand All @@ -31,54 +31,54 @@ button {

label {
position: relative;
padding-left: 0;
cursor: pointer;
padding-left: 0px;

& > input[type="checkbox"] {
outline: none;
margin: 0.2rem;
width: 12px;
height: 12px;
margin: 0.2rem;
cursor: pointer;
outline: none;

&:focus-visible::before {
outline: auto;
outline-offset: 2px;
outline-color: blue;
outline-offset: 2px;
}

&::before {
position: absolute;
top: 50%;
left: 0;
transform: translateY(-50%);
opacity: 1;
content: "";
display: inline-block;
height: 16px;
width: 16px;
height: 16px;
content: "";
background: #fff;
border: 1px solid #231815;
border-radius: 1px;
opacity: 1;
transform: translateY(-50%);
}

&:checked::before {
background: rgb(59, 183, 255);
background: rgb(59 183 255);
border-color: transparent;
}

&::after {
position: absolute;
top: 50%;
left: 0;
transform: translateY(-50%);
opacity: 0;
content: "";
display: inline-block;
height: 16px;
width: 16px;
background: white;
height: 16px;
clip-path: polygon(10% 50%, 20% 40%, 45% 60%, 80% 20%, 90% 30%, 45% 83%);
content: "";
background: white;
opacity: 0;
transform: translateY(-50%);
}

&:checked::after {
Expand All @@ -94,27 +94,28 @@ textarea {
}

span.key-span {
background: rgb(110, 110, 110);
color: rgb(243, 243, 243);
border-radius: 1px;
padding: 0 0.4em;
margin: 0 0.2em;
font-weight: bold;
color: rgb(243 243 243);
background: rgb(110 110 110);
border-radius: 1px;
}

.page {
display: flex;
flex-direction: column;
height: 100vh;
min-width: 0;
height: 100vh;

header {
width: 100vw;

button {
float: right;
border: none;
color: rgb(110, 110, 110);
color: rgb(110 110 110);
background-color: white;
border: none;
}
}

Expand Down
Loading

0 comments on commit 8af3621

Please sign in to comment.