Merge branch 'develop' into 'master'

色関連の修正第1段

See merge request harukin/hubzillatheme!2
This commit is contained in:
harukin 2018-10-27 17:07:46 +09:00
commit b6176b1a51
4 changed files with 31 additions and 10 deletions

View File

@ -13,3 +13,4 @@
margin-left: 5px;
margin-bottom: 35px;
}

View File

@ -1108,7 +1108,6 @@ img.mail-conv-sender-photo {
border-top-right-radius: 0px;
border-top-left-radius: 0px;
}
.hide-comments-outer {
background-color: $comment_item_colour;
border-top-color: #ccc;
@ -1125,7 +1124,7 @@ img.mail-conv-sender-photo {
.wall-item-comment-wrapper {
padding: 7px 10px;
background-color: $item_colour;
background-color: $comment_item_colour;
border-radius: 0px;
border-bottom-right-radius: $radius;
border-bottom-left-radius: $radius;
@ -1141,8 +1140,8 @@ img.mail-conv-sender-photo {
width: $top_photo;
height: $top_photo;
border: none;
border-radius: $radius;
box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444;
border-radius: 50px;
filter: drop-shadow(2px 2px 2px rgba(75, 75, 75, 0.635));
}
.comment .wall-item-photo {
@ -1186,9 +1185,9 @@ img.mail-conv-sender-photo {
/* widgets */
.widget {
background-color: rgba(254,254,254,.5);
border: 1px solid rgba(254,254,254,.5);
background-color: rgba(254,254,254);
border-radius: $radius;
filter: drop-shadow(0px 0px 2px rgba(75, 75, 75, 0.678));
}
#note-text {
@ -1485,6 +1484,7 @@ blockquote {
.navbar {
z-index:1030;
filter: drop-shadow(0px 0px 3px rgba(75, 75, 75, 0.678));
}
.navbar-dark .navbar-nav .nav-link,
@ -1794,3 +1794,22 @@ dl.bb-dl > dd > li {
.hover-fx-show:hover .hover-fx-hide {
opacity: 1;
}
/*testarea*/
.wall-item-outside-wrapper a {
font-size: 1.3rem;
}
.comment a {
font-size: 0.9rem;
}
.wall-item-name-link a {
font-size: 0.9rem;
}
.toplevel_item {
filter: drop-shadow(0px 0px 5px rgba(75, 75, 75, 0.48));
transition: all 300ms 0s;
}
.toplevel_item:hover {
filter: drop-shadow(0px 0px 7px rgba(75, 75, 75, 0.678));
}

View File

@ -89,7 +89,7 @@ if (! $background_image)
if (! $item_colour)
$item_colour = 'rgb(255,255,255)';
if (! $comment_item_colour)
$comment_item_colour = 'rgb(255,255,255)';
$comment_item_colour = 'rgb(246,246,246)';
if (! $item_opacity)
$item_opacity = '1';
if (! $font_size)
@ -103,10 +103,11 @@ if (! $shadow)
if (! $converse_width)
$converse_width = '790';
if(! $top_photo)
$top_photo = '2.3rem';
$top_photo = '3rem';
if(! $reply_photo)
$reply_photo = '2.3rem';
if(! $shadowpx)
$shadowpx = '3px';
// Apply the settings
if(file_exists('view/theme/plusfuture/css/style.css')) {

View File

@ -7,6 +7,6 @@
if (! $nav_active_icon_colour)
$nav_active_icon_colour = "rgba(0, 0, 0, 0.7)";
if (! $radius)
$radius = "50px";
$radius = "4px";
if (! $banner_colour)
$banner_colour = "rgba(0, 0, 0, 0.7)";