From 6d1614e8fa4862702827543fcdf804be20925640 Mon Sep 17 00:00:00 2001 From: pixelroot Date: Wed, 24 Oct 2012 12:24:12 +0200 Subject: [PATCH 1/4] modified: view/theme/smoothly/login.tpl modified: view/theme/smoothly/style.css --- view/theme/smoothly/login.tpl | 2 +- view/theme/smoothly/style.css | 44 +++++++++++++++++++++++++++++++---- 2 files changed, 40 insertions(+), 6 deletions(-) diff --git a/view/theme/smoothly/login.tpl b/view/theme/smoothly/login.tpl index 483f540c9..281890f42 100644 --- a/view/theme/smoothly/login.tpl +++ b/view/theme/smoothly/login.tpl @@ -1,4 +1,4 @@ - +
diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index 913e5d6e4..902ac1c18 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -215,12 +215,18 @@ section { } #login_standard { - width: 210px; + width: 250px; float: left; + border: 1px solid #7C7D7B; + border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + padding: 10px; + margin: 10px 0 0 0; } #login_openid { - width: 210px; + width: 300px; margin-left: 150px; } @@ -249,6 +255,10 @@ section { margin-left: 75px; } +#login-submit-button { + width: 271px; +} + .login-form, margin-top: 10px; } @@ -351,7 +361,7 @@ nav #banner { display: block; position: absolute; margin-left: 3px; - margin-top: 3px; + /*margin-top: 2px;*/ padding-bottom: 5px; } @@ -385,6 +395,22 @@ nav #user-menu { text-decoration: none; text-align: center; } + +nav #user-menu: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; + -moz-border-radius: 5px; + -webkit-border-radius: 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% ); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); + background-color: #1873a2; + color: #efefef; +} + nav #user-menu-label::after { content: url("menu-user-pin.png") no-repeat; padding-left: 15px; @@ -461,7 +487,7 @@ ul#user-menu-popup li a:hover { background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #6da6c4), color-stop(1, #1873a2) ); background: -moz-linear-gradient( center top, #6da6c4 5%, #1873a2 100% ); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#6da6c4', endColorstr='#1873a2'); - background-color: #6da6c4; + background-color: #1873a2; } ul#user-menu-popup li a.nav-sep { @@ -964,6 +990,7 @@ ul .sidebar-group-li .icon { .contact-block-h4, .contact-block-content { + margin: 0; } #contact-block, @@ -2913,7 +2940,7 @@ margin-left: 0px; background: url(login-bg.gif) no-repeat; background-position: 0 50%; padding-left: 18px; - width: 220px!important; + width: 250px!important; } .openid:hover { @@ -4349,3 +4376,10 @@ div #datebrowse-sidebar.widget { #collapsed-comments-page-widget {} .tool {} + +#logo-text { +} + +#logo-img { + margin: 3px 0 0 0; +} From c92e7a3521371d22fa90e5d9b1bce99eb0f1ba54 Mon Sep 17 00:00:00 2001 From: pixelroot Date: Wed, 24 Oct 2012 14:04:57 +0200 Subject: [PATCH 2/4] modified: view/theme/smoothly/style.css --- view/theme/smoothly/style.css | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index 902ac1c18..82a30b313 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -1626,7 +1626,7 @@ ul .sidebar-group-li .icon { .icon.drop, .icon.drophide { - float: right; + float: left; } #item-delete-selected-end, @@ -1912,8 +1912,10 @@ div[id$="wrapper"] br { } .profile-match-wrapper { - width: 82%; - padding: 5px; + float:left; + height:120px; + padding:10px; + width:120px; margin-bottom: 10px; margin-left: 20px; background-color: #f6f6f6; @@ -2611,10 +2613,18 @@ margin-left: 0px; } #contact-edit-update-now:hover { + color: #efefef; 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% ); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); background-color: #1873a2; + 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; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; } #contact-edit-update-now:active { @@ -4383,3 +4393,7 @@ div #datebrowse-sidebar.widget { #logo-img { margin: 3px 0 0 0; } + +.bigwidget {} + +#remote-friends-in-common {} From fa7157492a1e2bce1f9f13ce2ac022bd4929b958 Mon Sep 17 00:00:00 2001 From: pixelroot Date: Wed, 24 Oct 2012 16:41:56 +0200 Subject: [PATCH 3/4] deleted: view/theme/smoothly/categories_widget.tpl deleted: view/theme/smoothly/contact_template.tpl deleted: view/theme/smoothly/footer.tpl deleted: view/theme/smoothly/generic_links_widget.tpl deleted: view/theme/smoothly/group_drop.tpl deleted: view/theme/smoothly/group_side.tpl deleted: view/theme/smoothly/header.tpl deleted: view/theme/smoothly/mail_head.tpl deleted: view/theme/smoothly/message_side.tpl deleted: view/theme/smoothly/peoplefind.tpl modified: view/theme/smoothly/style.css --- view/theme/smoothly/categories_widget.tpl | 12 -- view/theme/smoothly/contact_template.tpl | 24 --- view/theme/smoothly/footer.tpl | 3 - view/theme/smoothly/generic_links_widget.tpl | 11 -- view/theme/smoothly/group_drop.tpl | 8 - view/theme/smoothly/group_side.tpl | 28 ---- view/theme/smoothly/header.tpl | 0 view/theme/smoothly/mail_head.tpl | 3 - view/theme/smoothly/message_side.tpl | 13 -- view/theme/smoothly/peoplefind.tpl | 15 -- view/theme/smoothly/style.css | 157 +++++++------------ 11 files changed, 56 insertions(+), 218 deletions(-) delete mode 100644 view/theme/smoothly/categories_widget.tpl delete mode 100644 view/theme/smoothly/contact_template.tpl delete mode 100644 view/theme/smoothly/footer.tpl delete mode 100644 view/theme/smoothly/generic_links_widget.tpl delete mode 100644 view/theme/smoothly/group_drop.tpl delete mode 100644 view/theme/smoothly/group_side.tpl delete mode 100644 view/theme/smoothly/header.tpl delete mode 100644 view/theme/smoothly/mail_head.tpl delete mode 100644 view/theme/smoothly/message_side.tpl delete mode 100644 view/theme/smoothly/peoplefind.tpl diff --git a/view/theme/smoothly/categories_widget.tpl b/view/theme/smoothly/categories_widget.tpl deleted file mode 100644 index 773f3d7d6..000000000 --- a/view/theme/smoothly/categories_widget.tpl +++ /dev/null @@ -1,12 +0,0 @@ -
-

