aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorSimon <simon@kisikew.org>2012-04-27 11:38:19 -0700
committerSimon <simon@kisikew.org>2012-04-27 11:38:19 -0700
commita632f03531faafe7cd16b67f4895a6a0f35e0102 (patch)
tree2a29b5ae519bb9fc699f9c26b9f1d5359a8fb105 /view
parente315b01f86165a0c62c94e6358669b7d96d1462a (diff)
parent64f3af49fa31ee566515cb878f5e5e48a0b4f6b3 (diff)
downloadvolse-hubzilla-a632f03531faafe7cd16b67f4895a6a0f35e0102.tar.gz
volse-hubzilla-a632f03531faafe7cd16b67f4895a6a0f35e0102.tar.bz2
volse-hubzilla-a632f03531faafe7cd16b67f4895a6a0f35e0102.zip
Merge pull request #273 from simonlnu/master
fix netsearch-box dupe and stuff
Diffstat (limited to 'view')
-rw-r--r--view/theme/dispy/dark/style.css3
-rw-r--r--view/theme/dispy/dark/style.less16
-rw-r--r--view/theme/dispy/light/style.css3
-rw-r--r--view/theme/dispy/light/style.less16
4 files changed, 14 insertions, 24 deletions
diff --git a/view/theme/dispy/dark/style.css b/view/theme/dispy/dark/style.css
index 553279415..26a21bcf1 100644
--- a/view/theme/dispy/dark/style.css
+++ b/view/theme/dispy/dark/style.css
@@ -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;}
#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;}
-#netsearch-box{margin:20px 0px 30px;width:150px;}#netsearch-box #search-submit{margin:5px 5px 0px 0px;}
.ttright{margin:0px 0px 0px 0px;}
.contact-block-div{width:50px;height:50px;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;}
.nets-ul{list-style-type:none;padding-left:0px;}.nets-ul li{margin:10px 0 0;}
.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;}
.admin.linklist{border:0;padding:0;}
.admin.link{list-style-position:inside;}
diff --git a/view/theme/dispy/dark/style.less b/view/theme/dispy/dark/style.less
index 321cb7618..c56adf5a1 100644
--- a/view/theme/dispy/dark/style.less
+++ b/view/theme/dispy/dark/style.less
@@ -743,12 +743,6 @@ nav #nav-notifications-linkmenu {
font-size: 1.2em;
padding: 0.2em 0.5em; }
-#netsearch-box {
- margin: 20px 0px 30px;
- width: 150px;
- #search-submit {
- margin: 5px 5px 0px 0px; } }
-
.ttright {
margin: 0px 0px 0px 0px; }
@@ -2222,10 +2216,12 @@ div {
margin-left: 0px; }
#netsearch-box {
- margin-top: 20px;
- width: 150px;
- #search-submit {
- margin: 5px 0px 0px 0px; } }
+ margin: 20px 0px 30px;
+ width: 135px;
+ #search-submit {
+ margin: 5px 5px 0px 0px;
+ }
+}
/**
* admin
diff --git a/view/theme/dispy/light/style.css b/view/theme/dispy/light/style.css
index 087555615..2c95d70da 100644
--- a/view/theme/dispy/light/style.css
+++ b/view/theme/dispy/light/style.css
@@ -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;}
#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;}
-#netsearch-box{margin:20px 0px 30px;width:150px;}#netsearch-box #search-submit{margin:5px 5px 0px 0px;}
.ttright{margin:0px 0px 0px 0px;}
.contact-block-div{width:50px;height:50px;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;}
.nets-ul{list-style-type:none;padding-left:0px;}.nets-ul li{margin:10px 0 0;}
.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;}
.admin.linklist{border:0;padding:0;}
.admin.link{list-style-position:inside;}
diff --git a/view/theme/dispy/light/style.less b/view/theme/dispy/light/style.less
index f7c4135c7..18151bc27 100644
--- a/view/theme/dispy/light/style.less
+++ b/view/theme/dispy/light/style.less
@@ -744,12 +744,6 @@ nav #nav-notifications-linkmenu {
font-size: 1.2em;
padding: 0.2em 0.5em; }
-#netsearch-box {
- margin: 20px 0px 30px;
- width: 150px;
- #search-submit {
- margin: 5px 5px 0px 0px; } }
-
.ttright {
margin: 0px 0px 0px 0px; }
@@ -2223,10 +2217,12 @@ div {
margin-left: 0px; }
#netsearch-box {
- margin-top: 20px;
- width: 150px;
- #search-submit {
- margin: 5px 0px 0px 0px; } }
+ margin: 20px 0px 30px;
+ width: 135px;
+ #search-submit {
+ margin: 5px 5px 0px 0px;
+ }
+}
/**
* admin