From f96b91c25483fc14d94911007c204b9416726b93 Mon Sep 17 00:00:00 2001 From: pixelroot Date: Mon, 10 Sep 2012 11:01:43 +0200 Subject: [PATCH 01/10] modified: view/theme/smoothly/style.css --- view/theme/smoothly/style.css | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index 9667eaf1d0..ae19150a06 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -127,7 +127,7 @@ input[type=submit]:active { section { float: left; - padding-top: 60px; + padding-top: 40px; /*60*/ width: 730px; font-size: 0.9em; line-height: 1.2em; @@ -909,10 +909,9 @@ profile-jot-banner-wrapper { .tabs { min-width: 400px; list-style: none; - padding: 0px; /*10*/ + padding: 10px 0px; /*border-bottom: 1px solid #efefef;*/ font-size: 0.9em; - margin-top: 0px; } .tabs li { display: inline;} From e492664325d4fa1ed8c90000d41fef04524b138a Mon Sep 17 00:00:00 2001 From: pixelroot Date: Mon, 10 Sep 2012 12:30:34 +0200 Subject: [PATCH 02/10] new file: view/theme/smoothly/follow.tpl new file: view/theme/smoothly/peoplefind.tpl modified: view/theme/smoothly/style.css --- view/theme/smoothly/follow.tpl | 8 ++++++++ view/theme/smoothly/peoplefind.tpl | 14 +++++++++++++ view/theme/smoothly/style.css | 33 +++++++++++++++++++++--------- 3 files changed, 45 insertions(+), 10 deletions(-) create mode 100644 view/theme/smoothly/follow.tpl create mode 100644 view/theme/smoothly/peoplefind.tpl diff --git a/view/theme/smoothly/follow.tpl b/view/theme/smoothly/follow.tpl new file mode 100644 index 0000000000..9c8a6bf3f2 --- /dev/null +++ b/view/theme/smoothly/follow.tpl @@ -0,0 +1,8 @@ +
+

$connect

+
$desc
+
+ +
+
+ diff --git a/view/theme/smoothly/peoplefind.tpl b/view/theme/smoothly/peoplefind.tpl new file mode 100644 index 0000000000..106abdb1ec --- /dev/null +++ b/view/theme/smoothly/peoplefind.tpl @@ -0,0 +1,14 @@ +
+

$findpeople

+
$desc
+
+ +
+ + + + {{ if $inv }} + + {{ endif }} +
+ diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index ae19150a06..1f71ae7b83 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -88,8 +88,19 @@ input[type=text] { border-radius: 3px 3px 3px 3px; } +input[type=text-sidebar] { + border: 1px solid #b0b0b0; + padding: 2px; + width: 172px; + margin-left: 10px; + margin-top: 10px; + -webkit-border-radius: 3px 3px 3px 3px; + -moz-border-radius: 3px 3px 3px 3px; + border-radius: 3px 3px 3px 3px; +} + input[type=submit] { - margin: 0px 0px 5px 2px; + margin: 10px; border: none; font-size: 0.9em; padding: 5px; @@ -550,11 +561,11 @@ aside h4 { font-size: 1.3em; } padding: 5px 5px 5px 5px; } #netsearch-box input[type="text"] { - width: 175px; + width: 97%; } #netsearch-box input[type="submit"] { - width: 48%; - margin-top: 5px; + width: auto; + /*margin-top: 5px;*/ } h3#search:before { @@ -2047,14 +2058,16 @@ margin-left: 0px; } #side-follow-submit { - width: 70px; + width: 178px; + margin: 10px; + text-align: center; } #side-match-link { - width: 180px; + width: 158px; padding: 10px; - margin: auto; - margin-bottom: 20px; + margin: auto 10px 20px; + /*margin-bottom: 20px;*/ -moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf; -webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf; box-shadow:inset 0px 1px 0px 0px #cfcfcf; @@ -2090,7 +2103,7 @@ margin-left: 0px; } #side-invite-link { - width: 180px; + width: 80%; padding: 10px; margin: auto; margin-bottom: 20px; @@ -2130,7 +2143,7 @@ margin-left: 0px; } #side-suggest-link { - width: 180px; + width: 80%; padding: 10px; margin: auto; margin-bottom: 20px; From 7603e2de7536d83007b1bbb34f5c141844f3cc4b Mon Sep 17 00:00:00 2001 From: pixelroot Date: Mon, 10 Sep 2012 14:18:24 +0200 Subject: [PATCH 03/10] deleted: view/theme/smoothly/comment_item.tpl deleted: view/theme/smoothly/moderated_comment.tpl modified: view/theme/smoothly/style.css --- view/theme/smoothly/comment_item.tpl | 66 ----------------------- view/theme/smoothly/moderated_comment.tpl | 61 --------------------- view/theme/smoothly/style.css | 20 +++---- 3 files changed, 10 insertions(+), 137 deletions(-) delete mode 100755 view/theme/smoothly/comment_item.tpl delete mode 100755 view/theme/smoothly/moderated_comment.tpl diff --git a/view/theme/smoothly/comment_item.tpl b/view/theme/smoothly/comment_item.tpl deleted file mode 100755 index f64ae753b6..0000000000 --- a/view/theme/smoothly/comment_item.tpl +++ /dev/null @@ -1,66 +0,0 @@ -
- {{ if $threaded }} - $comment - - -
diff --git a/view/theme/smoothly/moderated_comment.tpl b/view/theme/smoothly/moderated_comment.tpl deleted file mode 100755 index b0451c8c60..0000000000 --- a/view/theme/smoothly/moderated_comment.tpl +++ /dev/null @@ -1,61 +0,0 @@ -
-
- - - - - - - -
- $mytitle -
-
- -
    -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
    • -
-
- - -
- - -
-
- -
diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index 1f71ae7b83..7d7f1db215 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -288,10 +288,10 @@ nav { padding: 0; width: 960px; z-index: 10000; - height: 50px; + height: 40px; position: fixed; color: #efefef; - background: url("nav-bg.png") no-repeat scroll 0px 7px transparent; + background: url("nav-bg.png") no-repeat scroll 0px 0px transparent; /*background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #7c7d7b), color-stop(1, #555753) );*/ /*background:-moz-linear-gradient( center top, #7c7d7b 5%, #555753 100% );*/ /*filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#7c7d7b', endColorstr='#555753');*/ @@ -306,7 +306,7 @@ nav #banner { display: block; position: absolute; margin-left: 3px; /*10*/ - margin-top: 10px; /*5*/ + margin-top: 3px; /*5*/ padding-bottom:5px; } nav #banner #logo-text a { @@ -320,7 +320,7 @@ nav #user-menu { width: 190px; /*240*/ float: right; margin-right: 5px; /*20%*/ - margin-top: 11px; + margin-top: 3px; padding: 5px; position: relative; vertical-align: middle; @@ -387,7 +387,7 @@ ul#user-menu-popup li a.nav-sep { border-top: 1px solid #989898; border-style:in #notifications { height: 32px; position: absolute; - top:10px; left: 35%; + top:2px; left: 35%; } .nav-ajax-update { width: 44px; @@ -401,7 +401,7 @@ ul#user-menu-popup li a.nav-sep { border-top: 1px solid #989898; border-style:in padding-left: 11px; } #notify-update { background-position: 0px -168px; } -#net-update { background-position: 0px -126px } +#net-update { background-position: 0px -126px; } #mail-update { background-position: 0px -40px; } #intro-update { background-position: 0px -84px; } #home-update { background-position: 0px 0px; } @@ -1789,7 +1789,7 @@ margin-left: 0px; .mail-list-detail { margin-left: 100px; - width: 300px; + width: 600px; min-height: 70px; padding: 20px; padding-top:10px; @@ -2080,7 +2080,7 @@ margin-left: 0px; border-radius:5px; padding: 5px 10px 5px 10px; color: #efefef; - font-size: 1.2em; + font-size: 1.1em; text-align: center; } @@ -2119,7 +2119,7 @@ margin-left: 0px; border-radius:5px; padding: 5px 10px 5px 10px; color: #efefef; - font-size: 1.2em; + font-size: 1.1em; text-align: center; } @@ -2159,7 +2159,7 @@ margin-left: 0px; border-radius:5px; padding: 5px 10px 5px 10px; color: #efefef; - font-size: 1.2em; + font-size: 1.1em; text-align: center; } From c059f92b5a64bc3e56681ec5ff703a784945f869 Mon Sep 17 00:00:00 2001 From: pixelroot Date: Mon, 10 Sep 2012 14:36:51 +0200 Subject: [PATCH 04/10] modified: view/theme/smoothly/style.css --- view/theme/smoothly/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index 7d7f1db215..69c5408c3b 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -387,7 +387,7 @@ ul#user-menu-popup li a.nav-sep { border-top: 1px solid #989898; border-style:in #notifications { height: 32px; position: absolute; - top:2px; left: 35%; + top:3px; left: 35%; } .nav-ajax-update { width: 44px; From aef0824cc803e36ef79a3809b86e1e12c9f21e85 Mon Sep 17 00:00:00 2001 From: pixelroot Date: Mon, 10 Sep 2012 14:52:47 +0200 Subject: [PATCH 05/10] modified: view/theme/smoothly/style.css --- view/theme/smoothly/style.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index 69c5408c3b..373ad38571 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -3,7 +3,7 @@ Smoothly Created by Anne Walk and Devlon Duthie on 2011-09-24 - Modified by alex@friendica.pixelbits.de on 2012-09-06 + Modified by alex@friendica.pixelbits.de on 2012-09-10 */ /* ========== */ @@ -138,7 +138,7 @@ input[type=submit]:active { section { float: left; - padding-top: 40px; /*60*/ + padding-top: 20px; /*60*/ width: 730px; font-size: 0.9em; line-height: 1.2em; @@ -920,7 +920,7 @@ profile-jot-banner-wrapper { .tabs { min-width: 400px; list-style: none; - padding: 10px 0px; + padding: 20px 0px 0px; /*border-bottom: 1px solid #efefef;*/ font-size: 0.9em; } From 264f32db80e2c769acf12ede7b746c51123e7478 Mon Sep 17 00:00:00 2001 From: pixelroot Date: Mon, 10 Sep 2012 14:58:57 +0200 Subject: [PATCH 06/10] modified: view/theme/smoothly/style.css --- view/theme/smoothly/style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index 373ad38571..4ea7f922d8 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -3,7 +3,7 @@ Smoothly Created by Anne Walk and Devlon Duthie on 2011-09-24 - Modified by alex@friendica.pixelbits.de on 2012-09-10 + Modified by alex@friendica.pixelbits.de on 2012-09-06 */ /* ========== */ @@ -138,7 +138,7 @@ input[type=submit]:active { section { float: left; - padding-top: 20px; /*60*/ + padding-top: 30px; /*60*/ width: 730px; font-size: 0.9em; line-height: 1.2em; From e51440ec98541d707a38ed094c52faa31616cb6a Mon Sep 17 00:00:00 2001 From: pixelroot Date: Mon, 10 Sep 2012 15:19:43 +0200 Subject: [PATCH 07/10] modified: view/theme/smoothly/style.css --- view/theme/smoothly/style.css | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index 4ea7f922d8..eaa6bdd2fe 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -138,7 +138,7 @@ input[type=submit]:active { section { float: left; - padding-top: 30px; /*60*/ + padding-top: 40px; /*60*/ width: 730px; font-size: 0.9em; line-height: 1.2em; @@ -1172,7 +1172,7 @@ profile-jot-banner-wrapper { } .icon.drop, -.icon.drophide { float: left;} +.icon.drophide { float: right;} #item-delete-selected { overflow: auto; width: 100%;} @@ -1315,7 +1315,7 @@ div[id$="wrapper"] br { clear: left; } #profile-listing-new-link-wrapper { float: left; display: inline; - width: 130px; + width: auto; margin-left:5px; margin-top: 20px; padding: 5px 10px 5px 10px; @@ -1830,6 +1830,7 @@ margin-left: 0px; .mail-conv-outside-wrapper { margin-bottom: 10px; + margin-top: 30px; } .mail-conv-sender {float: left; margin: 0px 5px 5px 0px; } @@ -1847,8 +1848,8 @@ margin-left: 0px; .mail-conv-detail { width: 500px; - padding: 30px; - padding-bottom: 10px; + padding: 20px; + padding-bottom: 20px; margin-left: 20px; margin-bottom: 0px; vertical-align: middle; @@ -2321,14 +2322,16 @@ margin-left: 0px; } #settings-default-perms { - width: 160px; + width: 260px; text-align: center; -moz-box-shadow:inset 0px 1px 0px 0px #cfcfcf; -webkit-box-shadow:inset 0px 1px 0px 0px #cfcfcf; box-shadow:inset 0px 1px 0px 0px #cfcfcf; background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #7c7d7b), color-stop(1, #555753) ); - background:-moz-linear-gradient( center top, #7c7d7b 5%, #555753 100% ); + /*background:-moz-linear-gradient( center top, #7c7d7b 5%, #555753 100% );*/ + background: -moz-linear-gradient(center top , #BDBDBD 5%, #A2A2A2 100%) repeat scroll 0 0 #BDBDBD; filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#7c7d7b', endColorstr='#555753'); + color: #EFEFEF; background-color:#7c7d7b; -moz-border-radius:5px; -webkit-border-radius:5px; @@ -2786,7 +2789,7 @@ tr { list-style-position: inside; font-size: 1em; padding: 5px; - width: 100px; + width: auto; margin: 5px; } From b5dee575a87428680602eb0fff8bc6ea2e663bfb Mon Sep 17 00:00:00 2001 From: pixelroot Date: Mon, 10 Sep 2012 15:38:44 +0200 Subject: [PATCH 08/10] modified: style.css --- view/theme/smoothly/style.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index eaa6bdd2fe..ee3a27217b 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -2849,7 +2849,8 @@ tr { /* =============== */ .field { - margin-bottom: 5px; + margin-bottom: 10px; + margin-top: 10px; padding-bottom: 0px; /*overflow: auto;*/ width: 90%; From ee20708f754cee252e328da2efd9ac27fe428373 Mon Sep 17 00:00:00 2001 From: pixelroot Date: Mon, 10 Sep 2012 16:21:54 +0200 Subject: [PATCH 09/10] modified: view/theme/smoothly/style.css --- view/theme/smoothly/style.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index ee3a27217b..bdfeadcca9 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -1172,7 +1172,7 @@ profile-jot-banner-wrapper { } .icon.drop, -.icon.drophide { float: right;} +.icon.drophide { float: right; margin-top: 8px; } #item-delete-selected { overflow: auto; width: 100%;} @@ -1264,6 +1264,8 @@ profile-jot-banner-wrapper { #item-delete-selected-desc { color: #898989; + float: right; + margin-top: 10px; } .wall-item-body code { From 9685ba3fbc812a92cb5868f81e694588d3f4d75f Mon Sep 17 00:00:00 2001 From: pixelroot Date: Mon, 10 Sep 2012 16:31:36 +0200 Subject: [PATCH 10/10] modified: view/theme/smoothly/style.css --- view/theme/smoothly/style.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index bdfeadcca9..541a86a893 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -1172,7 +1172,7 @@ profile-jot-banner-wrapper { } .icon.drop, -.icon.drophide { float: right; margin-top: 8px; } +.icon.drophide { float: right;} #item-delete-selected { overflow: auto; width: 100%;} @@ -1265,7 +1265,6 @@ profile-jot-banner-wrapper { #item-delete-selected-desc { color: #898989; float: right; - margin-top: 10px; } .wall-item-body code {