Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
haruka-7 committed Jan 5, 2020
2 parents a1bce69 + 400ccf3 commit 60e0a61
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 15 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/.project
56 changes: 42 additions & 14 deletions plucss.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
# This file is part of PluXml : http://www.pluxml.org
#
# Package plucss.css
# Version 1.3
# Copyright (c) 2014-2017 PluXml
# Authors Jos, Stéphane F
# Version 1.3.1
# Copyright (c) 2014-2019 PluXml
# Authors Jos, Stéphane F, sudwebdesign, Pedro "P3ter" CADETE
# Licensed under the GPL license.
# See http://www.gnu.org/licenses/gpl.html
#
Expand Down Expand Up @@ -518,8 +518,8 @@ input[type="submit"].yellow:hover {
cursor: pointer;
text-align: center;
}
.responsive-menu label,
.responsive-menu input[type=checkbox] {
#nav,/* fix old android browser (always open) */
.responsive-menu label,.responsive-menu input[type=checkbox] {
display: none;
}
.responsive-menu label {
Expand All @@ -528,18 +528,23 @@ input[type="submit"].yellow:hover {
padding-left: .7rem;
padding-right: .7rem;
}
.responsive-menu input[type=checkbox]:checked+ul {
#nav:checked+ul#responsive-menu,/* fix old android browser */
.responsive-menu input[type=checkbox]:checked+ul {
display: block;
}

@media (max-width: 47.938rem) {
@media (max-width: 767px) {
.responsive-menu { /* fix old android browser : good position*/
left: 0;
right: 0;
}
.responsive-menu ul {
display: none;
}
.responsive-menu label,
.responsive-menu ul li {
display: block;
margin-left: 0
margin-left: 0;
}
.responsive-menu ul li:hover {
background-color: #ddd;
Expand Down Expand Up @@ -920,7 +925,7 @@ a:hover.tooltip-left span {
float: none;
}
.show {
display: block;
display: initial;
}
.hide {
display: none;
Expand All @@ -938,6 +943,7 @@ a:hover.tooltip-left span {
padding: 0;
}
.sticky {
position: fixed;
position: -webkit-sticky;
position: sticky;
top: 0;
Expand Down Expand Up @@ -1182,7 +1188,7 @@ a:hover.tooltip-left span {
float: none;
}
.sml-show {
display: block;
display: initial;
}
.sml-hide {
display: none;
Expand All @@ -1200,7 +1206,7 @@ a:hover.tooltip-left span {
padding: 0;
}

@media (min-width: 48rem) {
@media (min-width: 768px) {

.container {
padding-left: 2rem;
Expand Down Expand Up @@ -1423,7 +1429,7 @@ a:hover.tooltip-left span {
float: none;
}
.med-show {
display: block;
display: initial;
}
.med-hide {
display: none;
Expand All @@ -1442,7 +1448,7 @@ a:hover.tooltip-left span {
}
}

@media (min-width: 64rem) {
@media (min-width: 1200px) {

.container {
padding-left: 3rem;
Expand Down Expand Up @@ -1665,7 +1671,7 @@ a:hover.tooltip-left span {
float: none;
}
.lrg-show {
display: block;
display: initial;
}
.lrg-hide {
display: none;
Expand All @@ -1683,3 +1689,25 @@ a:hover.tooltip-left span {
padding: 0;
}
}

@media print {
body {
padding: 0;
margin: 0;
}
header .sticky,
nav .nav,
aside,
#form {
display:none;
}
main .content {
width: 100% !important;
}
aside {
display: none;
}
form {
display: none;
}
}
Loading

0 comments on commit 60e0a61

Please sign in to comment.