From 557a7d0cec31a36d12898429c479c71671833dfd Mon Sep 17 00:00:00 2001 From: Friendika Date: Tue, 11 Oct 2011 18:24:37 -0700 Subject: stuff - background the external network notifications (Facebook, Twitter, Statusnet) - add vimeo support - consolidate editor video options (insert video, regardless of source) - add "Connector Settings" page purely for configuring connectors - moved mailbox settings to Connectors - Move the "Connect/Follow" dialogue out of "find people" and move to top. - Add "Find People" dialogue - minor theme edits on duepuntozero and testbubble to make all this stuff work - A bit of theming on duepunto notifications to eliminate the gigantic Diaspora profile photos. --- view/theme/duepuntozero/style.css | 24 +++++++++++++++++++----- view/theme/testbubble/style.css | 21 ++++++++++++++++++++- 2 files changed, 39 insertions(+), 6 deletions(-) (limited to 'view/theme') diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index b46a03c38..40c3cb81b 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -145,7 +145,6 @@ nav .nav-link { background-color: transparent !important; } - .nav-commlink.selected { background-color: #ffffff; border-bottom: 1px solid #ffffff; @@ -1849,13 +1848,28 @@ a.mail-list-link { #side-follow-wrapper { margin-top: 20px; } -#side-follow-url { +#side-follow-url, #side-peoplefind-url { margin-top: 5px; } -#side-follow-submit { +#side-follow-submit, #side-peoplefind-submit { margin-top: 15px; } +#side-match-link { + margin-top: 10px; +} + +.widget { + border: 1px solid #DDDDDD; + padding: 5px; + margin-top: 5px; + -moz-border-radius:5px; + -webkit-border-radius:5px; + border-radius:5px; + +} + + .photo-album-image-wrapper { float: left; margin-top: 15px; @@ -2641,8 +2655,8 @@ a.mail-list-link { border-color:#204A87; padding-right: 40px; background-position: right center; - background-color: #3465A4; - color: #FFFFFF; + background-color: #D7E3F1; + color: #204A87; text-align: left; } .hidden { display: none!important; } diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css index 341314c1d..dd9d24299 100644 --- a/view/theme/testbubble/style.css +++ b/view/theme/testbubble/style.css @@ -823,7 +823,7 @@ profile-jot-banner-wrapper { /* ======== */ .tabs { - width: 450px; + width: 600px; list-style: none; padding: 10px; margin: 0px 0px 10px 0px; @@ -2211,6 +2211,25 @@ margin-left: 0px; padding: 5px; } +.settings-block { + margin-top: 20px; + -moz-box-shadow: 1px 2px 6px 0px #959494; + -webkit-box-shadow: 1px 2px 6px 0px #959494; + box-shadow: 1px 2px 6px 0px #959494; + background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #f8f8f8), color-stop(1, #f6f6f6) ); + background:-moz-linear-gradient( center top, #f8f8f8 5%, #f6f6f6 100% ); + filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f8f8f8', endColorstr='#f6f6f6'); + background-color:#f8f8f8; + -moz-border-radius:5px; + -webkit-border-radius:5px; + border-radius:5px; + border:1px solid #eee; + color:#a6a6a6; + text-shadow:-1px 0px 0px #bdbdbd; + border: 1px solid #cdcdcd; + padding: 5px; +} + #register-form div, #profile-edit-form div { clear: both; -- cgit v1.2.3 From 2206d894b3fec7064b91e0420bcc2b16e9e7009b Mon Sep 17 00:00:00 2001 From: Friendika Date: Tue, 11 Oct 2011 19:27:58 -0700 Subject: add contact_widgets and provide widgets on appropriate pages, fix the saved search widget fix directory page on testbubble, don't use system theme for community, directory, and search if the viewer is logged in. --- view/theme/testbubble/style.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'view/theme') diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css index dd9d24299..74f0dfb41 100644 --- a/view/theme/testbubble/style.css +++ b/view/theme/testbubble/style.css @@ -2614,6 +2614,10 @@ tr { width: 150px; } +.directory-end { + clear: both; +} + /* ========= */ /* = Admin = */ /* ========= */ -- cgit v1.2.3 From 3ef7dcac4b84f6f78dcba5cd768fc08f9cfc1067 Mon Sep 17 00:00:00 2001 From: Friendika Date: Tue, 11 Oct 2011 20:38:09 -0700 Subject: solve intro/notify naming issue by providing both or either, theme decides what to do --- view/theme/duepuntozero/nav.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'view/theme') diff --git a/view/theme/duepuntozero/nav.tpl b/view/theme/duepuntozero/nav.tpl index b13ea9ae2..afa918065 100644 --- a/view/theme/duepuntozero/nav.tpl +++ b/view/theme/duepuntozero/nav.tpl @@ -30,8 +30,8 @@ {{ if $nav.community }} $nav.community.1 {{ endif }} - {{ if $nav.notifications }} - $nav.notifications.1 + {{ if $nav.introductions }} + $nav.introductions.1 {{ endif }} {{ if $nav.messages }} -- cgit v1.2.3 From 0fb119496eab2e736d9ea54adef7c9e1237f2799 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Wed, 12 Oct 2011 07:47:41 +0200 Subject: some work on quattro theme --- view/theme/quattro/jot.tpl | 80 +++++++++++++++++ view/theme/quattro/quattro.less | 185 ++++++++++++++++++++++++++++++++++++++++ view/theme/quattro/style.css | 178 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 443 insertions(+) create mode 100644 view/theme/quattro/jot.tpl (limited to 'view/theme') diff --git a/view/theme/quattro/jot.tpl b/view/theme/quattro/jot.tpl new file mode 100644 index 000000000..49c0e9fec --- /dev/null +++ b/view/theme/quattro/jot.tpl @@ -0,0 +1,80 @@ + +
+
+
 
+
+
+
+ +
+ + + + + + + + + + + + {{ if $content }}{{ endif }} + + + +
+
+
diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index 31a25694f..0addb1c70 100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -374,4 +374,189 @@ section { border: 1px solid @CommentBoxEmptyBorderColor; padding:0.3em; } +#profile-jot-plugin-wrapper, +#profile-jot-submit-wrapper { + margin-top: 10px; +} + + +#profile-jot-submit { + float: left; +} +#profile-upload-wrapper{ + float: left; + margin-left: 10px; +} +#profile-attach-wrapper, +#profile-rotator, +#profile-link-wrapper, +#profile-youtube-wrapper, +#profile-video-wrapper, +#profile-audio-wrapper, +#profile-location-wrapper, +#profile-nolocation-wrapper, +#profile-title-wrapper { + float: left; + margin-left: 20px; +} + +#profile-jot-perms { + float: left; + margin-left: 35px; + margin-right: 35px; +} + +#profile-jot-perms-end { + /*clear: left;*/ + height: 20px; +} + +#profile-jot-plugin-end{ + clear: both; +} +.profile-jot-net { + float: left; + margin-right: 10px; + margin-top: 5px; + margin-bottom: 5px; +} + +#profile-jot-networks-end { + clear: both; +} + +#profile-jot-end, #about-jot-end { + margin-bottom: 15px; +} +#about-jot-submit-wrapper { + margin-top: 15px; +} +/** buttons **/ +.comment-edit-submit, +#search-submit, +#search-save, +#profile-jot-submit{ + border: 1px solid; + background-color: @BodyColor; + font: bold 85%; + color: @Grey1; + height: 20px; + padding: 10px; + border-radius: 8px; + -moz-border-radius: 8px; + -webkit-border-radius: 8px; +} + + +/** acl **/ +#photo-edit-perms-select, +#photos-upload-permissions-wrapper, +#profile-jot-acl-wrapper{ + display:block!important; +} + + + +#acl-wrapper { + width: 690px; + float:left; +} +#acl-search { + float:right; + background: #ffffff url("../../../images/search_18.png") no-repeat right center; + padding-right:20px; +} +#acl-showall { + float: left; + display: block; + width: auto; + height: 18px; + background-color: #cccccc; + background-image: url("../../../images/show_all_off.png"); + background-position: 7px 7px; + background-repeat: no-repeat; + padding: 7px 5px 0px 30px; + -webkit-border-radius: 5px ; + -moz-border-radius: 5px; + border-radius: 5px; + color: #999999; +} +#acl-showall.selected { + color: #000000; + background-color: #ff9900; + background-image: url("../../../images/show_all_on.png"); +} + +#acl-list { + height: 210px; + border: 1px solid #cccccc; + clear: both; + margin-top: 30px; + overflow: auto; +} +#acl-list-content { + +} +.acl-list-item { + display: block; + width: 150px; + height: 30px; + border: 1px solid #cccccc; + margin: 5px; + float: left; +} +.acl-list-item img{ + width:22px; + height: 22px; + float: left; + margin: 4px; +} +.acl-list-item p { height: 12px; font-size: 10px; margin: 0px; padding: 2px 0px 1px; overflow: hidden;} +.acl-list-item a { + font-size: 8px; + display: block; + width: 40px; + height: 10px; + float: left; + color: #999999; + background-color: #cccccc; + background-position: 3px 3px; + background-repeat: no-repeat; + margin-right: 5px; + -webkit-border-radius: 2px ; + -moz-border-radius: 2px; + border-radius: 2px; + padding-left: 15px; +} +#acl-wrapper a:hover { + text-decoration: none; + color:#000000; +} +.acl-button-show { background-image: url("../../../images/show_off.png"); } +.acl-button-hide { background-image: url("../../../images/hide_off.png"); } + +.acl-button-show.selected { + color: #000000; + background-color: #9ade00; + background-image: url("../../../images/show_on.png"); +} +.acl-button-hide.selected { + color: #000000; + background-color: #ff4141; + background-image: url("../../../images/hide_on.png"); +} +.acl-list-item.groupshow { border-color: #9ade00; } +.acl-list-item.grouphide { border-color: #ff4141; } +/** /acl **/ + +/** tab buttons **/ +ul.tabs { + list-style-type: none; + padding-bottom: 10px; + + li { + float: left; + margin-left: 20px; + } +} diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css index f3237801d..3606a05a2 100644 --- a/view/theme/quattro/style.css +++ b/view/theme/quattro/style.css @@ -641,3 +641,181 @@ section { border: 1px solid #999999; padding: 0.3em; } +#profile-jot-plugin-wrapper, #profile-jot-submit-wrapper { + margin-top: 10px; +} +#profile-jot-submit { + float: left; +} +#profile-upload-wrapper { + float: left; + margin-left: 10px; +} +#profile-attach-wrapper, +#profile-rotator, +#profile-link-wrapper, +#profile-youtube-wrapper, +#profile-video-wrapper, +#profile-audio-wrapper, +#profile-location-wrapper, +#profile-nolocation-wrapper, +#profile-title-wrapper { + float: left; + margin-left: 20px; +} +#profile-jot-perms { + float: left; + margin-left: 35px; + margin-right: 35px; +} +#profile-jot-perms-end { + /*clear: left;*/ + + height: 20px; +} +#profile-jot-plugin-end { + clear: both; +} +.profile-jot-net { + float: left; + margin-right: 10px; + margin-top: 5px; + margin-bottom: 5px; +} +#profile-jot-networks-end { + clear: both; +} +#profile-jot-end, #about-jot-end { + margin-bottom: 15px; +} +#about-jot-submit-wrapper { + margin-top: 15px; +} +/** buttons **/ +.comment-edit-submit, +#search-submit, +#search-save, +#profile-jot-submit { + border: 1px solid; + background-color: #2d2d2d; + font: bold 85%; + color: #ffffff; + height: 20px; + padding: 10px; + border-radius: 8px; + -moz-border-radius: 8px; + -webkit-border-radius: 8px; +} +/** acl **/ +#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper { + display: block!important; +} +#acl-wrapper { + width: 690px; + float: left; +} +#acl-search { + float: right; + background: #ffffff url("../../../images/search_18.png") no-repeat right center; + padding-right: 20px; +} +#acl-showall { + float: left; + display: block; + width: auto; + height: 18px; + background-color: #cccccc; + background-image: url("../../../images/show_all_off.png"); + background-position: 7px 7px; + background-repeat: no-repeat; + padding: 7px 5px 0px 30px; + -webkit-border-radius: 5px ; + -moz-border-radius: 5px; + border-radius: 5px; + color: #999999; +} +#acl-showall.selected { + color: #000000; + background-color: #ff9900; + background-image: url("../../../images/show_all_on.png"); +} +#acl-list { + height: 210px; + border: 1px solid #cccccc; + clear: both; + margin-top: 30px; + overflow: auto; +} +.acl-list-item { + display: block; + width: 150px; + height: 30px; + border: 1px solid #cccccc; + margin: 5px; + float: left; +} +.acl-list-item img { + width: 22px; + height: 22px; + float: left; + margin: 4px; +} +.acl-list-item p { + height: 12px; + font-size: 10px; + margin: 0px; + padding: 2px 0px 1px; + overflow: hidden; +} +.acl-list-item a { + font-size: 8px; + display: block; + width: 40px; + height: 10px; + float: left; + color: #999999; + background-color: #cccccc; + background-position: 3px 3px; + background-repeat: no-repeat; + margin-right: 5px; + -webkit-border-radius: 2px ; + -moz-border-radius: 2px; + border-radius: 2px; + padding-left: 15px; +} +#acl-wrapper a:hover { + text-decoration: none; + color: #000000; +} +.acl-button-show { + background-image: url("../../../images/show_off.png"); +} +.acl-button-hide { + background-image: url("../../../images/hide_off.png"); +} +.acl-button-show.selected { + color: #000000; + background-color: #9ade00; + background-image: url("../../../images/show_on.png"); +} +.acl-button-hide.selected { + color: #000000; + background-color: #ff4141; + background-image: url("../../../images/hide_on.png"); +} +.acl-list-item.groupshow { + border-color: #9ade00; +} +.acl-list-item.grouphide { + border-color: #ff4141; +} +/** /acl **/ +/** tab buttons **/ +ul.tabs { + list-style-type: none; + padding-bottom: 10px; +} +ul.tabs li { + float: left; + margin-left: 20px; +} -- cgit v1.2.3 From 714319457c60c47e0d674c70169677db5ccb57fc Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Wed, 12 Oct 2011 08:06:41 +0200 Subject: little bit more for quattro --- view/theme/quattro/quattro.less | 2 +- view/theme/quattro/style.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'view/theme') diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index 0addb1c70..ad7584a16 100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -441,7 +441,7 @@ section { font: bold 85%; color: @Grey1; height: 20px; - padding: 10px; + padding: 10px 5px; border-radius: 8px; -moz-border-radius: 8px; -webkit-border-radius: 8px; diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css index 3606a05a2..aec3b8930 100644 --- a/view/theme/quattro/style.css +++ b/view/theme/quattro/style.css @@ -701,7 +701,7 @@ section { font: bold 85%; color: #ffffff; height: 20px; - padding: 10px; + padding: 10px 5px; border-radius: 8px; -moz-border-radius: 8px; -webkit-border-radius: 8px; -- cgit v1.2.3 From 98e50a05592a22c335303acd1830b84427470b3d Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Wed, 12 Oct 2011 09:28:19 +0200 Subject: better do all the buttons (quattro) --- view/theme/quattro/quattro.less | 5 +---- view/theme/quattro/style.css | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) (limited to 'view/theme') diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index ad7584a16..9f47cf099 100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -432,10 +432,7 @@ section { margin-top: 15px; } /** buttons **/ -.comment-edit-submit, -#search-submit, -#search-save, -#profile-jot-submit{ +input[type="submit"] { border: 1px solid; background-color: @BodyColor; font: bold 85%; diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css index aec3b8930..56c4bc967 100644 --- a/view/theme/quattro/style.css +++ b/view/theme/quattro/style.css @@ -692,10 +692,7 @@ section { margin-top: 15px; } /** buttons **/ -.comment-edit-submit, -#search-submit, -#search-save, -#profile-jot-submit { +input[type="submit"] { border: 1px solid; background-color: #2d2d2d; font: bold 85%; -- cgit v1.2.3 From 2911bf9434cb1a061ff32d41894ee0dd09ed3993 Mon Sep 17 00:00:00 2001 From: Friendika Date: Thu, 13 Oct 2011 01:00:06 -0700 Subject: sql issue item_store --- view/theme/duepuntozero/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/theme') diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 40c3cb81b..9bb866e76 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -1861,7 +1861,7 @@ a.mail-list-link { .widget { border: 1px solid #DDDDDD; - padding: 5px; + padding: 8px; margin-top: 5px; -moz-border-radius:5px; -webkit-border-radius:5px; -- cgit v1.2.3 From af6ab381000346f487d1b5b07623510640dd7ee5 Mon Sep 17 00:00:00 2001 From: Friendika Date: Fri, 14 Oct 2011 00:20:37 -0700 Subject: diaspora birthday notifications --- view/theme/testbubble/style.css | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'view/theme') diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css index 74f0dfb41..4a3edc163 100644 --- a/view/theme/testbubble/style.css +++ b/view/theme/testbubble/style.css @@ -2105,10 +2105,17 @@ margin-left: 0px; .openid { background: url(login-bg.gif) no-repeat; background-position: 0 50%; - padding-left: 18px; + padding-left: 18px !important; width: 385px; } +.openid { + width: 150px !important; +} +#login-password { + width: 168px !important; +} + #profile-tabs-wrapper { padding-top: 10px; } -- cgit v1.2.3 From 2650ba49c18c25f1f914f38983f38f4304a20587 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Mon, 17 Oct 2011 07:48:33 +0200 Subject: video button only for dispy and quattro --- view/theme/dispy/jot.tpl | 3 --- view/theme/quattro/jot.tpl | 3 --- 2 files changed, 6 deletions(-) (limited to 'view/theme') diff --git a/view/theme/dispy/jot.tpl b/view/theme/dispy/jot.tpl index f6bf91ffa..a2c883e4b 100644 --- a/view/theme/dispy/jot.tpl +++ b/view/theme/dispy/jot.tpl @@ -37,9 +37,6 @@ - diff --git a/view/theme/quattro/jot.tpl b/view/theme/quattro/jot.tpl index 49c0e9fec..d65ac8b17 100644 --- a/view/theme/quattro/jot.tpl +++ b/view/theme/quattro/jot.tpl @@ -31,9 +31,6 @@ -
- youtube -
-- cgit v1.2.3