Merge branch 'develop' into 'master'
fix notification's time issue and some pdl See merge request harukin/hubzillatheme!16
This commit is contained in:
harukin
commit
cc694b172d
@ -5,7 +5,6 @@
|
||||
* Originally by harukin <harukin@haruk.in>
|
||||
*/
|
||||
|
||||
|
||||
/* generals */
|
||||
|
||||
html {
|
||||
@ -15,7 +14,7 @@ html {
|
||||
body {
|
||||
font-size: 0.9rem;
|
||||
background-color: $bgcolour;
|
||||
background-image: url('$background_image');
|
||||
background-image: url("$background_image");
|
||||
background-attachment: fixed;
|
||||
background-size: cover;
|
||||
color: $font_colour;
|
||||
@ -50,32 +49,38 @@ main {
|
||||
left: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
background: rgba(0, 0, 0, .5);
|
||||
background: rgba(0, 0, 0, 0.5);
|
||||
cursor: pointer;
|
||||
z-index: 1028;
|
||||
}
|
||||
|
||||
h1, .h1 {
|
||||
h1,
|
||||
.h1 {
|
||||
font-size: 2rem;
|
||||
}
|
||||
|
||||
h2, .h2 {
|
||||
h2,
|
||||
.h2 {
|
||||
font-size: 1.6rem;
|
||||
}
|
||||
|
||||
h3, .h3 {
|
||||
h3,
|
||||
.h3 {
|
||||
font-size: 1.2rem;
|
||||
}
|
||||
|
||||
h4, .h4 {
|
||||
h4,
|
||||
.h4 {
|
||||
font-size: 1.05rem;
|
||||
}
|
||||
|
||||
h5, .h5 {
|
||||
h5,
|
||||
.h5 {
|
||||
font-size: 0.9rem;
|
||||
}
|
||||
|
||||
h6, .h6 {
|
||||
h6,
|
||||
.h6 {
|
||||
font-size: 0.75rem;
|
||||
}
|
||||
|
||||
@ -107,7 +112,6 @@ a,
|
||||
color: $link_colour;
|
||||
}
|
||||
|
||||
|
||||
a:hover,
|
||||
a:focus,
|
||||
.fakelink:hover,
|
||||
@ -120,11 +124,15 @@ a:focus,
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
input, optgroup, select, textarea {
|
||||
input,
|
||||
optgroup,
|
||||
select,
|
||||
textarea {
|
||||
font-size: 0.9rem !important;
|
||||
}
|
||||
|
||||
input[type=text], textarea {
|
||||
input[type="text"],
|
||||
textarea {
|
||||
resize: vertical;
|
||||
background-color: $comment_item_colour;
|
||||
color: $font_colour;
|
||||
@ -155,14 +163,14 @@ code {
|
||||
}
|
||||
|
||||
pre {
|
||||
background: #F5F5F5;
|
||||
background: #f5f5f5;
|
||||
color: #333;
|
||||
border: 1px solid #ccc;
|
||||
border-radius: $radius;
|
||||
}
|
||||
|
||||
.heart {
|
||||
color: #FF0000;
|
||||
color: #ff0000;
|
||||
}
|
||||
|
||||
nav {
|
||||
@ -184,19 +192,20 @@ nav {
|
||||
}
|
||||
|
||||
.error-message {
|
||||
color: #FF0000;
|
||||
color: #ff0000;
|
||||
font-size: 1.1em;
|
||||
border: 1px solid #FF8888;
|
||||
background-color: #FFEEEE;
|
||||
border: 1px solid #ff8888;
|
||||
background-color: #ffeeee;
|
||||
padding: 10px;
|
||||
}
|
||||
|
||||
.nav-channel-select { margin-left: 8px; }
|
||||
.nav-channel-select {
|
||||
margin-left: 8px;
|
||||
}
|
||||
|
||||
/* contextual help */
|
||||
.contextual-help-content {
|
||||
display: none;
|
||||
|
||||
}
|
||||
|
||||
.contextual-help-content-open {
|
||||
@ -222,7 +231,7 @@ nav {
|
||||
.contextual-help-tool {
|
||||
padding: 7px;
|
||||
filter: alpha(opacity=20);
|
||||
opacity: .5;
|
||||
opacity: 0.5;
|
||||
}
|
||||
|
||||
.contextual-help-tool:hover {
|
||||
@ -268,10 +277,10 @@ nav {
|
||||
-moz-animation: rotation 1s infinite linear;
|
||||
-o-animation: rotation 1s infinite linear;
|
||||
animation: rotation 1s infinite linear;
|
||||
border-left: .2rem solid rgba(77, 77, 77, .15);
|
||||
border-right: .2rem solid rgba(77, 77, 77, .15);
|
||||
border-bottom: .2rem solid rgba(77, 77, 77, .15);
|
||||
border-top: .2rem solid rgba(77, 77, 77, .5);
|
||||
border-left: 0.2rem solid rgba(77, 77, 77, 0.15);
|
||||
border-right: 0.2rem solid rgba(77, 77, 77, 0.15);
|
||||
border-bottom: 0.2rem solid rgba(77, 77, 77, 0.15);
|
||||
border-top: 0.2rem solid rgba(77, 77, 77, 0.5);
|
||||
border-radius: 100%;
|
||||
}
|
||||
|
||||
@ -350,9 +359,15 @@ nav {
|
||||
}
|
||||
|
||||
@keyframes jump {
|
||||
0% {bottom: 0px;}
|
||||
20% {bottom: 3px;}
|
||||
40% {bottom: 0px;}
|
||||
0% {
|
||||
bottom: 0px;
|
||||
}
|
||||
20% {
|
||||
bottom: 3px;
|
||||
}
|
||||
40% {
|
||||
bottom: 0px;
|
||||
}
|
||||
}
|
||||
/* jumping dots end */
|
||||
|
||||
@ -416,7 +431,6 @@ footer {
|
||||
|
||||
.connect-btn-wrapper {
|
||||
margin-bottom: 10px;
|
||||
|
||||
}
|
||||
|
||||
.profile-edit-side-link {
|
||||
@ -452,7 +466,8 @@ footer {
|
||||
width: 50px;
|
||||
}
|
||||
|
||||
#fsuggest-desc, #fsuggest-submit-wrapper {
|
||||
#fsuggest-desc,
|
||||
#fsuggest-submit-wrapper {
|
||||
margin-top: 15px;
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
@ -472,10 +487,9 @@ footer {
|
||||
.pager {
|
||||
padding: 10px;
|
||||
text-align: center;
|
||||
font-size: 1.0em;
|
||||
font-size: 1em;
|
||||
}
|
||||
|
||||
|
||||
.pager_first,
|
||||
.pager_last,
|
||||
.pager_prev,
|
||||
@ -583,7 +597,8 @@ footer {
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
#tagrm-submit, #tagrm-cancel {
|
||||
#tagrm-submit,
|
||||
#tagrm-cancel {
|
||||
margin-top: 25px;
|
||||
}
|
||||
|
||||
@ -606,10 +621,9 @@ footer {
|
||||
margin-right: 1rem;
|
||||
}
|
||||
|
||||
|
||||
#nav-search-text {
|
||||
width: 280px;
|
||||
padding: .15rem .5rem;
|
||||
padding: 0.15rem 0.5rem;
|
||||
}
|
||||
|
||||
nav .acpopup {
|
||||
@ -626,7 +640,8 @@ nav .acpopup {
|
||||
color: #888;
|
||||
}
|
||||
|
||||
#plugin-settings-link, #account-settings-link {
|
||||
#plugin-settings-link,
|
||||
#account-settings-link {
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
@ -733,14 +748,16 @@ nav .acpopup {
|
||||
* OAuth
|
||||
*/
|
||||
.oauthapp {
|
||||
height: auto; overflow: auto;
|
||||
height: auto;
|
||||
overflow: auto;
|
||||
border-bottom: 2px solid #cccccc;
|
||||
padding-bottom: 1em;
|
||||
margin-bottom: 1em;
|
||||
}
|
||||
.oauthapp img {
|
||||
float: left;
|
||||
width: 48px; height: 48px;
|
||||
width: 48px;
|
||||
height: 48px;
|
||||
margin: 10px;
|
||||
}
|
||||
.oauthapp .icon {
|
||||
@ -756,7 +773,6 @@ nav .acpopup {
|
||||
float: left;
|
||||
}
|
||||
|
||||
|
||||
.body-attach {
|
||||
margin-top: 10px;
|
||||
}
|
||||
@ -767,12 +783,14 @@ nav .acpopup {
|
||||
|
||||
/* popup notifications */
|
||||
div.jGrowl div.notice {
|
||||
background: #511919 url("../../../../images/icons/48/notice.png") no-repeat 5px center;
|
||||
background: #511919 url("../../../../images/icons/48/notice.png") no-repeat
|
||||
5px center;
|
||||
color: #ffffff;
|
||||
padding-left: 58px;
|
||||
}
|
||||
div.jGrowl div.info {
|
||||
background: #364e59 url("../../../../images/icons/48/info.png") no-repeat 5px center;
|
||||
background: #364e59 url("../../../../images/icons/48/info.png") no-repeat 5px
|
||||
center;
|
||||
color: #ffffff;
|
||||
padding-left: 58px;
|
||||
}
|
||||
@ -857,15 +875,20 @@ div.jGrowl div.jGrowl-notification {
|
||||
.contact-block-content {
|
||||
margin-top: 10px;
|
||||
}
|
||||
.contact-block-img.archived, .app-deleted, .dim {
|
||||
.contact-block-img.archived,
|
||||
.app-deleted,
|
||||
.dim {
|
||||
opacity: 0.3;
|
||||
filter: alpha(opacity=30);
|
||||
}
|
||||
|
||||
.profile-match-connect {
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
.profile-match-connect { margin-top: 5px; }
|
||||
|
||||
.reshared-content { margin-left: 20px; }
|
||||
.reshared-content {
|
||||
margin-left: 20px;
|
||||
}
|
||||
.shared_header img {
|
||||
border-radius: $radius;
|
||||
margin-right: 10px;
|
||||
@ -875,45 +898,37 @@ div.jGrowl div.jGrowl-notification {
|
||||
font-size: 0.9em !important;
|
||||
}
|
||||
.tag2 {
|
||||
font-size : 1.0em !important;
|
||||
font-size: 1em !important;
|
||||
}
|
||||
|
||||
|
||||
.tag3 {
|
||||
font-size: 1.1em !important;
|
||||
}
|
||||
|
||||
|
||||
.tag4 {
|
||||
font-size: 1.2em !important;
|
||||
}
|
||||
|
||||
|
||||
.tag5 {
|
||||
font-size: 1.3em !important;
|
||||
}
|
||||
|
||||
|
||||
.tag6 {
|
||||
font-size: 1.4em !important;
|
||||
}
|
||||
|
||||
|
||||
.tag7 {
|
||||
font-size: 1.5em !important;
|
||||
}
|
||||
|
||||
|
||||
.tag8 {
|
||||
font-size: 1.6em !important;
|
||||
}
|
||||
|
||||
|
||||
.tag9 {
|
||||
font-size: 1.7em !important;
|
||||
}
|
||||
|
||||
|
||||
.tag10 {
|
||||
font-size: 1.8em !important;
|
||||
}
|
||||
@ -951,7 +966,6 @@ a .generic-icons:hover {
|
||||
color: $font_colour;
|
||||
}
|
||||
|
||||
|
||||
.generic-icons-nav {
|
||||
font-size: 1rem;
|
||||
margin-right: 7px;
|
||||
@ -972,7 +986,7 @@ a .drop-icons {
|
||||
|
||||
.drop-icons:hover,
|
||||
a .drop-icons:hover {
|
||||
color: #FF0000;
|
||||
color: #ff0000;
|
||||
}
|
||||
|
||||
.lockview,
|
||||
@ -983,20 +997,19 @@ a .drop-icons:hover {
|
||||
.permission-inherited {
|
||||
float: left;
|
||||
margin-right: 10px;
|
||||
color: #FF0000;
|
||||
color: #ff0000;
|
||||
}
|
||||
|
||||
.perm-inherited {
|
||||
color: #FF0000;
|
||||
color: #ff0000;
|
||||
}
|
||||
|
||||
|
||||
#menulist {
|
||||
list-style-type: none;
|
||||
}
|
||||
|
||||
#adminpage table tr:hover {
|
||||
background-color: #BBC7D7;
|
||||
background-color: #bbc7d7;
|
||||
}
|
||||
|
||||
table {
|
||||
@ -1004,11 +1017,13 @@ table {
|
||||
max-width: 100%;
|
||||
}
|
||||
|
||||
th,td {
|
||||
th,
|
||||
td {
|
||||
padding: 3px;
|
||||
}
|
||||
|
||||
#channels > tbody > tr > td, #users > tbody > tr > td {
|
||||
#channels > tbody > tr > td,
|
||||
#users > tbody > tr > td {
|
||||
max-width: 19.4em;
|
||||
overflow: hidden;
|
||||
}
|
||||
@ -1035,9 +1050,8 @@ img.mail-conv-sender-photo {
|
||||
|
||||
#profile-jot-wrapper {
|
||||
background-color: rgb(255, 255, 255);
|
||||
border: 1px solid rgba(0, 0, 0, .2);
|
||||
border: 1px solid rgba(0, 0, 0, 0.2);
|
||||
border-radius: $radius;
|
||||
|
||||
}
|
||||
|
||||
#jot-title,
|
||||
@ -1071,7 +1085,6 @@ img.mail-conv-sender-photo {
|
||||
color: darkorange;
|
||||
}
|
||||
|
||||
|
||||
/* conversation */
|
||||
|
||||
.top-radius {
|
||||
@ -1082,7 +1095,7 @@ img.mail-conv-sender-photo {
|
||||
.wall-event-item {
|
||||
padding: 10px;
|
||||
color: #fff;
|
||||
background-color: #3A87AD; /* should reflect calendar color */
|
||||
background-color: #3a87ad; /* should reflect calendar color */
|
||||
border-top-left-radius: $radius;
|
||||
border-top-right-radius: $radius;
|
||||
}
|
||||
@ -1136,7 +1149,6 @@ img.mail-conv-sender-photo {
|
||||
border-top: 0px solid $comment_item_colour;
|
||||
}
|
||||
|
||||
|
||||
.wall-item-photo {
|
||||
width: $top_photo;
|
||||
height: $top_photo;
|
||||
@ -1163,7 +1175,6 @@ img.mail-conv-sender-photo {
|
||||
font-size: 1rem;
|
||||
}
|
||||
|
||||
|
||||
.comment-edit-text {
|
||||
border: 1px solid #f6f6f6;
|
||||
border-radius: $radius;
|
||||
@ -1214,7 +1225,8 @@ img.mail-conv-sender-photo {
|
||||
background-color: #ffdddd;
|
||||
}
|
||||
|
||||
.abook-pending-contact, .abook-permschange {
|
||||
.abook-pending-contact,
|
||||
.abook-permschange {
|
||||
background: orange;
|
||||
}
|
||||
|
||||
@ -1357,7 +1369,6 @@ img.mail-conv-sender-photo {
|
||||
border-radius: $radius;
|
||||
}
|
||||
|
||||
|
||||
.section-content-wrapper {
|
||||
padding: 7px 10px;
|
||||
background-color: $comment_item_colour;
|
||||
@ -1488,7 +1499,8 @@ blockquote {
|
||||
}
|
||||
|
||||
.navbar-dark .navbar-nav .nav-link,
|
||||
.usermenu i ,.text-white{
|
||||
.usermenu i,
|
||||
.text-white {
|
||||
color: $nav_icon_colour !important;
|
||||
}
|
||||
|
||||
@ -1500,7 +1512,6 @@ blockquote {
|
||||
}
|
||||
|
||||
@media screen and (max-width: 992px) {
|
||||
|
||||
aside#region_1 {
|
||||
border-right: 1px solid $nav_bd;
|
||||
}
|
||||
@ -1527,7 +1538,6 @@ blockquote {
|
||||
font-size: 1rem;
|
||||
margin-right: 0.5rem;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
.shareable_element_text {
|
||||
@ -1555,11 +1565,21 @@ dl.bb-dl > dt {
|
||||
line is already acheivable in bbcode without dl */
|
||||
font-weight: normal;
|
||||
}
|
||||
dl.dl-terms-monospace > dt { font-family: monospace; }
|
||||
dl.dl-terms-bold > dt { font-weight: bold; }
|
||||
dl.dl-terms-italic > dt { font-style: italic; }
|
||||
dl.dl-terms-underline > dt { text-decoration: underline; }
|
||||
dl.dl-terms-large > dt { font-size: 120%; }
|
||||
dl.dl-terms-monospace > dt {
|
||||
font-family: monospace;
|
||||
}
|
||||
dl.dl-terms-bold > dt {
|
||||
font-weight: bold;
|
||||
}
|
||||
dl.dl-terms-italic > dt {
|
||||
font-style: italic;
|
||||
}
|
||||
dl.dl-terms-underline > dt {
|
||||
text-decoration: underline;
|
||||
}
|
||||
dl.dl-terms-large > dt {
|
||||
font-size: 120%;
|
||||
}
|
||||
dl.bb-dl:not(.dl-horizontal) > dd {
|
||||
display: block;
|
||||
margin-left: 2em;
|
||||
@ -1601,11 +1621,13 @@ dl.bb-dl > dd > li {
|
||||
background-image: none !important;
|
||||
}
|
||||
|
||||
|
||||
/* Turn checkboxes into switches */
|
||||
.form-group.checkbox > div {
|
||||
position: relative; width: 40px;
|
||||
-webkit-user-select:none; -moz-user-select:none; -ms-user-select: none;
|
||||
position: relative;
|
||||
width: 40px;
|
||||
-webkit-user-select: none;
|
||||
-moz-user-select: none;
|
||||
-ms-user-select: none;
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
@ -1615,13 +1637,16 @@ dl.bb-dl > dd > li {
|
||||
|
||||
.form-group.checkbox > div label {
|
||||
/*カスタマイズ*/
|
||||
display: block; overflow: hidden; cursor: pointer;
|
||||
display: block;
|
||||
overflow: hidden;
|
||||
cursor: pointer;
|
||||
/*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;
|
||||
-webkit-transition: border-color ease-in-out 0.15s,
|
||||
-webkit-box-shadow ease-in-out 0.15s;
|
||||
-o-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;
|
||||
transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;
|
||||
height: 12px;
|
||||
width: 35px;
|
||||
}
|
||||
@ -1635,22 +1660,34 @@ dl.bb-dl > dd > li {
|
||||
}
|
||||
|
||||
.onoffswitch-inner {
|
||||
display: block; width: 200%; margin-left: -100%;
|
||||
-moz-transition: margin 0.3s ease-in 0s; -webkit-transition: margin 0.3s ease-in 0s;
|
||||
-o-transition: margin 0.3s ease-in 0s; transition: margin 0.3s ease-in 0s;
|
||||
display: block;
|
||||
width: 200%;
|
||||
margin-left: -100%;
|
||||
-moz-transition: margin 0.3s ease-in 0s;
|
||||
-webkit-transition: margin 0.3s ease-in 0s;
|
||||
-o-transition: margin 0.3s ease-in 0s;
|
||||
transition: margin 0.3s ease-in 0s;
|
||||
}
|
||||
|
||||
.onoffswitch-inner:before, .onoffswitch-inner:after {
|
||||
.onoffswitch-inner:before,
|
||||
.onoffswitch-inner:after {
|
||||
/*カスタマイズ*/
|
||||
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;
|
||||
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: #A4AFFF;
|
||||
background-color: #a4afff;
|
||||
color: rgba(255, 255, 255, 0);
|
||||
text-align: right;
|
||||
}
|
||||
@ -1658,18 +1695,27 @@ dl.bb-dl > dd > li {
|
||||
.onoffswitch-inner:after {
|
||||
content: attr(data-off);
|
||||
padding-left: 21px;
|
||||
background-color: #D5CECE; color: rgba(255, 255, 255, 0);
|
||||
background-color: #d5cece;
|
||||
color: rgba(255, 255, 255, 0);
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
.onoffswitch-switch {
|
||||
/*カスタマイズ*/
|
||||
display: block; width: 20px; height: 20px;margin:4px;
|
||||
display: block;
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
margin: 4px;
|
||||
background: #ccc;
|
||||
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;
|
||||
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));
|
||||
}
|
||||
|
||||
@ -1682,7 +1728,6 @@ dl.bb-dl > dd > li {
|
||||
background-color: #0275d8;
|
||||
}
|
||||
|
||||
|
||||
.form-group.checkbox > div > input:disabled + label .onoffswitch-switch {
|
||||
/*カスタマイズ*/
|
||||
background-color: #898989;
|
||||
@ -1690,8 +1735,6 @@ dl.bb-dl > dd > li {
|
||||
filter: alpha(opacity=30);
|
||||
}
|
||||
|
||||
|
||||
|
||||
.help-searchlist {
|
||||
list-style-type: none;
|
||||
}
|
||||
@ -1738,7 +1781,8 @@ dl.bb-dl > dd > li {
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
#login-main, .rmagic-button {
|
||||
#login-main,
|
||||
.rmagic-button {
|
||||
max-width: 400px;
|
||||
margin-top: 20px;
|
||||
margin-left: auto;
|
||||
@ -1803,16 +1847,19 @@ dl.bb-dl > dd > li {
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
|
||||
/*testarea*/
|
||||
.toplevel_item > .wall-item-outside-wrapper .wall-item-name {
|
||||
font-size: 1.2rem;
|
||||
}
|
||||
.toplevel_item , #notifications , #profile-jot-wrapper{
|
||||
.toplevel_item,
|
||||
#notifications,
|
||||
#profile-jot-wrapper {
|
||||
box-shadow: 0px 0px 5px 1px rgba(75, 75, 75, 0.3);
|
||||
transition: all 300ms 0s;
|
||||
}
|
||||
.toplevel_item:hover , #notifications:hover , #profile-jot-wrapper:hover{
|
||||
.toplevel_item:hover,
|
||||
#notifications:hover,
|
||||
#profile-jot-wrapper:hover {
|
||||
box-shadow: 0px 0px 5px 2px rgba(75, 75, 75, 0.5);
|
||||
}
|
||||
.dropdown-menu {
|
||||
@ -1820,10 +1867,13 @@ dl.bb-dl > dd > li {
|
||||
}
|
||||
|
||||
.bootstrap-tagsinput {
|
||||
background-color: #000
|
||||
background-color: #000;
|
||||
}
|
||||
|
||||
#jot-title-wrap, #jot-category-wrap, #jot-text-wrap, #profile-jot-text{
|
||||
#jot-title-wrap,
|
||||
#jot-category-wrap,
|
||||
#jot-text-wrap,
|
||||
#profile-jot-text {
|
||||
transition: all 300ms 0s;
|
||||
}
|
||||
.bootstrap-tagsinput {
|
||||
@ -1883,15 +1933,11 @@ dl.bb-dl > dd > li {
|
||||
margin-bottom: 0.5rem;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
a[title*="harukin@plus.haruk.in"] {
|
||||
color: rgb(170, 2, 2);
|
||||
}
|
||||
a[title*="harukin@plus.haruk.in"]::after {
|
||||
content: 'っ[鯖主]';
|
||||
content: "っ[鯖主]";
|
||||
font-size: 80%;
|
||||
font-style: italic;
|
||||
}
|
||||
@ -1900,16 +1946,16 @@ a[title*="mstdn.y-zu.org"]{
|
||||
color: rgb(62, 175, 58);
|
||||
}
|
||||
a[title*="mstdn.y-zu.org"]::before {
|
||||
content: '';
|
||||
content: "";
|
||||
display: inline-block;
|
||||
width: 18px;
|
||||
height: 20px;
|
||||
background-image: url('https://mstdn.y-zu.org/favicon.ico');
|
||||
background-image: url("https://mstdn.y-zu.org/favicon.ico");
|
||||
vertical-align: middle;
|
||||
background-size: contain;
|
||||
}
|
||||
a[title*="mstdn.y-zu.org"]::after {
|
||||
content: 'っ[Yづドン！]';
|
||||
content: "っ[Yづドン！]";
|
||||
font-size: 80%;
|
||||
font-style: italic;
|
||||
}
|
||||
@ -1918,16 +1964,16 @@ a[title*="itabashi.0j0.jp"]{
|
||||
color: rgb(1, 153, 102);
|
||||
}
|
||||
a[title*="itabashi.0j0.jp"]::before {
|
||||
content: '';
|
||||
content: "";
|
||||
display: inline-block;
|
||||
width: 18px;
|
||||
height: 20px;
|
||||
background-image: url('https://itabashi.0j0.jp/favicon.ico');
|
||||
background-image: url("https://itabashi.0j0.jp/favicon.ico");
|
||||
vertical-align: middle;
|
||||
background-size: contain;
|
||||
}
|
||||
a[title*="itabashi.0j0.jp"]::after {
|
||||
content: 'っ[板橋丼]';
|
||||
content: "っ[板橋丼]";
|
||||
font-size: 80%;
|
||||
font-style: italic;
|
||||
}
|
||||
@ -1936,16 +1982,16 @@ a[title*="mstdn.jp"]{
|
||||
color: rgb(177, 90, 90);
|
||||
}
|
||||
a[title*="mstdn.jp"]::before {
|
||||
content: '';
|
||||
content: "";
|
||||
display: inline-block;
|
||||
width: 18px;
|
||||
height: 20px;
|
||||
background-image: url('https://mstdn.jp/favicon.ico');
|
||||
background-image: url("https://mstdn.jp/favicon.ico");
|
||||
vertical-align: middle;
|
||||
background-size: contain;
|
||||
}
|
||||
a[title*="mstdn.jp"]::after {
|
||||
content: 'っ[mstdn.jp]';
|
||||
content: "っ[mstdn.jp]";
|
||||
font-size: 80%;
|
||||
font-style: italic;
|
||||
}
|
||||
@ -1954,16 +2000,16 @@ a[title*="odakyu.app"]{
|
||||
color: rgb(0, 0, 255);
|
||||
}
|
||||
a[title*="odakyu.app"]::before {
|
||||
content: '';
|
||||
content: "";
|
||||
display: inline-block;
|
||||
width: 18px;
|
||||
height: 20px;
|
||||
background-image: url('https://odakyu.app/favicon.ico');
|
||||
background-image: url("https://odakyu.app/favicon.ico");
|
||||
vertical-align: middle;
|
||||
background-size: contain;
|
||||
}
|
||||
a[title*="odakyu.app"]::after {
|
||||
content: 'っ[小田急don]';
|
||||
content: "っ[小田急don]";
|
||||
font-size: 80%;
|
||||
font-style: italic;
|
||||
}
|
||||
@ -1972,16 +2018,16 @@ a[title*="kirishima.cloud"]{
|
||||
color: rgb(138, 112, 0);
|
||||
}
|
||||
a[title*="kirishima.cloud"]::before {
|
||||
content: '';
|
||||
content: "";
|
||||
display: inline-block;
|
||||
width: 18px;
|
||||
height: 20px;
|
||||
background-image: url('https://kirishima.cloud/favicon.ico');
|
||||
background-image: url("https://kirishima.cloud/favicon.ico");
|
||||
vertical-align: middle;
|
||||
background-size: contain;
|
||||
}
|
||||
a[title*="kirishima.cloud"]::after {
|
||||
content: 'っ[アスタルテ]';
|
||||
content: "っ[アスタルテ]";
|
||||
font-size: 80%;
|
||||
font-style: italic;
|
||||
}
|
||||
@ -1990,16 +2036,16 @@ a[title*="oransns.com"]{
|
||||
color: rgb(170, 111, 0);
|
||||
}
|
||||
a[title*="oransns.com"]::before {
|
||||
content: '';
|
||||
content: "";
|
||||
display: inline-block;
|
||||
width: 18px;
|
||||
height: 20px;
|
||||
background-image: url('https://oransns.com/favicon.ico');
|
||||
background-image: url("https://oransns.com/favicon.ico");
|
||||
vertical-align: middle;
|
||||
background-size: contain;
|
||||
}
|
||||
a[title*="oransns.com"]::after {
|
||||
content: 'っ[おらんSNS]';
|
||||
content: "っ[おらんSNS]";
|
||||
font-size: 80%;
|
||||
font-style: italic;
|
||||
}
|
||||
@ -2008,16 +2054,16 @@ a[title*="mstdn.mimikun.jp"]{
|
||||
color: rgb(16, 187, 173);
|
||||
}
|
||||
a[title*="mstdn.mimikun.jp"]::before {
|
||||
content: '';
|
||||
content: "";
|
||||
display: inline-block;
|
||||
width: 18px;
|
||||
height: 20px;
|
||||
background-image: url('https://mstdn.mimikun.jp/favicon.ico');
|
||||
background-image: url("https://mstdn.mimikun.jp/favicon.ico");
|
||||
vertical-align: middle;
|
||||
background-size: contain;
|
||||
}
|
||||
a[title*="mstdn.mimikun.jp"]::after {
|
||||
content: 'っ[mimikun丼]';
|
||||
content: "っ[mimikun丼]";
|
||||
font-size: 80%;
|
||||
font-style: italic;
|
||||
}
|
||||
@ -2026,21 +2072,35 @@ a[title*="pawoo.net"]{
|
||||
color: rgb(125, 44, 172);
|
||||
}
|
||||
a[title*="pawoo.net"]::before {
|
||||
content: '';
|
||||
content: "";
|
||||
display: inline-block;
|
||||
width: 18px;
|
||||
height: 20px;
|
||||
background-image: url('https://pawoo.net/favicon.ico');
|
||||
background-image: url("https://pawoo.net/favicon.ico");
|
||||
vertical-align: middle;
|
||||
background-size: contain;
|
||||
}
|
||||
a[title*="pawoo.net"]::after {
|
||||
content: 'っ[Pawoo]';
|
||||
content: "っ[Pawoo]";
|
||||
font-size: 80%;
|
||||
font-style: italic;
|
||||
}
|
||||
|
||||
.contact-photo-wrapper a::before,.contact-photo-wrapper a::after{
|
||||
.wall-item-photo[src*="https://plus.haruk.in/photo/profile/m/68"] {
|
||||
width: calc($top_photo + 3px);
|
||||
height: calc($top_photo + 3px);
|
||||
border: Silver 3px outset;
|
||||
border-radius: 50px;
|
||||
filter: drop-shadow(2px 2px 2px rgba(75, 75, 75, 0.635));
|
||||
}
|
||||
|
||||
.comment .wall-item-photo[src*="https://plus.haruk.in/photo/profile/m/68"] {
|
||||
width: calc($reply_photo + 3px);
|
||||
height: calc($reply_photo + 3px);
|
||||
}
|
||||
|
||||
.contact-photo-wrapper a::before,
|
||||
.contact-photo-wrapper a::after {
|
||||
display: none;
|
||||
}
|
||||
|
||||
@ -2052,7 +2112,7 @@ a[title*="pawoo.net"]::after{
|
||||
}
|
||||
|
||||
.shared_container::before {
|
||||
content: ' 再共有 ';
|
||||
content: " 再共有 ";
|
||||
font-size: 0.8em;
|
||||
position: relative;
|
||||
top: -15px;
|
||||
@ -2073,7 +2133,6 @@ a[title*="pawoo.net"]::after{
|
||||
margin-right: 20px;
|
||||
}
|
||||
.region_3-on {
|
||||
|
||||
left: -576px;
|
||||
width: calc(100% + 288px + 288px);
|
||||
}
|
||||
@ -2084,7 +2143,6 @@ a[title*="pawoo.net"]::after{
|
||||
}
|
||||
@media screen and (min-width: 993px) {
|
||||
.region_3-on {
|
||||
|
||||
left: 0px;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
@ -1,7 +1,5 @@
|
||||
[region=aside]
|
||||
[widget=userlogomenu][/widget]
|
||||
[widget=wiki_pages][/widget]
|
||||
[widget=notifications][/widget]
|
||||
[/region]
|
||||
|
||||
[region=content]
|
||||
@ -10,5 +8,6 @@ $content
|
||||
[/region]
|
||||
|
||||
[region=right_aside]
|
||||
[widget=shortprofile][var=scale]2[/var][/widget]
|
||||
[widget=notifications][/widget]
|
||||
[widget=wiki_pages][/widget]
|
||||
[/region]
|
||||
|
||||
@ -2,9 +2,11 @@
|
||||
|
||||
namespace Zotlabs\Theme;
|
||||
|
||||
class plusfutureConfig {
|
||||
class plusfutureConfig
|
||||
{
|
||||
|
||||
function get_schemas() {
|
||||
function get_schemas()
|
||||
{
|
||||
$files = glob('view/theme/plusfuture/schema/*.php');
|
||||
|
||||
$scheme_choices = [];
|
||||
@ -14,8 +16,7 @@ class plusfutureConfig {
|
||||
if (in_array('view/theme/plusfuture/schema/default.php', $files)) {
|
||||
$scheme_choices['---'] = t('Default');
|
||||
$scheme_choices['focus'] = t('Focus (Hubzilla default)');
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
$scheme_choices['---'] = t('Focus (Hubzilla default)');
|
||||
}
|
||||
|
||||
@ -31,7 +32,8 @@ class plusfutureConfig {
|
||||
return $scheme_choices;
|
||||
}
|
||||
|
||||
function get() {
|
||||
function get()
|
||||
{
|
||||
if (!local_channel()) {
|
||||
return;
|
||||
}
|
||||
@ -59,7 +61,8 @@ class plusfutureConfig {
|
||||
return $this->form($arr);
|
||||
}
|
||||
|
||||
function post() {
|
||||
function post()
|
||||
{
|
||||
if (!local_channel()) {
|
||||
return;
|
||||
}
|
||||
@ -87,7 +90,8 @@ class plusfutureConfig {
|
||||
}
|
||||
}
|
||||
|
||||
function form($arr) {
|
||||
function form($arr)
|
||||
{
|
||||
|
||||
if (get_pconfig(local_channel(), 'plusfuture', 'advanced_theming'))
|
||||
$expert = 1;
|
||||
@ -98,25 +102,25 @@ class plusfutureConfig {
|
||||
'$theme' => \App::$channel['channel_theme'],
|
||||
'$expert' => $expert,
|
||||
'$title' => t("Theme settings"),
|
||||
'$narrow_navbar' => array('plusfuture_narrow_navbar',t('Narrow navbar'),$arr['narrow_navbar'], '', array(t('No'),t('Yes'))),
|
||||
'$narrow_navbar' => array('plusfuture_narrow_navbar', t('細めのナビバー'), $arr['narrow_navbar'], '', array(t('No'), t('Yes'))),
|
||||
'$singlepost' => array('plusfuture_singlepost', t('Singlepost'), $arr['singlepost'], '', array(t('No'), t('Yes'))),
|
||||
'$nav_bg' => array('plusfuture_nav_bg', t('Navigation bar background color'), $arr['nav_bg']),
|
||||
'$nav_icon_colour' => array('plusfuture_nav_icon_colour', t('Navigation bar icon color '), $arr['nav_icon_colour']),
|
||||
'$nav_active_icon_colour' => array('plusfuture_nav_active_icon_colour', t('Navigation bar active icon color '), $arr['nav_active_icon_colour']),
|
||||
'$link_colour' => array('plusfuture_link_colour', t('Link color'), $arr['link_colour'], '', $link_colours),
|
||||
'$banner_colour' => array('plusfuture_banner_colour', t('Set font-color for banner'), $arr['banner_colour']),
|
||||
'$bgcolour' => array('plusfuture_background_colour', t('Set the background color'), $arr['bgcolour']),
|
||||
'$background_image' => array('plusfuture_background_image', t('Set the background image'), $arr['background_image']),
|
||||
'$item_colour' => array('plusfuture_item_colour', t('Set the background color of items'), $arr['item_colour']),
|
||||
'$comment_item_colour' => array('plusfuture_comment_item_colour', t('Set the background color of comments'), $arr['comment_item_colour']),
|
||||
'$font_size' => array('plusfuture_font_size', t('Set font-size for the entire application'), $arr['font_size'], t('Examples: 1rem, 100%, 16px')),
|
||||
'$font_colour' => array('plusfuture_font_colour', t('Set font-color for posts and comments'), $arr['font_colour']),
|
||||
'$radius' => array('plusfuture_radius', t('Set radius of corners'), $arr['radius'], t('Example: 4px')),
|
||||
'$shadow' => array('plusfuture_shadow', t('Set shadow depth of photos'), $arr['shadow']),
|
||||
'$converse_width' => array('plusfuture_converse_width',t('Set maximum width of content region in pixel'),$arr['converse_width'], t('Leave empty for default width')),
|
||||
'$nav_bg' => array('plusfuture_nav_bg', t('ナビゲーションバーバックグラウンドカラー'), $arr['nav_bg']),
|
||||
'$nav_icon_colour' => array('plusfuture_nav_icon_colour', t('ナビゲーションバーアイコンカラー'), $arr['nav_icon_colour']),
|
||||
'$nav_active_icon_colour' => array('plusfuture_nav_active_icon_colour', t('ナビゲーションバーアクティブアイコンカラー'), $arr['nav_active_icon_colour']),
|
||||
'$link_colour' => array('plusfuture_link_colour', t('リンクカラー'), $arr['link_colour'], '', $link_colours),
|
||||
'$banner_colour' => array('plusfuture_banner_colour', t('バナーのフォントカラー'), $arr['banner_colour']),
|
||||
'$bgcolour' => array('plusfuture_background_colour', t('バックグラウンドカラー'), $arr['bgcolour']),
|
||||
'$background_image' => array('plusfuture_background_image', t('バックグラウンド画像'), $arr['background_image']),
|
||||
'$item_colour' => array('plusfuture_item_colour', t('バックグラウンドの画像や色を指定してください。'), $arr['item_colour']),
|
||||
'$comment_item_colour' => array('plusfuture_comment_item_colour', t('コメント欄のアイテムカラー'), $arr['comment_item_colour']),
|
||||
'$font_size' => array('plusfuture_font_size', t('フォントサイズ'), $arr['font_size'], t('Examples: 1rem, 100%, 16px')),
|
||||
'$font_colour' => array('plusfuture_font_colour', t('投稿とコメントのフォントサイズ'), $arr['font_colour']),
|
||||
'$radius' => array('plusfuture_radius', t('カードの角丸'), $arr['radius'], t('Example: 4px')),
|
||||
'$shadow' => array('plusfuture_shadow', t('影'), $arr['shadow']),
|
||||
'$converse_width' => array('plusfuture_converse_width', t('コンテンツの幅指定'), $arr['converse_width'], t('Leave empty for default width')),
|
||||
'$top_photo' => array('plusfuture_top_photo', t('Set size of conversation author photo'), $arr['top_photo']),
|
||||
'$reply_photo' => array('plusfuture_reply_photo', t('Set size of followup author photos'), $arr['reply_photo']),
|
||||
'$advanced_theming' => ['plusfuture_advanced_theming', t('Show advanced settings'), $arr['advanced_theming'], '', [t('No'), t('Yes')]]
|
||||
'$advanced_theming' => ['plusfuture_advanced_theming', t('詳細設定を開く'), $arr['advanced_theming'], '', [t('No'), t('Yes')]]
|
||||
));
|
||||
|
||||
return $o;
|
||||
|
||||
@ -90,8 +90,9 @@
|
||||
|
||||
$("#nav-{{$notification.type}}-menu .notification").each(function(i, el){
|
||||
var cn = $(el).data('contact_name').toString().toLowerCase();
|
||||
var ca = $(el).data('contact_addr').toString().toLowerCase();
|
||||
|
||||
if(cn.indexOf(val) === -1)
|
||||
if(cn.indexOf(val) === -1 && ca.indexOf(val) === -1)
|
||||
$(this).addClass('d-none');
|
||||
else
|
||||
$(this).removeClass('d-none');
|
||||
@ -119,18 +120,18 @@
|
||||
{{$no_notifications}}<span class="jumping-dots"><span class="dot-1">.</span><span class="dot-2">.</span><span class="dot-3">.</span></span>
|
||||
</div>
|
||||
<div id="nav-notifications-template" rel="template">
|
||||
<a class="list-group-item clearfix notification {5}" href="{0}" title="{2}" data-b64mid="{6}" data-notify_id="{7}" data-thread_top="{8}" data-contact_name="{2}">
|
||||
<a class="list-group-item clearfix notification {6}" href="{0}" title="{3}" data-b64mid="{7}" data-notify_id="{8}" data-thread_top="{9}" data-contact_name="{2}" data-contact_addr="{3}">
|
||||
<img class="menu-img-3" data-src="{1}">
|
||||
<span class="contactname">{2}</span>
|
||||
<span class="dropdown-sub-text">{3}<br>{4}</span>
|
||||
<span class="dropdown-sub-text">{4}<br>{5}</span>
|
||||
</a>
|
||||
</div>
|
||||
<div id="nav-notifications-forums-template" rel="template">
|
||||
<a class="list-group-item clearfix notification notification-forum" href="{0}" title="{3}" data-b64mid="{6}" data-notify_id="{7}" data-thread_top="{8}" data-contact_name="{2}">
|
||||
<span class="float-right badge badge-{{$notification.severity}}">{9}</span>
|
||||
<a class="list-group-item clearfix notification notification-forum" href="{0}" title="{4} - {3}" data-b64mid="{7}" data-notify_id="{8}" data-thread_top="{9}" data-contact_name="{2}" data-contact_addr="{3}">
|
||||
<span class="float-right badge badge-{{$notification.severity}}">{10}</span>
|
||||
<img class="menu-img-1" data-src="{1}">
|
||||
<span class="">{2}</span>
|
||||
<i class="fa fa-{10} text-muted"></i>
|
||||
<i class="fa fa-{11} text-muted"></i>
|
||||
</a>
|
||||
</div>
|
||||
<div id="notifications" class="navbar-nav">
|
||||
|
||||
@ -67,7 +67,7 @@
|
||||
<p>利用規約</p>
|
||||
</a>
|
||||
</li>
|
||||
<iframe id="frame" width="115%" height="120%" src="https://plus.haruk.in/page/harukin/noti" frameborder="0"></iframe>
|
||||
<iframe id="frame" width="115%" height="120%" src="./page/harukin/noti" frameborder="0"></iframe>
|
||||
<script>
|
||||
$(function(){
|
||||
$('#frame').on('load', function(){
|
||||
|
||||
Reference in New Issue
Block a user