$title

-
$desc
- - - -
diff --git a/view/theme/smoothly/contact_template.tpl b/view/theme/smoothly/contact_template.tpl deleted file mode 100644 index 917d302f7..000000000 --- a/view/theme/smoothly/contact_template.tpl +++ /dev/null @@ -1,24 +0,0 @@ -
-
-
- - $contact.name - - {{ if $contact.photo_menu }} - menu -
-
    - $contact.photo_menu -
-
- {{ endif }} -
- -
-
-
$contact.name
- -
-
diff --git a/view/theme/smoothly/footer.tpl b/view/theme/smoothly/footer.tpl deleted file mode 100644 index 25058a7ff..000000000 --- a/view/theme/smoothly/footer.tpl +++ /dev/null @@ -1,3 +0,0 @@ - \ No newline at end of file diff --git a/view/theme/smoothly/generic_links_widget.tpl b/view/theme/smoothly/generic_links_widget.tpl deleted file mode 100644 index a1159f5bc..000000000 --- a/view/theme/smoothly/generic_links_widget.tpl +++ /dev/null @@ -1,11 +0,0 @@ -
- {{if $title}}

$title

{{endif}} - {{if $desc}}
$desc
{{endif}} - -
    - {{ for $items as $item }} -
  • $item.label
  • - {{ endfor }} -
- -
diff --git a/view/theme/smoothly/group_drop.tpl b/view/theme/smoothly/group_drop.tpl deleted file mode 100644 index f088fc06f..000000000 --- a/view/theme/smoothly/group_drop.tpl +++ /dev/null @@ -1,8 +0,0 @@ - -
diff --git a/view/theme/smoothly/group_side.tpl b/view/theme/smoothly/group_side.tpl deleted file mode 100644 index a1fc70a22..000000000 --- a/view/theme/smoothly/group_side.tpl +++ /dev/null @@ -1,28 +0,0 @@ -
-

$title

