diff --git a/html/template/admin/assets/css/app.css b/html/template/admin/assets/css/app.css index b070f4bdafe..eaf7a0e3faf 100755 --- a/html/template/admin/assets/css/app.css +++ b/html/template/admin/assets/css/app.css @@ -820,6 +820,7 @@ Styleguide 7.0 display: flex; flex-wrap: wrap; align-items: start; + margin-top: 5px; margin-bottom: 0; } .c-directoryTree li > a, .c-directoryTree li span { @@ -829,33 +830,25 @@ Styleguide 7.0 .c-directoryTree ul { width: 100%; } -.c-directoryTree > ul { - margin-bottom: 0.5em; +.c-directoryTree > ul ul { + margin-left: 10px; } .c-directoryTree ul > li > ul li > label { - margin-left: 10px; + padding-left: 20px; position: relative; } -.c-directoryTree ul > li > ul li:not(:last-of-type) > label::before { - margin-left: 2px; - margin-right: 0.5em; - content: "├"; - display: inline-block; +.c-directoryTree ul > li > ul li > label:before { + display: block; width: 1em; height: 1em; + position: absolute; + left: 0; +} +.c-directoryTree ul > li > ul li:not(:last-of-type) > label::before { + content: "├"; } .c-directoryTree ul > li > ul li:last-of-type > label::before { - margin-right: 0.6em; content: "└"; - display: inline-block; - width: 1em; - height: 1em; -} -.c-directoryTree ul > li ul > li ul li > label { - margin-left: 20px; -} -.c-directoryTree ul > li ul > li ul > li ul li > label { - margin-left: 30px; } .c-directoryTree label::before { content: "\f146"; @@ -865,21 +858,8 @@ Styleguide 7.0 font-size: 16px; font-weight: 400; } -.c-directoryTree label[data-toggle=collapse]::before { - content: "\f146"; - display: inline-block; - margin-right: 0.5em; - font-family: "Font Awesome 5 Free"; - font-size: 16px; - font-weight: 400; -} .c-directoryTree label.collapsed::before { content: "\f0fe"; - display: inline-block; - margin-right: 0.5em; - font-family: "Font Awesome 5 Free"; - font-size: 16px; - font-weight: 400; } .c-directoryTree ul > li > ul label::after { content: "\f146"; @@ -888,46 +868,6 @@ Styleguide 7.0 font-family: "Font Awesome 5 Free"; font-size: 16px; font-weight: 400; - position: absolute; - left: 20px; -} -.c-directoryTree ul > li > ul label[data-toggle=collapse]::after { - content: "\f146"; - display: inline-block; - margin-right: 0.5em; - font-family: "Font Awesome 5 Free"; - font-size: 16px; - font-weight: 400; - position: absolute; - left: 20px; -} -.c-directoryTree ul > li > ul label.collapsed::after { - content: "\f0fe"; - display: inline-block; - margin-right: 0.5em; - font-family: "Font Awesome 5 Free"; - font-size: 16px; - font-weight: 400; - position: absolute; - left: 20px; -} -.c-directoryTree ul > li > ul li:not(:last-of-type) > label:before, .c-directoryTree ul > li > ul li:last-of-type > label:before { - margin-right: 1.6em; -} -.c-directoryTree label::before { - content: "\f146"; -} -.c-directoryTree label[data-toggle=collapse]::before { - content: "\f146"; -} -.c-directoryTree label.collapsed::before { - content: "\f0fe"; -} -.c-directoryTree ul > li > ul label::after { - content: "\f146"; -} -.c-directoryTree ul > li > ul label[data-toggle=collapse]::after { - content: "\f146"; } .c-directoryTree ul > li > ul label.collapsed::after { content: "\f0fe"; @@ -957,6 +897,7 @@ Styleguide 7.1 display: flex; flex-wrap: wrap; align-items: start; + margin-top: 5px; margin-bottom: 0; } .c-directoryTree--register li > a, .c-directoryTree--register li span { @@ -966,37 +907,30 @@ Styleguide 7.1 .c-directoryTree--register ul { width: 100%; } -.c-directoryTree--register > ul { - margin-bottom: 0.5em; +.c-directoryTree--register > ul ul { + margin-left: 10px; } .c-directoryTree--register ul > li > ul li > label { - margin-left: 10px; + padding-left: 20px; position: relative; } -.c-directoryTree--register ul > li > ul li:not(:last-of-type) > label::before { - margin-left: 2px; - margin-right: 0.5em; - content: "├"; - display: inline-block; +.c-directoryTree--register ul > li > ul li > label:before { + display: block; width: 1em; height: 1em; + position: absolute; + left: 0; +} +.c-directoryTree--register ul > li > ul li:not(:last-of-type) > label::before { + content: "├"; } .c-directoryTree--register ul > li > ul li:last-of-type > label::before { - margin-right: 0.6em; content: "└"; - display: inline-block; - width: 1em; - height: 1em; -} -.c-directoryTree--register ul > li ul > li ul li > label { - margin-left: 20px; -} -.c-directoryTree--register ul > li ul > li ul > li ul li > label { - margin-left: 30px; } .c-directoryTree--register input { display: block; margin-right: 10px; + margin-top: 0.2em; } .c-directoryTree--register label { flex: 1; @@ -1018,6 +952,7 @@ Styleguide 7.2 display: flex; flex-wrap: wrap; align-items: start; + margin-top: 5px; margin-bottom: 0; } .c-directoryTree--folder li > a, .c-directoryTree--folder li span { @@ -1027,33 +962,25 @@ Styleguide 7.2 .c-directoryTree--folder ul { width: 100%; } -.c-directoryTree--folder > ul { - margin-bottom: 0.5em; +.c-directoryTree--folder > ul ul { + margin-left: 10px; } .c-directoryTree--folder ul > li > ul li > label { - margin-left: 10px; + padding-left: 20px; position: relative; } -.c-directoryTree--folder ul > li > ul li:not(:last-of-type) > label::before { - margin-left: 2px; - margin-right: 0.5em; - content: "├"; - display: inline-block; +.c-directoryTree--folder ul > li > ul li > label:before { + display: block; width: 1em; height: 1em; + position: absolute; + left: 0; +} +.c-directoryTree--folder ul > li > ul li:not(:last-of-type) > label::before { + content: "├"; } .c-directoryTree--folder ul > li > ul li:last-of-type > label::before { - margin-right: 0.6em; content: "└"; - display: inline-block; - width: 1em; - height: 1em; -} -.c-directoryTree--folder ul > li ul > li ul li > label { - margin-left: 20px; -} -.c-directoryTree--folder ul > li ul > li ul > li ul li > label { - margin-left: 30px; } .c-directoryTree--folder label::before { content: "\f146"; @@ -1063,21 +990,8 @@ Styleguide 7.2 font-size: 16px; font-weight: 400; } -.c-directoryTree--folder label[data-toggle=collapse]::before { - content: "\f146"; - display: inline-block; - margin-right: 0.5em; - font-family: "Font Awesome 5 Free"; - font-size: 16px; - font-weight: 400; -} .c-directoryTree--folder label.collapsed::before { content: "\f0fe"; - display: inline-block; - margin-right: 0.5em; - font-family: "Font Awesome 5 Free"; - font-size: 16px; - font-weight: 400; } .c-directoryTree--folder ul > li > ul label::after { content: "\f146"; @@ -1086,45 +1000,17 @@ Styleguide 7.2 font-family: "Font Awesome 5 Free"; font-size: 16px; font-weight: 400; - position: absolute; - left: 20px; -} -.c-directoryTree--folder ul > li > ul label[data-toggle=collapse]::after { - content: "\f146"; - display: inline-block; - margin-right: 0.5em; - font-family: "Font Awesome 5 Free"; - font-size: 16px; - font-weight: 400; - position: absolute; - left: 20px; } .c-directoryTree--folder ul > li > ul label.collapsed::after { content: "\f0fe"; - display: inline-block; - margin-right: 0.5em; - font-family: "Font Awesome 5 Free"; - font-size: 16px; - font-weight: 400; - position: absolute; - left: 20px; -} -.c-directoryTree--folder ul > li > ul li:not(:last-of-type) > label:before, .c-directoryTree--folder ul > li > ul li:last-of-type > label:before { - margin-right: 1.6em; } .c-directoryTree--folder label::before { - content: "\f07b"; -} -.c-directoryTree--folder label[data-toggle=collapse]::before { content: "\f07c"; } .c-directoryTree--folder label.collapsed::before { content: "\f07b"; } .c-directoryTree--folder ul > li > ul label::after { - content: "\f07b"; -} -.c-directoryTree--folder ul > li > ul label[data-toggle=collapse]::after { content: "\f07c"; } .c-directoryTree--folder ul > li > ul label.collapsed::after { diff --git a/html/template/admin/assets/scss/component/_directory.scss b/html/template/admin/assets/scss/component/_directory.scss index f421be64949..19652ad8b5f 100755 --- a/html/template/admin/assets/scss/component/_directory.scss +++ b/html/template/admin/assets/scss/component/_directory.scss @@ -6,6 +6,7 @@ display: flex; flex-wrap: wrap; align-items: start; + margin-top: 5px; margin-bottom: 0; > a, span { flex: 1; @@ -16,41 +17,28 @@ width: 100%; } > ul { - margin-bottom: 0.5em; + ul { + margin-left: 10px; + } } //2層目以降 ul >li > ul { li > label { - margin-left: 10px; + padding-left: 20px; position: relative; + &:before { + display: block; + width: 1em; + height: 1em; + position: absolute; + left: 0; + } } li:not(:last-of-type) > label::before { - margin-left: 2px; - margin-right: .5em; content: "├"; - display: inline-block; - width: 1em; - height: 1em; } li:last-of-type > label::before { - margin-right: .6em; content: "└"; - display: inline-block; - width: 1em; - height: 1em; - } - } - - //3層目 - ul >li ul >li ul { - li > label { - margin-left: 20px; - } - } - //4層目 - ul >li ul >li ul > li ul { - li > label { - margin-left: 30px; } } } @@ -67,28 +55,13 @@ font-size: 16px; font-weight: 400; } - } - label[data-toggle="collapse"] { - &::before { - content: "\f146"; - display: inline-block; - margin-right: .5em; - font-family: 'Font Awesome 5 Free'; - font-size: 16px; - font-weight: 400; + &.collapsed { + &::before { + content: "\f0fe"; + } } } - label.collapsed { - &::before { - content: "\f0fe"; - display: inline-block; - margin-right: .5em; - font-family: 'Font Awesome 5 Free'; - font-size: 16px; - font-weight: 400; - } - } //2層目以降 ul >li > ul { label { @@ -99,43 +72,14 @@ font-family: 'Font Awesome 5 Free'; font-size: 16px; font-weight: 400; - position: absolute; - left: 20px; - } - } - label[data-toggle="collapse"] { - &::after { - content: "\f146"; - display: inline-block; - margin-right: .5em; - font-family: 'Font Awesome 5 Free'; - font-size: 16px; - font-weight: 400; - position: absolute; - left: 20px; - } - } - label.collapsed { - &::after { - content: "\f0fe"; - display: inline-block; - margin-right: .5em; - font-family: 'Font Awesome 5 Free'; - font-size: 16px; - font-weight: 400; - position: absolute; - left: 20px; } - } - li { - &:not(:last-of-type), &:last-of-type { - > label:before { - margin-right: 1.6em; + &.collapsed { + &::after { + content: "\f0fe"; } } } } - } /* ディレクトリツリー @@ -151,40 +95,6 @@ Styleguide 7.0 .c-directoryTree { @include directoryTree(); @include directoryLabelIcon(); - //1層目 - label { - &::before { - content: "\f146"; - } - } - label[data-toggle="collapse"] { - &::before { - content: "\f146"; - } - } - label.collapsed { - &::before { - content: "\f0fe"; - } - } - //2層目以降 - ul >li > ul { - label { - &::after { - content: "\f146"; - } - } - label[data-toggle="collapse"] { - &::after { - content: "\f146"; - } - } - label.collapsed { - &::after { - content: "\f0fe"; - } - } - } } @@ -212,6 +122,7 @@ Styleguide 7.1 input { display: block; margin-right: 10px; + margin-top: 0.2em; } label { flex: 1; @@ -237,36 +148,26 @@ Styleguide 7.2 @include directoryLabelIcon(); //1層目 label { - &::before { - content: "\f07b"; - } - } - label[data-toggle="collapse"] { &::before { content: "\f07c"; } - } - label.collapsed { - &::before { - content: "\f07b"; + &.collapsed { + &::before { + content: "\f07b"; + } } } //2層目以降 ul >li > ul { label { - &::after { - content: "\f07b"; - } - } - label[data-toggle="collapse"] { &::after { content: "\f07c"; } - } - label.collapsed { - &::after { - content: "\f07b"; + &.collapsed { + &::after { + content: "\f07b"; + } } } }