From bff9c3d46073961372abd9d95fa0ac20916d37c1 Mon Sep 17 00:00:00 2001 From: pixelroot Date: Fri, 14 Sep 2012 08:50:10 +0200 Subject: [PATCH 1/7] modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php --- view/theme/smoothly/style.css | 5 +++-- view/theme/smoothly/theme.php | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index 8c6dd2290..cd88fb622 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-13 + Modified by alex@friendica.pixelbits.de on 2012-09-14 ** Colors ** @@ -371,7 +371,8 @@ nav #banner #logo-text a { nav #user-menu { display: block; - width: 190px; + width: auto; + min-width: 190px; float: right; margin-right: 5px; margin-top: 4px; diff --git a/view/theme/smoothly/theme.php b/view/theme/smoothly/theme.php index d66fd4ca4..edc549f99 100644 --- a/view/theme/smoothly/theme.php +++ b/view/theme/smoothly/theme.php @@ -2,7 +2,7 @@ /* * Name: Smoothly - * Description: Theme optimized for iPad[2] + * Description: Like coffee with milk. Theme works fine with iPad[2]. * Version: 0.7 * Author: Alex * Maintainer: Alex From d1984c4c643390664a4e32c8c9f518e1ef6ad45c Mon Sep 17 00:00:00 2001 From: pixelroot Date: Fri, 14 Sep 2012 09:33:21 +0200 Subject: [PATCH 2/7] modified: view/theme/smoothly/nav.tpl modified: view/theme/smoothly/style.css --- view/theme/smoothly/nav.tpl | 5 ----- view/theme/smoothly/style.css | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/view/theme/smoothly/nav.tpl b/view/theme/smoothly/nav.tpl index b010442a9..50546a864 100644 --- a/view/theme/smoothly/nav.tpl +++ b/view/theme/smoothly/nav.tpl @@ -58,11 +58,6 @@ - - diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index cd88fb622..6d9e9b3fa 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -3757,8 +3757,8 @@ hr.line-dots { ----------------------------------------------------------- */ #scrollup { position: fixed; - right: 5px; - bottom: 5px; + right: 1px; + bottom: 30px; z-index: 100; } From 1c4bea295fd639f4f8c218020b38d28f7b0d4470 Mon Sep 17 00:00:00 2001 From: pixelroot Date: Fri, 14 Sep 2012 09:33:47 +0200 Subject: [PATCH 3/7] new file: view/theme/smoothly/default.php --- view/theme/smoothly/default.php | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 view/theme/smoothly/default.php diff --git a/view/theme/smoothly/default.php b/view/theme/smoothly/default.php new file mode 100644 index 000000000..c63975044 --- /dev/null +++ b/view/theme/smoothly/default.php @@ -0,0 +1,20 @@ + + + + <?php if(x($page,'title')) echo $page['title'] ?> + + + + + + +
+
+

back to top
+
+
+ +
+ + + From d00257354309451f1df97bc5f2c23d1ad06bc2f7 Mon Sep 17 00:00:00 2001 From: pixelroot Date: Fri, 14 Sep 2012 09:55:54 +0200 Subject: [PATCH 4/7] deleted: view/theme/smoothly/default.php modified: view/theme/smoothly/nav.tpl --- view/theme/smoothly/default.php | 20 -------------------- view/theme/smoothly/nav.tpl | 4 ++++ 2 files changed, 4 insertions(+), 20 deletions(-) delete mode 100644 view/theme/smoothly/default.php diff --git a/view/theme/smoothly/default.php b/view/theme/smoothly/default.php deleted file mode 100644 index c63975044..000000000 --- a/view/theme/smoothly/default.php +++ /dev/null @@ -1,20 +0,0 @@ - - - - <?php if(x($page,'title')) echo $page['title'] ?> - - - - - - -
-
-

back to top
-
-
- -
- - - diff --git a/view/theme/smoothly/nav.tpl b/view/theme/smoothly/nav.tpl index 50546a864..210b89a06 100644 --- a/view/theme/smoothly/nav.tpl +++ b/view/theme/smoothly/nav.tpl @@ -58,6 +58,10 @@ + + From bdc5a3ab2969d3d8a16042604ddadbbe6b2299ef Mon Sep 17 00:00:00 2001 From: pixelroot Date: Fri, 14 Sep 2012 10:16:35 +0200 Subject: [PATCH 5/7] deleted: view/theme/smoothly/group_edit.tpl --- view/theme/smoothly/group_edit.tpl | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 view/theme/smoothly/group_edit.tpl diff --git a/view/theme/smoothly/group_edit.tpl b/view/theme/smoothly/group_edit.tpl deleted file mode 100644 index a8b3f92a0..000000000 --- a/view/theme/smoothly/group_edit.tpl +++ /dev/null @@ -1,16 +0,0 @@ -

$title

