Merge branch 'develop' into 'master'
投稿画面のUI改造と影関連微修正、オンオフボタンのマテリアル化 See merge request harukin/hubzillatheme!9
This commit is contained in:
harukin
commit
21456f5af3
@ -1163,8 +1163,10 @@ img.mail-conv-sender-photo {
|
||||
|
||||
|
||||
.comment-edit-text {
|
||||
border: 1px solid #ccc;
|
||||
border: 1px solid #f6f6f6;
|
||||
border-radius: $radius;
|
||||
/*カスタマイズ*/
|
||||
transition: all 300ms 0s;
|
||||
}
|
||||
|
||||
.divgrow-showmore {
|
||||
@ -1598,7 +1600,7 @@ dl.bb-dl > dd > li {
|
||||
|
||||
/* Turn checkboxes into switches */
|
||||
.form-group.checkbox > div {
|
||||
position: relative; width: 60px;
|
||||
position: relative; width: 40px;
|
||||
-webkit-user-select:none; -moz-user-select:none; -ms-user-select: none;
|
||||
display:inline-block;
|
||||
}
|
||||
@ -1608,13 +1610,16 @@ dl.bb-dl > dd > li {
|
||||
}
|
||||
|
||||
.form-group.checkbox > div label {
|
||||
/*カスタマイズ*/
|
||||
display: block; overflow: hidden; cursor: pointer;
|
||||
border: 1px solid #ccc;
|
||||
/*border: 1px solid #ccc;*/
|
||||
border-radius: 12px;
|
||||
margin:0px;
|
||||
-webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s;
|
||||
-o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
|
||||
transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
|
||||
height: 12px;
|
||||
width: 35px;
|
||||
}
|
||||
|
||||
.form-group.checkbox:hover label {
|
||||
@ -1632,32 +1637,36 @@ dl.bb-dl > dd > li {
|
||||
}
|
||||
|
||||
.onoffswitch-inner:before, .onoffswitch-inner:after {
|
||||
display: block; float: left; width: 50%; height: 20px; padding: 0; line-height:20px;
|
||||
/*カスタマイズ*/
|
||||
display: flex; float: left; width: 50%; height: 20px; padding: 0; line-height:20px;
|
||||
-moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box;
|
||||
}
|
||||
|
||||
.onoffswitch-inner:before {
|
||||
/*カスタマイズ*/
|
||||
content: attr(data-on);
|
||||
padding-right: 21px;
|
||||
background-color: $item_colour;
|
||||
color: $font_colour;
|
||||
background-color: #A4AFFF;
|
||||
color: rgba(255, 255, 255, 0);
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
.onoffswitch-inner:after {
|
||||
content: attr(data-off);
|
||||
padding-left: 21px;
|
||||
background-color: $item_colour; color: #ccc;
|
||||
background-color: #D5CECE; color: rgba(255, 255, 255, 0);
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
.onoffswitch-switch {
|
||||
display: block; width: 15px; margin:4px;
|
||||
/*カスタマイズ*/
|
||||
display: block; width: 20px; height: 20px;margin:4px;
|
||||
background: #ccc;
|
||||
border-radius: 10px;
|
||||
position: absolute; top: 0; bottom: 0; right: 36px;
|
||||
-moz-transition: all 0.3s ease-in 0s; -webkit-transition: all 0.3s ease-in 0s;
|
||||
-o-transition: all 0.3s ease-in 0s; transition: all 0.3s ease-in 0s;
|
||||
border-radius: 50%;
|
||||
position: absolute; top: -8px; bottom: 0; right: 18px;
|
||||
-moz-transition: all 0.2s ease-in 0s; -webkit-transition: all 0.2s ease-in 0s;
|
||||
-o-transition: all 0.2s ease-in 0s; transition: all 0.2s ease-in 0s;
|
||||
filter: drop-shadow(0px 0px 2px rgba(42, 42, 42, 0.94));
|
||||
}
|
||||
|
||||
.form-group.checkbox > div > input:checked + label .onoffswitch-inner {
|
||||
@ -1671,8 +1680,9 @@ dl.bb-dl > dd > li {
|
||||
|
||||
|
||||
.form-group.checkbox > div > input:disabled + label .onoffswitch-switch {
|
||||
background-color: red;
|
||||
opacity: 0.3;
|
||||
/*カスタマイズ*/
|
||||
background-color: #898989;
|
||||
/*opacity: 0.3;*/
|
||||
filter:alpha(opacity=30);
|
||||
}
|
||||
|
||||
@ -1794,24 +1804,17 @@ dl.bb-dl > dd > li {
|
||||
.toplevel_item > .wall-item-outside-wrapper .wall-item-name {
|
||||
font-size: 1.2rem;
|
||||
}
|
||||
.toplevel_item , #notifications {
|
||||
.toplevel_item , #notifications , #profile-jot-wrapper{
|
||||
box-shadow: 0px 0px 5px 2px rgba(75, 75, 75, 0.3);
|
||||
transition: all 300ms 0s;
|
||||
}
|
||||
.toplevel_item:hover , #notifications:hover{
|
||||
.toplevel_item:hover , #notifications:hover , #profile-jot-wrapper:hover{
|
||||
box-shadow: 0px 0px 5px 2px rgba(75, 75, 75, 0.5);
|
||||
}
|
||||
.dropdown-menu {
|
||||
filter: drop-shadow(0px 0px 5px rgba(75, 75, 75, 0.48));
|
||||
}
|
||||
|
||||
#profile-jot-wrapper {
|
||||
filter: drop-shadow(0px 0px 7px rgba(75, 75, 75, 0.48));
|
||||
}
|
||||
#profile-jot-wrapper:hover {
|
||||
filter: drop-shadow(0px 0px 7px rgba(75, 75, 75, 0.678));
|
||||
}
|
||||
|
||||
.bootstrap-tagsinput {
|
||||
background-color: #000
|
||||
}
|
||||
@ -1823,9 +1826,37 @@ dl.bb-dl > dd > li {
|
||||
background-color: $comment_item_colour !important;
|
||||
}
|
||||
|
||||
.modal-open{
|
||||
overflow: unset !important;
|
||||
}
|
||||
.modal-backdrop{
|
||||
display: none;
|
||||
}
|
||||
|
||||
.modal-content{
|
||||
filter: drop-shadow(0px 0px 7px rgba(75, 75, 75, 0.678));
|
||||
border: none;
|
||||
}
|
||||
|
||||
#profile-jot-submit-wrapper .btn-outline-secondary:not([data-dismiss]){
|
||||
border: unset;
|
||||
border-radius: 50% !important;
|
||||
width: 2.5rem;
|
||||
height: 2.5rem;
|
||||
}
|
||||
.btn-primary{
|
||||
border-radius: 15% !important;
|
||||
width: 50%;
|
||||
}
|
||||
|
||||
a[title*="harukin@plus.haruk.in"]{
|
||||
color: rgb(170, 2, 2);
|
||||
}
|
||||
a[title*="harukin@plus.haruk.in"]::after{
|
||||
content: 'っ[鯖主]';
|
||||
font-size: 80%;
|
||||
font-style: italic;
|
||||
}
|
||||
|
||||
a[title*="mstdn.y-zu.org"]{
|
||||
color: rgb(62, 175, 58);
|
||||
@ -1840,7 +1871,9 @@ a[title*="mstdn.y-zu.org"]::before{
|
||||
background-size: contain;
|
||||
}
|
||||
a[title*="mstdn.y-zu.org"]::after{
|
||||
content: 'from Yづドン！';
|
||||
content: 'っ[Yづドン！]';
|
||||
font-size: 80%;
|
||||
font-style: italic;
|
||||
}
|
||||
|
||||
a[title*="itabashi.0j0.jp"]{
|
||||
@ -1856,7 +1889,9 @@ a[title*="itabashi.0j0.jp"]::before{
|
||||
background-size: contain;
|
||||
}
|
||||
a[title*="itabashi.0j0.jp"]::after{
|
||||
content: 'from 板橋丼';
|
||||
content: 'っ[板橋丼]';
|
||||
font-size: 80%;
|
||||
font-style: italic;
|
||||
}
|
||||
|
||||
a[title*="mstdn.jp"]{
|
||||
@ -1872,7 +1907,9 @@ a[title*="mstdn.jp"]::before{
|
||||
background-size: contain;
|
||||
}
|
||||
a[title*="mstdn.jp"]::after{
|
||||
content: 'from mstdn.jp';
|
||||
content: 'っ[mstdn.jp]';
|
||||
font-size: 80%;
|
||||
font-style: italic;
|
||||
}
|
||||
|
||||
a[title*="odakyu.app"]{
|
||||
@ -1888,7 +1925,9 @@ a[title*="odakyu.app"]::before{
|
||||
background-size: contain;
|
||||
}
|
||||
a[title*="odakyu.app"]::after{
|
||||
content: 'from 小田急don';
|
||||
content: 'っ[小田急don]';
|
||||
font-size: 80%;
|
||||
font-style: italic;
|
||||
}
|
||||
|
||||
a[title*="kirishima.cloud"]{
|
||||
@ -1904,7 +1943,9 @@ a[title*="kirishima.cloud"]::before{
|
||||
background-size: contain;
|
||||
}
|
||||
a[title*="kirishima.cloud"]::after{
|
||||
content: 'from アスタルテ';
|
||||
content: 'っ[アスタルテ]';
|
||||
font-size: 80%;
|
||||
font-style: italic;
|
||||
}
|
||||
|
||||
a[title*="oransns.com"]{
|
||||
@ -1920,7 +1961,9 @@ a[title*="oransns.com"]::before{
|
||||
background-size: contain;
|
||||
}
|
||||
a[title*="oransns.com"]::after{
|
||||
content: 'from おらんSNS';
|
||||
content: 'っ[おらんSNS]';
|
||||
font-size: 80%;
|
||||
font-style: italic;
|
||||
}
|
||||
|
||||
a[title*="mstdn.mimikun.jp"]{
|
||||
@ -1936,7 +1979,9 @@ a[title*="mstdn.mimikun.jp"]::before{
|
||||
background-size: contain;
|
||||
}
|
||||
a[title*="mstdn.mimikun.jp"]::after{
|
||||
content: 'from mimikun丼';
|
||||
content: 'っ[mimikun丼]';
|
||||
font-size: 80%;
|
||||
font-style: italic;
|
||||
}
|
||||
|
||||
a[title*="pawoo.net"]{
|
||||
@ -1952,5 +1997,11 @@ a[title*="pawoo.net"]::before{
|
||||
background-size: contain;
|
||||
}
|
||||
a[title*="pawoo.net"]::after{
|
||||
content: 'from Pawoo';
|
||||
content: 'っ[Pawoo]';
|
||||
font-size: 80%;
|
||||
font-style: italic;
|
||||
}
|
||||
|
||||
.contact-photo-wrapper a::before,.contact-photo-wrapper a::after{
|
||||
display: none;
|
||||
}
|
||||
Reference in New Issue
Block a user