harukin/theme
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into 'master'

Browse Source 
css fix

See merge request harukin/hubzillatheme!23
This commit is contained in:
harukin 2019-02-26 16:30:41 +09:00
commit 33c86f2737
2 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
view/theme/plusfuture/css/style.css
View File

@ -1154,7 +1154,7 @@ img.mail-conv-sender-photo {
height: $top_photo; height: $top_photo;
border: none; border: none;
border-radius: 50px; border-radius: 50px;
filter: drop-shadow(2px 2px 2px rgba(75, 75, 75, 0.635)); /*filter: drop-shadow(2px 2px 2px rgba(75, 75, 75, 0.635));*/
} }
.comment .wall-item-photo { .comment .wall-item-photo {
@ -1186,6 +1186,7 @@ img.mail-conv-sender-photo {
display: block; display: block;
border-top: 1px dashed #ccc; border-top: 1px dashed #ccc;
text-align: center; text-align: center;
/*box-shadow: 0px -10px 15px -5px rgba(0,0,0,0.4);*/
} }
.divgrow-showmore:hover { .divgrow-showmore:hover {
@ -1854,7 +1855,7 @@ dl.bb-dl > dd > li {
.toplevel_item, .toplevel_item,
#notifications, #notifications,
#profile-jot-wrapper { #profile-jot-wrapper {
box-shadow: 0px 0px 5px 1px rgba(75, 75, 75, 0.3); box-shadow: 0px 0px 1px 1px rgba(75, 75, 75, 0.1);
transition: all 300ms 0s; transition: all 300ms 0s;
} }
.toplevel_item:hover, .toplevel_item:hover,
@ -1913,9 +1914,10 @@ dl.bb-dl > dd > li {
left: -40px; left: -40px;
transition: all 300ms 0s; transition: all 300ms 0s;
} }
#user_menu > ul > iframe { .region_1-on #user_menu > ul > iframe {
position: relative; position: fixed;
left: -15px; left: -10px;
bottom: 50px;
} }
#user_menu > ul > li:hover { #user_menu > ul > li:hover {
background-color: #e1dede; background-color: #e1dede;
@ -1924,6 +1926,10 @@ dl.bb-dl > dd > li {
display: flex; display: flex;
margin-left: 40px; margin-left: 40px;
margin-top: 7px; margin-top: 7px;
color: #757575;
}
#user_menu > ul > li > a:hover {
color: $link_colour;
} }
#user_menu > ul > li > a > i { #user_menu > ul > li > a > i {
font-size: 130%; font-size: 130%;
@ -2130,20 +2136,24 @@ a[title*="pawoo.net"]::after {
.shared_container { .shared_container {
border-radius: 2px; border-radius: 2px;
margin-top: 15px; margin-top: 15px;
box-shadow: 2px 2px 6px 1px rgba(75, 75, 75, 0.5); /*box-shadow: 1px 1px 2px 1px rgba(75, 75, 75, 0.5);*/
margin-left: 10px; margin-left: 10px;
border-top: solid 1px darkgray;
border-bottom: solid 1px darkgray;
} }
.shared_container::before { .shared_container::before {
content: "　再共有　"; content: "　再共有　";
font-size: 0.8em; font-size: 0.8em;
position: relative; position: relative;
top: -15px; top: -13px;
background-color: #cdf6a1; background-color: #cdf6a1;
border-radius: 0.6em; border-radius: 1.0rem;
margin: 15px; margin: 15px;
left: -25px; left: -25px;
filter: drop-shadow(1px 1px 1px rgba(75, 75, 75, 0.675)); /*border: solid 1px darkgray;
filter: drop-shadow(1px 1px 1px rgba(75, 75, 75, 0.675));*/
padding: 3px;
} }
.shared_container::after { .shared_container::after {
@ -2201,6 +2211,11 @@ nav .navbar-nav > .text-truncate {
#overlay { #overlay {
display: none; display: none;
} }
#user_menu > ul > iframe{
position: fixed;
left: -10px;
bottom: 0px;
}
} }
@media screen and (min-width: 800px) { @media screen and (min-width: 800px) {
.toplevel_item { .toplevel_item {
@ -2222,6 +2237,11 @@ nav .navbar-nav > .text-truncate {
margin-right: calc(calc(50% - $converse_widts) / 2); margin-right: calc(calc(50% - $converse_widts) / 2);
} }
} }
@media screen and (max-height: 780px) {
#user_menu > ul > iframe {
display: none;
}
}
.toplevel_item:nth-child(2n) { .toplevel_item:nth-child(2n) {
float: left; float: left;
} }

2
view/theme/plusfuture/tpl/userlogomenu.tpl
View File

@ -67,7 +67,7 @@
<p>利用規約</p> <p>利用規約</p>
</a> </a>
</li> </li>
<iframe id="frame" width="115%" height="120%" src="./page/harukin/noti" frameborder="0"></iframe> <iframe id="frame" src="./page/harukin/noti" frameborder="0"></iframe>
<script> <script>
$(function(){ $(function(){
$('#frame').on('load', function(){ $('#frame').on('load', function(){