From 5f7f1fb7b1b07af9a08ff698776a905e61019d68 Mon Sep 17 00:00:00 2001 From: pixelroot Date: Tue, 11 Sep 2012 11:06:55 +0200 Subject: [PATCH 1/4] modified: view/theme/smoothly/nav.tpl modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php new file: view/theme/smoothly/totop.png --- view/theme/smoothly/nav.tpl | 6 ++++-- view/theme/smoothly/style.css | 9 +++++++-- view/theme/smoothly/theme.php | 8 ++++---- view/theme/smoothly/totop.png | Bin 0 -> 798 bytes 4 files changed, 15 insertions(+), 8 deletions(-) create mode 100644 view/theme/smoothly/totop.png diff --git a/view/theme/smoothly/nav.tpl b/view/theme/smoothly/nav.tpl index 43cc7bca0..b010442a9 100644 --- a/view/theme/smoothly/nav.tpl +++ b/view/theme/smoothly/nav.tpl @@ -58,9 +58,11 @@ + - - diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index 541a86a89..0a9498797 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-11 */ /* ========== */ @@ -3331,7 +3331,12 @@ ul.menu-popup { } hr.line-dots { - background: url("dot.png") repeat-x scroll left center transparent; + background: url(view/theme/smoothly/dot.png) repeat-x scroll left center transparent; border: medium none; /*padding: 0.5em 0;*/ } + +/* SCROLL TO TOP +----------------------------------------------------------- */ +#scrollup{position:fixed;right:5px;bottom:5px;z-index:100;}#scrollup a:hover{text-decoration:none;border:0;} + diff --git a/view/theme/smoothly/theme.php b/view/theme/smoothly/theme.php index e69b8a3b9..70542a40f 100644 --- a/view/theme/smoothly/theme.php +++ b/view/theme/smoothly/theme.php @@ -2,8 +2,8 @@ /* * Name: Smoothly - * Description: Theme opzimized for Tablets - * Version: 0.4 + * Description: Theme optimized for iPad/iPad2 + * Version: 0.5 * Author: Alex * Maintainer: Alex * Screenshot: Screenshot @@ -13,6 +13,7 @@ $a->theme_info = array(); function smoothly_init(&$a) { $a->page['htmlhead'] .= <<< EOT + EOT; -} +} \ No newline at end of file diff --git a/view/theme/smoothly/totop.png b/view/theme/smoothly/totop.png new file mode 100644 index 0000000000000000000000000000000000000000..d222b39653510e443de81cfb65e886e97aaaf072 GIT binary patch literal 798 zcmV+(1L6FMP)jNyII zQ9QV!NleUWG_g&$?;GA4%BFj|x_b&9x`(N$r|PTi8?Vu5)Jhc3ywvOUxKsma7v-BS`L93Ex4y( zHf_WMU>`UM*427f>KgqBM%|Yb`;r}1sQn&_8TP|qhqmB<;y_=FI<8)xSPM9otzbV` zZRXmDmxDbz7@VYO?>Pt2F71%Oh{+Jxt`0a$3(7g_4GMi{#O630C@L)=AGRI7!mvUU z?^S3xuMR`Jl48uWXD_ZoQv7&<5^~QD^_*@RXKC7djy$$K=1!f~2@`dbWQknr@TLM& zdUnLT*52DkT3SOH4Z7AD1E1*NZDqvY!E^8hOzrD*amN= cF8>4=0IvY`QJ!VW@c;k-07*qoM6N<$g1(Dh Date: Tue, 11 Sep 2012 11:25:01 +0200 Subject: [PATCH 2/4] modified: view/theme/smoothly/style.css --- view/theme/smoothly/style.css | 57 +++++++++++------------------------ 1 file changed, 17 insertions(+), 40 deletions(-) diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index 0a9498797..5983a3f4c 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -5,9 +5,8 @@ Created by Anne Walk and Devlon Duthie on 2011-09-24 Modified by alex@friendica.pixelbits.de on 2012-09-11 -*/ -/* ========== */ -/* = Colors + +** Colors ** Blue links - #1873a2 Blue link hover - #6da6c4 Blue Gradients (buttons and other gradients) - #1873a2 and #6da6c4 @@ -18,8 +17,7 @@ Orange - #fec01d You can switch out the colors of the header, buttons and links by using a find and replace in your text editor. - = */ -/* ========== */ +*/ body { margin: 0 auto; @@ -473,7 +471,6 @@ aside a{ .vcard { font-size: 1em; -/* font-variant:small-caps; */ } .vcard dd { @@ -507,7 +504,6 @@ aside h4 { font-size: 1.3em; } color: #626262; text-align: center; font-weight: bold; -/* font-variant:small-caps; */ font-size: 1.1em; } .allcontact-link a { @@ -921,7 +917,6 @@ profile-jot-banner-wrapper { min-width: 400px; list-style: none; padding: 20px 0px 0px; - /*border-bottom: 1px solid #efefef;*/ font-size: 0.9em; } .tabs li { display: inline;} @@ -953,10 +948,7 @@ profile-jot-banner-wrapper { border: 1px solid #CDCDCD; border-radius: 5px 5px 5px 5px; box-shadow: 3px 3px 4px 0 #959494; - /*color: #E6E6E6;*/ margin-top: 20px; - /*text-shadow: -1px 0 0 #BDBDBD;*/ - /* Overflow: hidden; */ } .wall-item-outside-wrapper-end { clear: both;} @@ -989,7 +981,6 @@ profile-jot-banner-wrapper { -o-transition: all 0.25s ease-in-out; -ms-transition: all 0.25s ease-in-out; transition: all 0.25s ease-in-out; - /*margin-left: 140px;*/ margin-top: 10px; padding-bottom: 5px; float: right; @@ -1099,7 +1090,6 @@ profile-jot-banner-wrapper { .wall-item-conv a{ font-size: 0.9em; color: #898989; -/* font-variant:small-caps; */ } .wallwall .wwto { @@ -1216,7 +1206,6 @@ profile-jot-banner-wrapper { .icollapse-wrapper { font-size: 0.9em; color: #898989; -/* font-variant:small-caps; */ } .comment-wwedit-wrapper, @@ -1326,7 +1315,6 @@ div[id$="wrapper"] br { clear: left; } .profile-listing-name { font-size: 1em; -/* font-variant: small-caps;*/ } .profile-listing-name a { color: #898989; @@ -1372,7 +1360,6 @@ div[id$="wrapper"] br { clear: left; } .profile-match-name a{ color: #999; - /*font-variant: small-caps;*/ font-size: 1em; } @@ -1492,7 +1479,6 @@ div[id$="wrapper"] br { clear: left; } padding: 0px 5px; font-weight: bold; font-stretch:semi-expanded; -/* font-variant:small-caps; */ } .photo-top-album-name a{ @@ -1506,7 +1492,6 @@ div[id$="wrapper"] br { clear: left; } text-align: center; color: #6e6e6e; font-size: 0.9em; -/* font-variant: small-caps; */ } #photo-photo{ @@ -1517,7 +1502,6 @@ div[id$="wrapper"] br { clear: left; } #photo-caption { margin-top: 10px; color: #6E6E6E; -/* font-variant:small-caps; */ font-size: 1.1em; } @@ -1754,7 +1738,6 @@ input#photo_edit_form { } #prvmail-message-label { -/* font-variant:small-caps; */ font-size: 1em; } @@ -1800,7 +1783,6 @@ margin-left: 0px; .mail-list-sender-name { font-size: 1.1em; display: inline; -/* font-variant:small-caps; */ } .mail-list-date { @@ -1810,7 +1792,6 @@ margin-left: 0px; font-size: 0.9em; padding-left: 10px; font-stretch:ultra-condensed; -/* font-variant:small-caps; */ } .mail-list-subject { @@ -1935,7 +1916,6 @@ margin-left: 0px; font: #999; font-size: 12px; text-align:center; -/* font-variant:small-caps; */ font-weight: bold; margin-top:5px; } @@ -1954,7 +1934,6 @@ margin-left: 0px; #contact-edit-banner-name { font-size: 1.5em; margin-left: 30px; } - #contact-edit-update-now { padding:7px; width: 165px; @@ -1995,7 +1974,6 @@ margin-left: 0px; margin: auto; } - .contact-photo-menu-button { position: absolute; background-image: url("photo-menu.jpg"); @@ -2069,7 +2047,6 @@ margin-left: 0px; width: 158px; padding: 10px; 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; @@ -2173,7 +2150,6 @@ margin-left: 0px; background-color:#1873a2; } - #side-suggest-link:active { background-color: #1873a2; position:relative; @@ -2329,7 +2305,6 @@ margin-left: 0px; -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 , #BDBDBD 5%, #A2A2A2 100%) repeat scroll 0 0 #BDBDBD; filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#7c7d7b', endColorstr='#555753'); color: #EFEFEF; @@ -2441,7 +2416,7 @@ margin-left: 0px; background-color:#bdbdbd; -moz-border-radius:5px; -webkit-border-radius:5px; - border-radius:5px;*/ + border-radius:5px; } .group-delete-wrapper:hover { @@ -2576,7 +2551,6 @@ margin-left: 0px; margin-bottom: 2px; margin-top: 2px; font-size: 0.9em; -/* font-variant: small-caps; */ text-align: left; } @@ -2642,7 +2616,6 @@ margin-left: 0px; .event-list-date { color: #626262; margin-bottom: 10px; -/* font-variant:small-caps; */ font-stretch:condensed; } @@ -2678,7 +2651,6 @@ margin-left: 0px; color: #ffffff; font-weight: bold; text-align:center; -/* font-variant:small-caps; */ -moz-box-shadow: 5px 2px 8px #959494; -webkit-box-shadow: 5px 2px 8px #959494; box-shadow: 5px 2px 8px #959494; @@ -2756,13 +2728,11 @@ tr { .directory-details { font-size: 0.9em; -/* font-variant: small-caps; */ width: 160px; } .directory-name { font-size: 1em; -/* font-variant: small-caps; */ width: 150px; } @@ -2923,7 +2893,7 @@ tr { margin-left: 5px; margin-right: 5px; display: block; width: 20px; height: 20px; - background-image: url('icons.png'); + background-image: url("icons.png"); } .starred { background-image: url("star.png"); @@ -2976,7 +2946,7 @@ tr { } .sharePerms { - background-image: url(icons.png); + background-image: url("icons.png"); width: 20px; height: 20px; margin: 2px 0px 2px 3px; @@ -3000,7 +2970,7 @@ tr { .attachtype { display: block; width: 20px; height: 23px; - background-image: url('../../../images/content-types.png'); + background-image: url("../../../images/content-types.png"); } .type-video { background-position: 0px 0px; } @@ -3325,18 +3295,25 @@ ul.menu-popup { background: #000; } -/* Pages profile widget */ +/* Pages profile widget +----------------------------------------------------------- */ #page-profile div#profile-page-list{ margin-left: 45px; } hr.line-dots { - background: url(view/theme/smoothly/dot.png) repeat-x scroll left center transparent; + background: url("view/theme/smoothly/dot.png") repeat-x scroll left center transparent; border: medium none; /*padding: 0.5em 0;*/ } /* SCROLL TO TOP ----------------------------------------------------------- */ -#scrollup{position:fixed;right:5px;bottom:5px;z-index:100;}#scrollup a:hover{text-decoration:none;border:0;} +#scrollup { + position:fixed; + right:5px; + bottom:5px; + z-index:100; +} +#scrollup a:hover{text-decoration:none;border:0;} From 4cc440475209e11beb5842312268372f327e1605 Mon Sep 17 00:00:00 2001 From: pixelroot Date: Tue, 11 Sep 2012 14:02:36 +0200 Subject: [PATCH 3/4] new file: view/theme/smoothly/arrow.png new file: view/theme/smoothly/categories_widget.tpl modified: view/theme/smoothly/style.css --- view/theme/smoothly/arrow.png | Bin 0 -> 592 bytes view/theme/smoothly/categories_widget.tpl | 12 +++++++ view/theme/smoothly/style.css | 37 +++++++++++++++------- 3 files changed, 37 insertions(+), 12 deletions(-) create mode 100644 view/theme/smoothly/arrow.png create mode 100644 view/theme/smoothly/categories_widget.tpl diff --git a/view/theme/smoothly/arrow.png b/view/theme/smoothly/arrow.png new file mode 100644 index 0000000000000000000000000000000000000000..1fabe88b6446a9a50f454c9a876eb393ca6ef78f GIT binary patch literal 592 zcmeAS@N?(olHy`uVBq!ia0vp^f*{Pn3?z9rZ$AN~SkfJR9T^zbpD<_bdI{u9mbgZg z1m~xflqVLYGB~E>C#5QQ<|d}62BjvZR2H60wE-&H72p%%`v3p`^A|2$xq9{DrAz0| zpTB(N%JmyJE?m5L_1d*dmoJ|?ckbHt>sPN{{rmUtjhi=b-n#Yn?b|zd?p(fl_0i+U zSFc~cd+*+ZhY$b!`San!hX)THeEf^o3nXkY6y6OFm%O z^}EmvXwoH57srr_TQ(Dp7BM^WxI|yd$hdf>ET?^@<^TWDGh?quv4>vYZSvrK0fW`m zeNW5Gr00veH?c}8b^U2#o;l^&x0)T-9X^Wk9=zqjaeh{1>BqH-?*ohMT-TZftGj-Z zn3(p5#pmWPf%U?I)2Cl8V7M~JaPATb>yM%NDU;`Xo4HS@aMJYt*XP+24*A%3MkGbo zUO8~*`&FGu*Vl8-d*9Ie{mmJpiBl)FRp;ngiW|F4{@Ld7P5hhJ(G=I)OvTwAM*?L; sV!vPAW@3H)_p!p>vUzz6>KWM>cI=Wl{h{rS2GDm5p00i_>zopr05pGZ2LJ#7 literal 0 HcmV?d00001 diff --git a/view/theme/smoothly/categories_widget.tpl b/view/theme/smoothly/categories_widget.tpl new file mode 100644 index 000000000..773f3d7d6 --- /dev/null +++ b/view/theme/smoothly/categories_widget.tpl @@ -0,0 +1,12 @@ +
+

