Merge branch 'develop' into 'master'

修正よ〜〜ん

See merge request harukin/hubzillatheme!6
This commit is contained in:
harukin 2018-10-28 22:12:39 +09:00
commit 40da74d918

View File

@ -1033,7 +1033,7 @@ img.mail-conv-sender-photo {
}
#profile-jot-wrapper {
background-color: rgba(254, 254, 254, 1);
background-color: rgb(255, 255, 255);
border: 1px solid rgba(0, 0, 0, .2);
border-radius: $radius;
@ -1800,12 +1800,12 @@ dl.bb-dl > dd > li {
.toplevel_item > .wall-item-outside-wrapper .wall-item-name {
font-size: 1.2rem;
}
.toplevel_item , .notifications_wrapper {
.toplevel_item , #notifications {
box-shadow: 0px 0px 5px 2px rgba(75, 75, 75, 0.3);
transition: all 300ms 0s;
}
.toplevel_item:hover , .notifications_wrapper:hover{
filter: drop-shadow(0px 0px 7px rgba(75, 75, 75, 0.678));
.toplevel_item:hover , #notifications: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));
@ -1813,8 +1813,18 @@ dl.bb-dl > dd > li {
#profile-jot-wrapper {
filter: drop-shadow(0px 0px 7px rgba(75, 75, 75, 0.48));
transition: all 300ms 0s;
}
#profile-jot-wrapper:hover {
filter: drop-shadow(0px 0px 7px rgba(75, 75, 75, 0.678));
}
.bootstrap-tagsinput {
background-color: #000
}
#jot-title-wrap, #jot-category-wrap, #jot-text-wrap, #profile-jot-text{
transition: all 300ms 0s;
}
.bootstrap-tagsinput {
background-color: $comment_item_colour !important;
}