- - -
-
-
- - - - $drop -
-
-
$desc
-
-
-
From e78b86f534d2f9b84a76920afbc8c8eb9148e99d Mon Sep 17 00:00:00 2001 From: pixelroot Date: Fri, 14 Sep 2012 11:57:13 +0200 Subject: [PATCH 6/7] modified: view/theme/smoothly/style.css --- view/theme/smoothly/style.css | 81 +++++++++++++++++++++++------------ 1 file changed, 54 insertions(+), 27 deletions(-) diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index 6d9e9b3fa..a0dc79df2 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -213,8 +213,6 @@ section { .button:hover { border: 1px solid #7C7D7B; box-shadow: 0 0 8px #BDBDBD; - /* -moz-box-shadow: 3px 3px 4px #959494; - -webkit-box-shadow: 3px 3px 4px #959494;*/ border-radius: 5px 5px 5px 5px; background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) ); background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% ); @@ -905,30 +903,51 @@ ul .sidebar-group-li .icon { background: #FFFFC8; } -#profile-jot-perms, #profile-jot-submit, #jot-preview-link { +#profile-jot-perms, #profile-jot-submit { width: 60px; font-size: 12px; - box-shadow: inset 0px 1px 0px 0px #cfcfcf; - -moz-box-shadow: inset 0px 1px 0px 0px #cfcfcf; - -webkit-box-shadow: inset 0px 1px 0px 0px #cfcfcf; background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) ); background: -moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% ); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2'); background-color: #bdbdbd; - border-radius: 5px; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; display: inline-block; color: #efefef; text-decoration: none; text-align: center; + border: 1px solid #7C7D7B; + border-radius: 5px 5px 5px 5px; +} + +#jot-preview-link { + float: right; + width: 60px; + /*height: 10px;*/ + margin-right: 180px; + /*margin-top: 0px; + margin-left: 10px;*/ + font-size: 12px; + background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #bdbdbd), color-stop(1, #a2a2a2) ); + background: -moz-linear-gradient( center top, #bdbdbd 5%, #a2a2a2 100% ); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bdbdbd', endColorstr='#a2a2a2'); + background-color: #bdbdbd; + display: inline-block; + color: #efefef; + text-decoration: none; + text-align: center; + padding: 5px 5px; + border: 1px solid #7C7D7B; + border-radius: 5px 5px 5px 5px; } #profile-jot-perms { - width: 30px; + width: 25px; + float: right; overflow: hidden; - border: 0px; - margin-left:5px; + margin-left: 10px; + margin-right: 80px; + margin-top: -28px; + border: 1px solid #7C7D7B; + border-radius: 5px 5px 5px 5px; } #jot-perms-perms .icon { @@ -936,11 +955,13 @@ ul .sidebar-group-li .icon { } #profile-jot-submit { - float: left; - margin-right: 5px; - border: 0px; - margin-top: 0px; - margin-left: -30px; + width: 80px; + float: right; + margin-right: 90px; + margin-top: -28px; + margin-left: 10px; + border: 1px solid #7C7D7B; + border-radius: 5px 5px 5px 5px; } #profile-jot-perms:hover, @@ -950,6 +971,9 @@ ul .sidebar-group-li .icon { background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% ); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); background-color: #1873a2; + border: 1px solid #7C7D7B; + box-shadow: 0 0 8px #BDBDBD; + border-radius: 5px 5px 5px 5px; } #profile-jot-perms:active, @@ -960,9 +984,9 @@ ul .sidebar-group-li .icon { } #character-counter { - position: absolute: - right: 100px; - top:100px; + position: absolute; + right: 100px; + top: 100px; } #profile-rotator-wrapper { float: right; @@ -1396,7 +1420,8 @@ profile-jot-banner-wrapper { } #item-delete-selected { - overflow: auto; + overflow: auto; + margin-top: 20px; width: 100%; } @@ -1494,21 +1519,23 @@ profile-jot-banner-wrapper { .comment-edit-submit-wrapper { width: 80%; margin-left: 40px; - text-align: right; + text-align: left; } .comment-edit-submit { height: 22px; + padding: 5px 5px; background-color: #a2a2a2; color: #eeeeec; - border-radius: 5px; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border: 0px; + border: 1px solid #CDCDCD; + border-radius: 5px 5px 5px 5px; } .comment-edit-submit:hover { background-color: #1873a2; + border: 1px solid #CDCDCD; + border-radius: 5px 5px 5px 5px; + box-shadow: 0 0 8px #BDBDBD; } .comment-edit-submit:active { @@ -1517,7 +1544,7 @@ profile-jot-banner-wrapper { #item-delete-selected-desc { color: #898989; - float: left; + float: right; } .wall-item-body code { From 252e112ad5f659725a76d6730498a83ecbd2f456 Mon Sep 17 00:00:00 2001 From: pixelroot Date: Fri, 14 Sep 2012 12:46:32 +0200 Subject: [PATCH 7/7] modified: view/theme/smoothly/style.css --- view/theme/smoothly/style.css | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index a0dc79df2..fd45e205a 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -984,9 +984,10 @@ ul .sidebar-group-li .icon { } #character-counter { - position: absolute; - right: 100px; - top: 100px; + position: relative; + float: left; + right: 0px; + top: 0px; } #profile-rotator-wrapper { float: right; @@ -3804,4 +3805,4 @@ hr.line-dots { /*div.wall-item-content-wrapper.shiny { background-image: url("star.png"); background-repeat: no-repeat; -}*/ \ No newline at end of file +}*/