$title

+
$desc
+ + + +
diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index 5983a3f4c..2e02d9299 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -67,7 +67,14 @@ label { } li { - list-style: none; + list-style: none outside none; +} +li.widget-list { + list-style: none outside none; + background: url("arrow.png") no-repeat scroll left center transparent; + /*border-bottom: 1px dotted #D3D3D3;*/ + display: block; + padding: 3px 24px; } .required { display: inline; color: #1873a2; } @@ -153,11 +160,15 @@ section { .mframe { padding: 2px; - background-color: #efefef; + background: none repeat scroll 0 0 #FFFFFF; + border: 1px solid #C5C5C5; + border-radius: 3px 3px 3px 3px; + box-shadow: 0 0 8px #BDBDBD; + /*background-color: #efefef; border: 1px solid #dddddd; -moz-box-shadow: 3px 3px 4px #959494; -webkit-box-shadow: 3px 3px 4px #959494; - box-shadow: 3px 3px 4px #959494; + box-shadow: 3px 3px 4px #959494;*/ } #wall-item-lock { @@ -490,12 +501,13 @@ aside a{ margin: 10px 0px; padding: 12px; width: 175px; - background-color: #f3f3f3; - border: 1px solid #dddddd; + background: none repeat scroll 0 0 #FFFFFF; + /*background-color: #f3f3f3;*/ + border: 1px solid #C5C5C5; /*1px solid #dddddd;*/ -moz-box-shadow: 3px 3px 4px #959494; -webkit-box-shadow: 3px 3px 4px #959494; - box-shadow: 3px 3px 4px #959494; -border-radius: 5px 5px 5px 5px; + box-shadow: 0 0 8px #BDBDBD; /*3px 3px 4px #959494;*/ + border-radius: 6px 6px 6px 6px; } aside h4 { font-size: 1.3em; } @@ -944,10 +956,11 @@ profile-jot-banner-wrapper { margin-bottom: 20px; padding-right: 10px; padding-left: 12px; - background: -moz-linear-gradient(center top , #F8F8F8 5%, #F6F6F6 100%) repeat scroll 0 0 #F8F8F8; + background: none repeat scroll 0 0 #FFFFFF; + /*background: -moz-linear-gradient(center top , #F8F8F8 5%, #F6F6F6 100%) repeat scroll 0 0 #F8F8F8;*/ border: 1px solid #CDCDCD; - border-radius: 5px 5px 5px 5px; - box-shadow: 3px 3px 4px 0 #959494; + border-radius: 6px 6px 6px 6px; + box-shadow: 0 0 8px #BDBDBD; /*3px 3px 4px 0 #959494;*/ margin-top: 20px; } @@ -1253,7 +1266,7 @@ profile-jot-banner-wrapper { #item-delete-selected-desc { color: #898989; - float: right; + float: left; } .wall-item-body code { @@ -3302,7 +3315,7 @@ ul.menu-popup { } hr.line-dots { - background: url("view/theme/smoothly/dot.png") repeat-x scroll left center transparent; + background: url("dot.png") repeat-x scroll left center transparent; border: medium none; /*padding: 0.5em 0;*/ } From 5ae445b1ffb219a88ba52237cb2eb35b2fd68562 Mon Sep 17 00:00:00 2001 From: pixelroot Date: Tue, 11 Sep 2012 15:23:49 +0200 Subject: [PATCH 4/4] new file: view/theme/smoothly/generic_links_widget.tpl modified: view/theme/smoothly/style.css --- view/theme/smoothly/generic_links_widget.tpl | 11 +++++++++++ view/theme/smoothly/style.css | 6 +++--- 2 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 view/theme/smoothly/generic_links_widget.tpl diff --git a/view/theme/smoothly/generic_links_widget.tpl b/view/theme/smoothly/generic_links_widget.tpl new file mode 100644 index 000000000..a1159f5bc --- /dev/null +++ b/view/theme/smoothly/generic_links_widget.tpl @@ -0,0 +1,11 @@ +
+ {{if $title}}

$title

{{endif}} + {{if $desc}}
$desc
{{endif}} + +
    + {{ for $items as $item }} +
  • $item.label
    • + {{ endfor }} +
+ +
diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index 2e02d9299..f856f66bb 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -507,7 +507,7 @@ aside a{ -moz-box-shadow: 3px 3px 4px #959494; -webkit-box-shadow: 3px 3px 4px #959494; box-shadow: 0 0 8px #BDBDBD; /*3px 3px 4px #959494;*/ - border-radius: 6px 6px 6px 6px; + border-radius: 5px 5px 5px 5px; } aside h4 { font-size: 1.3em; } @@ -959,7 +959,7 @@ profile-jot-banner-wrapper { background: none repeat scroll 0 0 #FFFFFF; /*background: -moz-linear-gradient(center top , #F8F8F8 5%, #F6F6F6 100%) repeat scroll 0 0 #F8F8F8;*/ border: 1px solid #CDCDCD; - border-radius: 6px 6px 6px 6px; + border-radius: 5px 5px 5px 5px; box-shadow: 0 0 8px #BDBDBD; /*3px 3px 4px 0 #959494;*/ margin-top: 20px; } @@ -2842,7 +2842,7 @@ tr { .field label { float: left; - width: 400px; /*550*/ + width: 480px; /*550*/ } .field input,