Merge https://github.com/friendica/friendica into pull
This commit is contained in:
commit
4b92e3543c
|
@ -232,8 +232,8 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le
|
||||||
.caption{position:absolute;bottom:0;margin:0 5px;}
|
.caption{position:absolute;bottom:0;margin:0 5px;}
|
||||||
#photo-photo{position:relative;float:left;}
|
#photo-photo{position:relative;float:left;}
|
||||||
#photo-prev-link,#photo-next-link{position:absolute;width:30%;height:100%;background-color:rgba(255, 255, 255, 0.5);opacity:0;-webkit-transition:all 0.2s ease-in-out;-moz-transition:all 0.2s ease-in-out;-o-transition:all 0.2s ease-in-out;-ms-transition:all 0.2s ease-in-out;transition:all 0.2s ease-in-out;background-position:center center;background-repeat:no-repeat;}
|
#photo-prev-link,#photo-next-link{position:absolute;width:30%;height:100%;background-color:rgba(255, 255, 255, 0.5);opacity:0;-webkit-transition:all 0.2s ease-in-out;-moz-transition:all 0.2s ease-in-out;-o-transition:all 0.2s ease-in-out;-ms-transition:all 0.2s ease-in-out;transition:all 0.2s ease-in-out;background-position:center center;background-repeat:no-repeat;}
|
||||||
#photo-prev-link{left:0;top:0;background-image:url(dark/prev.png);}
|
#photo-prev-link{background-image:url(dark/prev.png);height:350px;left:1%;top:215px;width:50px;z-index:10;}
|
||||||
#photo-next-link{right:0;top:0;background-image:url(dark/next.png);}
|
#photo-next-link{background-image:url(dark/next.png);height:350px;right:45%;top:215px;width:50px;}
|
||||||
#photo-prev-link a,#photo-next-link a{display:block;width:100%;height:100%;overflow:hidden;text-indent:-900000px;}
|
#photo-prev-link a,#photo-next-link a{display:block;width:100%;height:100%;overflow:hidden;text-indent:-900000px;}
|
||||||
#photo-prev-link:hover{opacity:1;-webkit-transition:all 0.2s ease-in-out;-moz-transition:all 0.2s ease-in-out;-o-transition:all 0.2s ease-in-out;-ms-transition:all 0.2s ease-in-out;transition:all 0.2s ease-in-out;}
|
#photo-prev-link:hover{opacity:1;-webkit-transition:all 0.2s ease-in-out;-moz-transition:all 0.2s ease-in-out;-o-transition:all 0.2s ease-in-out;-ms-transition:all 0.2s ease-in-out;transition:all 0.2s ease-in-out;}
|
||||||
#photo-next-link:hover{opacity:1;-webkit-transition:all 0.2s ease-in-out;-moz-transition:all 0.2s ease-in-out;-o-transition:all 0.2s ease-in-out;-ms-transition:all 0.2s ease-in-out;transition:all 0.2s ease-in-out;}
|
#photo-next-link:hover{opacity:1;-webkit-transition:all 0.2s ease-in-out;-moz-transition:all 0.2s ease-in-out;-o-transition:all 0.2s ease-in-out;-ms-transition:all 0.2s ease-in-out;transition:all 0.2s ease-in-out;}
|
||||||
|
@ -381,7 +381,7 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le
|
||||||
#peoplefind-sidebar form{margin-bottom:10px;}
|
#peoplefind-sidebar form{margin-bottom:10px;}
|
||||||
#sidebar-new-group:hover{}
|
#sidebar-new-group:hover{}
|
||||||
#sidebar-new-group:active{position:relative;top:1px;}
|
#sidebar-new-group:active{position:relative;top:1px;}
|
||||||
#side-peoplefind-url{background-color:#2e2f2e;color:#eec;border:1px 999 solid;margin-right:3px;width:75%;}#side-peoplefind-url:hover,#side-peoplefind-url:focus{background-color:#efefef;color:#222;border:1px 333 solid;}
|
#side-peoplefind-url{background-color:#2e2f2e;color:#eec;border:1px #999 solid;margin-right:3px;width:75%;}#side-peoplefind-url:hover,#side-peoplefind-url:focus{background-color:#efefef;color:#222;border:1px 333 solid;}
|
||||||
.nets-ul{list-style-type:none;padding-left:0px;}.nets-ul li{margin:10px 0 0;}
|
.nets-ul{list-style-type:none;padding-left:0px;}.nets-ul li{margin:10px 0 0;}
|
||||||
.nets-link,.nets-all{margin-left:0px;}
|
.nets-link,.nets-all{margin-left:0px;}
|
||||||
#netsearch-box{margin-top:20px;width:150px;}#netsearch-box #search-submit{margin:5px 0px 0px 0px;}
|
#netsearch-box{margin-top:20px;width:150px;}#netsearch-box #search-submit{margin:5px 0px 0px 0px;}
|
||||||
|
|
|
@ -1485,14 +1485,21 @@ div {
|
||||||
background-repeat: no-repeat; }
|
background-repeat: no-repeat; }
|
||||||
|
|
||||||
#photo-prev-link {
|
#photo-prev-link {
|
||||||
left: 0;
|
background-image: url(dark/prev.png);
|
||||||
top: 0;
|
height: 350px;
|
||||||
background-image: url(dark/prev.png); }
|
left: 1%;
|
||||||
|
top: 215px;
|
||||||
|
width: 50px;
|
||||||
|
z-index: 10;
|
||||||
|
}
|
||||||
|
|
||||||
#photo-next-link {
|
#photo-next-link {
|
||||||
right: 0;
|
background-image: url(dark/next.png);
|
||||||
top: 0;
|
height: 350px;
|
||||||
background-image: url(dark/next.png); }
|
right: 45%;
|
||||||
|
top: 215px;
|
||||||
|
width: 50px;
|
||||||
|
}
|
||||||
|
|
||||||
#photo-prev-link a, #photo-next-link a {
|
#photo-prev-link a, #photo-next-link a {
|
||||||
display: block;
|
display: block;
|
||||||
|
@ -2181,7 +2188,7 @@ div {
|
||||||
#side-peoplefind-url {
|
#side-peoplefind-url {
|
||||||
background-color: #2e2f2e;
|
background-color: #2e2f2e;
|
||||||
color: #eec;
|
color: #eec;
|
||||||
border: 1px 999 solid;
|
border: 1px #999 solid;
|
||||||
margin-right: 3px;
|
margin-right: 3px;
|
||||||
width: 75%;
|
width: 75%;
|
||||||
&:hover, &:focus {
|
&:hover, &:focus {
|
||||||
|
|
|
@ -232,8 +232,8 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le
|
||||||
.caption{position:absolute;bottom:0;margin:0 5px;}
|
.caption{position:absolute;bottom:0;margin:0 5px;}
|
||||||
#photo-photo{position:relative;float:left;}
|
#photo-photo{position:relative;float:left;}
|
||||||
#photo-prev-link,#photo-next-link{position:absolute;width:30%;height:100%;background-color:rgba(255, 255, 255, 0.5);opacity:0;-webkit-transition:all 0.2s ease-in-out;-moz-transition:all 0.2s ease-in-out;-o-transition:all 0.2s ease-in-out;-ms-transition:all 0.2s ease-in-out;transition:all 0.2s ease-in-out;background-position:center center;background-repeat:no-repeat;}
|
#photo-prev-link,#photo-next-link{position:absolute;width:30%;height:100%;background-color:rgba(255, 255, 255, 0.5);opacity:0;-webkit-transition:all 0.2s ease-in-out;-moz-transition:all 0.2s ease-in-out;-o-transition:all 0.2s ease-in-out;-ms-transition:all 0.2s ease-in-out;transition:all 0.2s ease-in-out;background-position:center center;background-repeat:no-repeat;}
|
||||||
#photo-prev-link{left:0;top:0;background-image:url(light/prev.png);}
|
#photo-prev-link{background-image:url(light/prev.png);height:350px;left:1%;top:215px;width:50px;z-index:10;}
|
||||||
#photo-next-link{right:0;top:0;background-image:url(light/next.png);}
|
#photo-next-link{background-image:url(light/next.png);height:350px;right:45%;top:215px;width:50px;}
|
||||||
#photo-prev-link a,#photo-next-link a{display:block;width:100%;height:100%;overflow:hidden;text-indent:-900000px;}
|
#photo-prev-link a,#photo-next-link a{display:block;width:100%;height:100%;overflow:hidden;text-indent:-900000px;}
|
||||||
#photo-prev-link:hover{opacity:1;-webkit-transition:all 0.2s ease-in-out;-moz-transition:all 0.2s ease-in-out;-o-transition:all 0.2s ease-in-out;-ms-transition:all 0.2s ease-in-out;transition:all 0.2s ease-in-out;}
|
#photo-prev-link:hover{opacity:1;-webkit-transition:all 0.2s ease-in-out;-moz-transition:all 0.2s ease-in-out;-o-transition:all 0.2s ease-in-out;-ms-transition:all 0.2s ease-in-out;transition:all 0.2s ease-in-out;}
|
||||||
#photo-next-link:hover{opacity:1;-webkit-transition:all 0.2s ease-in-out;-moz-transition:all 0.2s ease-in-out;-o-transition:all 0.2s ease-in-out;-ms-transition:all 0.2s ease-in-out;transition:all 0.2s ease-in-out;}
|
#photo-next-link:hover{opacity:1;-webkit-transition:all 0.2s ease-in-out;-moz-transition:all 0.2s ease-in-out;-o-transition:all 0.2s ease-in-out;-ms-transition:all 0.2s ease-in-out;transition:all 0.2s ease-in-out;}
|
||||||
|
@ -381,7 +381,7 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le
|
||||||
#peoplefind-sidebar form{margin-bottom:10px;}
|
#peoplefind-sidebar form{margin-bottom:10px;}
|
||||||
#sidebar-new-group:hover{}
|
#sidebar-new-group:hover{}
|
||||||
#sidebar-new-group:active{position:relative;top:1px;}
|
#sidebar-new-group:active{position:relative;top:1px;}
|
||||||
#side-peoplefind-url{background-color:#e5e0cf;color:#666;border:1px 666 solid;margin-right:3px;width:75%;}#side-peoplefind-url:hover,#side-peoplefind-url:focus{background-color:#efefef;color:#222;border:1px 333 solid;}
|
#side-peoplefind-url{background-color:#e5e0cf;color:#666;border:1px #666 solid;margin-right:3px;width:75%;}#side-peoplefind-url:hover,#side-peoplefind-url:focus{background-color:#efefef;color:#222;border:1px 333 solid;}
|
||||||
.nets-ul{list-style-type:none;padding-left:0px;}.nets-ul li{margin:10px 0 0;}
|
.nets-ul{list-style-type:none;padding-left:0px;}.nets-ul li{margin:10px 0 0;}
|
||||||
.nets-link,.nets-all{margin-left:0px;}
|
.nets-link,.nets-all{margin-left:0px;}
|
||||||
#netsearch-box{margin-top:20px;width:150px;}#netsearch-box #search-submit{margin:5px 0px 0px 0px;}
|
#netsearch-box{margin-top:20px;width:150px;}#netsearch-box #search-submit{margin:5px 0px 0px 0px;}
|
||||||
|
|
|
@ -1486,14 +1486,21 @@ div {
|
||||||
background-repeat: no-repeat; }
|
background-repeat: no-repeat; }
|
||||||
|
|
||||||
#photo-prev-link {
|
#photo-prev-link {
|
||||||
left: 0;
|
background-image: url(light/prev.png);
|
||||||
top: 0;
|
height: 350px;
|
||||||
background-image: url(light/prev.png); }
|
left: 1%;
|
||||||
|
top: 215px;
|
||||||
|
width: 50px;
|
||||||
|
z-index: 10;
|
||||||
|
}
|
||||||
|
|
||||||
#photo-next-link {
|
#photo-next-link {
|
||||||
right: 0;
|
background-image: url(light/next.png);
|
||||||
top: 0;
|
height: 350px;
|
||||||
background-image: url(light/next.png); }
|
right: 45%;
|
||||||
|
top: 215px;
|
||||||
|
width: 50px;
|
||||||
|
}
|
||||||
|
|
||||||
#photo-prev-link a, #photo-next-link a {
|
#photo-prev-link a, #photo-next-link a {
|
||||||
display: block;
|
display: block;
|
||||||
|
@ -2182,7 +2189,7 @@ div {
|
||||||
#side-peoplefind-url {
|
#side-peoplefind-url {
|
||||||
background-color: #e5e0cf;
|
background-color: #e5e0cf;
|
||||||
color: #666;
|
color: #666;
|
||||||
border: 1px 666 solid;
|
border: 1px #666 solid;
|
||||||
margin-right: 3px;
|
margin-right: 3px;
|
||||||
width: 75%;
|
width: 75%;
|
||||||
&:hover, &:focus {
|
&:hover, &:focus {
|
||||||
|
|
Loading…
Reference in a new issue