MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #273 from simonlnu/master

Browse source 
fix netsearch-box dupe and stuff
This commit is contained in:
Simon 2012-04-27 11:38:19 -07:00
commit a632f03531
4 changed files with 14 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
view/theme/dispy/dark/style.css
View file

@ -108,7 +108,6 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
#profile-extra-links ul{margin-left:0px;padding-left:0px;list-style:none;} #profile-extra-links ul{margin-left:0px;padding-left:0px;list-style:none;}
#dfrn-request-link{background:#3465a4 url(dark/connect.png) no-repeat 95% center;border-radius:5px 5px 5px 5px;color:#eec;display:block;font-size:1.2em;padding:0.2em 0.5em;} #dfrn-request-link{background:#3465a4 url(dark/connect.png) no-repeat 95% center;border-radius:5px 5px 5px 5px;color:#eec;display:block;font-size:1.2em;padding:0.2em 0.5em;}
#wallmessage-link{color:#eee;display:block;font-size:1.2em;padding:0.2em 0.5em;} #wallmessage-link{color:#eee;display:block;font-size:1.2em;padding:0.2em 0.5em;}
#netsearch-box{margin:20px 0px 30px;width:150px;}#netsearch-box #search-submit{margin:5px 5px 0px 0px;}
.ttright{margin:0px 0px 0px 0px;} .ttright{margin:0px 0px 0px 0px;}
.contact-block-div{width:50px;height:50px;float:left;} .contact-block-div{width:50px;height:50px;float:left;}
.contact-block-textdiv{width:150px;height:34px;float:left;} .contact-block-textdiv{width:150px;height:34px;float:left;}
@ -385,7 +384,7 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le
#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:20px 0px 30px;width:135px;}#netsearch-box #search-submit{margin:5px 5px 0px 0px;}
#pending-update{float:right;color:#fff;font-weight:bold;background-color:#ff0000;padding:0 .3em;} #pending-update{float:right;color:#fff;font-weight:bold;background-color:#ff0000;padding:0 .3em;}
.admin.linklist{border:0;padding:0;} .admin.linklist{border:0;padding:0;}
.admin.link{list-style-position:inside;} .admin.link{list-style-position:inside;}

16
view/theme/dispy/dark/style.less
View file

@ -743,12 +743,6 @@ nav #nav-notifications-linkmenu {
font-size: 1.2em; font-size: 1.2em;
padding: 0.2em 0.5em; } padding: 0.2em 0.5em; }
#netsearch-box {
margin: 20px 0px 30px;
width: 150px;
#search-submit {
margin: 5px 5px 0px 0px; } }
.ttright { .ttright {
margin: 0px 0px 0px 0px; } margin: 0px 0px 0px 0px; }
@ -2222,10 +2216,12 @@ div {
margin-left: 0px; } margin-left: 0px; }
#netsearch-box { #netsearch-box {
margin-top: 20px; margin: 20px 0px 30px;
width: 150px; width: 135px;
#search-submit { #search-submit {
margin: 5px 0px 0px 0px; } } margin: 5px 5px 0px 0px;
}
}
/** /**
* admin * admin

3
view/theme/dispy/light/style.css
View file

@ -108,7 +108,6 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
#profile-extra-links ul{margin-left:0px;padding-left:0px;list-style:none;} #profile-extra-links ul{margin-left:0px;padding-left:0px;list-style:none;}
#dfrn-request-link{background:#3465a4 url(light/connect.png) no-repeat 95% center;border-radius:5px 5px 5px 5px;color:#fff;display:block;font-size:1.2em;padding:0.2em 0.5em;} #dfrn-request-link{background:#3465a4 url(light/connect.png) no-repeat 95% center;border-radius:5px 5px 5px 5px;color:#fff;display:block;font-size:1.2em;padding:0.2em 0.5em;}
#wallmessage-link{color:#eee;display:block;font-size:1.2em;padding:0.2em 0.5em;} #wallmessage-link{color:#eee;display:block;font-size:1.2em;padding:0.2em 0.5em;}
#netsearch-box{margin:20px 0px 30px;width:150px;}#netsearch-box #search-submit{margin:5px 5px 0px 0px;}
.ttright{margin:0px 0px 0px 0px;} .ttright{margin:0px 0px 0px 0px;}
.contact-block-div{width:50px;height:50px;float:left;} .contact-block-div{width:50px;height:50px;float:left;}
.contact-block-textdiv{width:150px;height:34px;float:left;} .contact-block-textdiv{width:150px;height:34px;float:left;}
@ -385,7 +384,7 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le
#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:20px 0px 30px;width:135px;}#netsearch-box #search-submit{margin:5px 5px 0px 0px;}
#pending-update{float:right;color:#fff;font-weight:bold;background-color:#ff0000;padding:0 .3em;} #pending-update{float:right;color:#fff;font-weight:bold;background-color:#ff0000;padding:0 .3em;}
.admin.linklist{border:0;padding:0;} .admin.linklist{border:0;padding:0;}
.admin.link{list-style-position:inside;} .admin.link{list-style-position:inside;}

16
view/theme/dispy/light/style.less
View file

@ -744,12 +744,6 @@ nav #nav-notifications-linkmenu {
font-size: 1.2em; font-size: 1.2em;
padding: 0.2em 0.5em; } padding: 0.2em 0.5em; }
#netsearch-box {
margin: 20px 0px 30px;
width: 150px;
#search-submit {
margin: 5px 5px 0px 0px; } }
.ttright { .ttright {
margin: 0px 0px 0px 0px; } margin: 0px 0px 0px 0px; }
@ -2223,10 +2217,12 @@ div {
margin-left: 0px; } margin-left: 0px; }
#netsearch-box { #netsearch-box {
margin-top: 20px; margin: 20px 0px 30px;
width: 150px; width: 135px;
#search-submit { #search-submit {
margin: 5px 0px 0px 0px; } } margin: 5px 5px 0px 0px;
}
}
/** /**
* admin * admin