- - - -
- - diff --git a/view/theme/smoothly/header.tpl b/view/theme/smoothly/header.tpl deleted file mode 100644 index e69de29bb..000000000 diff --git a/view/theme/smoothly/mail_head.tpl b/view/theme/smoothly/mail_head.tpl deleted file mode 100644 index afb65f537..000000000 --- a/view/theme/smoothly/mail_head.tpl +++ /dev/null @@ -1,3 +0,0 @@ -

$messages

- -$tab_content diff --git a/view/theme/smoothly/message_side.tpl b/view/theme/smoothly/message_side.tpl deleted file mode 100644 index a35c74ed9..000000000 --- a/view/theme/smoothly/message_side.tpl +++ /dev/null @@ -1,13 +0,0 @@ -
-
- - -
    - {{ for $tabs as $t }} -
  • - $t.label -
  • - {{ endfor }} -
- -
diff --git a/view/theme/smoothly/peoplefind.tpl b/view/theme/smoothly/peoplefind.tpl deleted file mode 100644 index 59f803d13..000000000 --- a/view/theme/smoothly/peoplefind.tpl +++ /dev/null @@ -1,15 +0,0 @@ -
-

$findpeople

-
$desc
- - - - - - - - {{ if $inv }} - - {{ endif }} -
- diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index 82a30b313..79aba529e 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -743,6 +743,29 @@ h3 #search:before { padding-bottom: 10px; } +#message-sidebar { + vertical-align: middle; + margin-top: 40px; +} + +#message-new { + padding: 7px; + width: 165px; + margin: 10px; + 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; + border: 1px solid #7C7D7B; + border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; +} + #peoplefind-desc { margin-left: 10px; } @@ -752,6 +775,10 @@ h3 #search:before { margin-right: 30px; } +#sidebar-ungrouped { + margin: 10px; +} + #sidebar-group-list a { } @@ -766,6 +793,11 @@ h3 #search:before { margin: 10px; } +#side-peoplefind-url { + margin: 10px; + width: 175px; +} + #sidebar-page-list {} .widget { @@ -1334,10 +1366,6 @@ ul .sidebar-group-li .icon { margin-left: 10px; } -.wall-item-photo-menu { - display: none; -} - .wall-item-photo-menu-button { display: none; text-indent: -99999px; @@ -1564,6 +1592,7 @@ ul .sidebar-group-li .icon { } .wall-item-photo-menu { + display: none; min-width: 92px; color: #2e3436; border-top: 1px; @@ -1572,7 +1601,7 @@ ul .sidebar-group-li .icon { border-left: 1px solid #dddddd; border-bottom: 1px solid #dddddd; position: absolute; - left: -2px; + left: -1px; top: 101px; display: none; z-index: 10000; @@ -1917,7 +1946,7 @@ div[id$="wrapper"] br { padding:10px; width:120px; margin-bottom: 10px; - margin-left: 20px; + /*margin-left: 20px;*/ background-color: #f6f6f6; border: 1px solid #dddddd; box-shadow: 3px 3px 4px #959494; @@ -2260,9 +2289,9 @@ input #photo_edit_form { .mail-conv-detail, .mail-list-detail { position: relative; - width: 500px; + width: 550px; padding: 50px; - margin: 20px auto; + margin: 20px 0 0 0; background-color: #fff; -webkit-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1); -moz-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1); @@ -2733,10 +2762,14 @@ margin-left: 0px; text-align: center; } +#side-invite-link, +#side-random-profile-link, +#side-suggest-link, #side-match-link { - width: 158px; + width: 80%; padding: 10px; - margin: auto 10px 20px; + margin: auto; + margin-bottom: 20px; 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'); @@ -2751,12 +2784,15 @@ margin-left: 0px; -webkit-border-radius: 5px; } +#side-invite-link:hover, +#side-random-profile-link:hover, +#side-suggest-link:hover, #side-match-link:hover { color: #efefef; 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% ); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); - background-color: #1873a2; + background-color: #1873a2; border: 1px solid #7C7D7B; box-shadow: 0 0 8px #BDBDBD; -moz-box-shadow: 3px 3px 4px #959494; @@ -2766,104 +2802,23 @@ margin-left: 0px; -webkit-border-radius: 5px; } + +#side-invite-link:active, +#side-random-profile-link:active, +#side-suggest-link:active, #side-match-link:active { background-color: #1873a2; position: relative; - top: 1px; + top: 1px; } +#side-invite-link a, +#side-random-profile-link a, +#side-suggest-link a, #side-match-link a { - color: #efefef; -} - -#side-invite-link { - width: 80%; - padding: 10px; - margin: auto; - margin-bottom: 20px; - 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; - padding: 5px 10px 5px 10px; - color: #efefef; - font-size: 1.1em; - text-align: center; - border: 1px solid #7C7D7B; - border-radius: 5px; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; -} - -#side-invite-link:hover { - color: #efefef; - 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% ); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); - background-color: #1873a2; - 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; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; -} - - -#side-invite-link:active { - background-color: #1873a2; - position: relative; - top: 1px; -} - -#side-invite-link a { color: #efefef; } -#side-suggest-link { - width: 80%; - padding: 10px; - margin: auto; - margin-bottom: 20px; - 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; - padding: 5px 10px 5px 10px; - color: #efefef; - font-size: 1.1em; - text-align: center; - border: 1px solid #7C7D7B; - border-radius: 5px; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; -} - -#side-suggest-link:hover { - color: #efefef; - 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% ); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1873a2', endColorstr='#6da6c4'); - background-color: #1873a2; - 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; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; -} - -#side-suggest-link:active { - background-color: #1873a2; - position: relative; - top: 1px; -} - -#side-suggest-link a { - color: #efefef; -} #invite-message, #invite-recipients, @@ -4326,7 +4281,6 @@ div #datebrowse-sidebar.widget { color: #1873a2; cursor: pointer; margin-bottom: 10px; - margin-left: 5px; /*background: url("down.png") no-repeat scroll left center transparent;*/ } @@ -4397,3 +4351,4 @@ div #datebrowse-sidebar.widget { .bigwidget {} #remote-friends-in-common {} + From 356329ee63382b6c32ee7a89dff6e5bd706cb17b Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Thu, 25 Oct 2012 01:42:25 +0100 Subject: [PATCH 4/4] Friendicaland - remove states no longer flying the Friendica banner. --- js/country.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/country.js b/js/country.js index 145aa490c..70414e180 100644 --- a/js/country.js +++ b/js/country.js @@ -275,7 +275,7 @@ aStates[249]="|'Adan|'Ataq|Abyan|Al Bayda'|Al Hudaydah|Al Jawf|Al Mahrah|Al Mahw aStates[250]="|Kosovo|Montenegro|Serbia|Vojvodina"; aStates[251]="|Central|Copperbelt|Eastern|Luapula|Lusaka|North-Western|Northern|Southern|Western"; aStates[252]="|Bulawayo|Harare|ManicalandMashonaland Central|Mashonaland East|Mashonaland West|Masvingo|Matabeleland North|Matabeleland South|Midlands"; -aStates[253]="|Self Hosted|Private Server|Architects Of Sleep|Chaos Friends|DFRN|Distributed Friend Network|ErrLock|Free-Beer.ch|Foojbook|Free-Haven|Friendica.eu|Friendika.me.4.it|Friendika - I Ask Questions|Frndc.com|Hikado|Hipatia|Hungerfreunde|Kaluguran Community|Kak Ste|Karl.Markx.pm|Loozah Social Club|MyFriendica.net|MyFriendNetwork|Oi!|OpenMindSpace|Optimistisch|Pplsnet|Recolutionari.es|SilverLips|Sparkling Network|SPRACI|Styliztique|Sysfu Social Club|Trevena|theshi.re|Tumpambae|Uzmiac|Other"; +aStates[253]="|Self Hosted|Private Server|Architects Of Sleep|Chaos Friends|DFRN|Distributed Friend Network|ErrLock|Free-Beer.ch|Foojbook|Free-Haven|Friendica.eu|Friendika.me.4.it|Friendika - I Ask Questions|Frndc.com|Hikado|Hipatia|Hungerfreunde|Kaluguran Community|Kak Ste|Karl.Markx.pm|Loozah Social Club|MyFriendica.net|MyFriendNetwork|Oi!|OpenMindSpace|Optimistisch|Pplsnet|Recolutionari.es|SPRACI|Styliztique|Sysfu Social Club|theshi.re|Tumpambae|Uzmiac|Other"; /* * gArCountryInfo * (0) Country name