From dd7a10a219590c39fa206ddc4cb833c716967f55 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 8 Jan 2012 04:13:53 -0800 Subject: [PATCH 1/3] contact page float got lost somewhere --- view/theme/duepuntozero/style.css | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index ab729b9da3..8eb9f0b87f 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -569,6 +569,13 @@ input#dfrn-url { margin-left: 20px; width: 180px; } + +.contact-wrapper { + float: left; + width: 150px; + overflow: auto; +} + #view-contact-end { clear: both; } From a6d0a65321430f5de3eb084f8492e00b00f84d0a Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 8 Jan 2012 04:16:23 -0800 Subject: [PATCH 2/3] more recovery of lost contact page formatting --- view/theme/duepuntozero/style.css | 577 ------------------------------ 1 file changed, 577 deletions(-) diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 8eb9f0b87f..c9c6534a0d 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -1,580 +1,3 @@ -/** - * duepuntozero Frindika style - * Fabio Comuni - */ - - -/* generals */ -body { - font-family: helvetica,arial,freesans,clean,sans-serif; - font-size: 12px; - background-color: #ffffff; - background-image: url(head.jpg); - background-repeat: repeat-x; - color: #000000; - margin: 0px; -} - - -a, a:visited, a:link { color: #3465a4; text-decoration: none; } -a:hover {text-decoration: underline; } - -input { - border: 1px solid #666666; - -moz-border-radius: 3px; - border-radius: 3px; - padding: 3px; -} - -img { border :0px; } - -.openid input { - background: url(login-bg.gif) no-repeat; - background-position: 0 50%; - padding-left: 18px; -} -.openid:hover { - -} - -code { - font-family: Courier, monospace; - white-space: pre; - display: block; - overflow: auto; - border: 1px solid #444; - background: #EEE; - color: #444; - padding: 10px; - margin-top: 20px; -} -/*blockquote:before { - content: '>> '; -}*/ -blockquote { - background-color: #f4f8f9; - border-left: 4px solid #dae4ee; - padding: 0.4em; -} - -/*input[type=text] { - padding: 5px; -}*/ - -.icollapse-wrapper, .ccollapse-wrapper { - border: 1px solid #CCC; - padding: 5px; -} - -.hide-comments { - margin-left: 5px; -} - -#panel { - background-color: ivory; - position: absolute; - z-index: 2; - width: 30%; - padding: 25px; - border: 1px solid #444; -} - -.heart { - color: #FF0000; - font-size: 100%; -} - - - -/* nav */ -nav { - height: 94px; - display: block; - margin: 0px 10%; - border-bottom: 1px solid #babdb6; -} -nav #site-location { - color: #888a85; - font-size: 0.8em; - position: absolute; -} - -.error-message { - color: #FF0000; - font-size: 1.1em; - border: 1px solid #FF8888; - background-color: #FFEEEE; - padding: 10px; -} - -.info-message { - color: #204a87; - font-size: 1.1em; - border: 1px solid #3465a4; - background-color: #d7e3f1; - padding: 10px; -} - - -nav #banner { - display: block; - margin-top: 14px; - position: absolute; -} -nav #banner #logo-text a { - font-size: 40px; - font-weight: bold; - margin-left: 3px; - color: #000000; - -} -nav #banner #logo-text a:hover { text-decoration: none; } - - -.nav-commlink, .nav-login-link { - display: block; - height: 15px; - margin-top: 67px; - margin-right: 2px; - padding: 6px 10px; - float: left; - bottom: 140px; - border: 1px solid #babdb6; - border-bottom: 0px; - background-color: #aec0d3; - color: #565854; - -moz-border-radius: 3px 3px 0px 0px; - border-radius: 3px 3px 0px 0px; -} -nav .nav-link { - float: right; - margin: 0.2em 0em; - padding: 0em 0.5em; - background-color: transparent !important; -} - -.nav-commlink.selected { - background-color: #ffffff; - border-bottom: 1px solid #ffffff; - color: #000000 !important; - margin-top: 64px; - padding-top: 6px; - padding-bottom: 8px; -} -.nav-ajax-left { - font-size: 0.8em; - float: left; - margin-top: 62px; -} - - -nav #nav-link-wrapper .nav-link { - border-right: 1px solid #babdb6; -} - -/* aside */ -aside { - display: block; - min-height: 112px; - width: 200px; - margin-left: 10%; - padding: 1em; - float: left; - background-image: url(border.jpg); - background-position: top left; - background-repeat: no-repeat; - position: absolute; -} - -#dfrn-request-link { - display: block; - color: #FFFFFF; - -webkit-border-radius: 5px ; - -moz-border-radius: 5px; - border-radius: 5px; - padding: 5px; - font-weight: bold; - background: #3465a4 url('friendika-16.png') no-repeat 95% center; -} - -/* section */ -section { - margin: 0px 10%; - padding-top: 1em; - padding-left: 250px; - padding-right: 1em; - display: block; - background-color: #ffffff; - background-image: url(border.jpg); - background-position: top right; - background-repeat: no-repeat; - min-height: 112px; - -} -.tabs { - height: 27px; - background-image: url(head.jpg); - background-repeat: repeat-x; - background-position: 0px -20px; - border-bottom: 1px solid #babdb6; - padding:0px; -} -.tabs li { margin: 0px; list-style: none; } -.tab { - display:block; - float:left; - padding: 0.4em; - margin-right: 1em; -} -.tab.active { - font-weight: bold; -} - - -/* footer */ -footer { - display: none; - -} - -.birthday-today, .event-today { - font-weight: bold; -} - -div.wall-item-content-wrapper.shiny { - background-image: url('shiny.png'); - background-position: -5px 30px; - background-repeat:no-repeat; -} - -/* from default */ -#jot-perms-icon, -#profile-location, -#profile-nolocation, -#profile-youtube, -#profile-video, -#profile-audio, -#profile-link, -#profile-title, -#wall-image-upload, -#wall-file-upload, -#profile-upload-wrapper, -#wall-image-upload-div, -#wall-file-upload-div, -.hover, .focus { - cursor: pointer; -} - -#jot-perms-icon { - float: left; -} - - -#jot-title { - border: 0px; - margin: 0px; - height: 20px; - width: 530px; - margin-bottom: 5px; - font-weight: bold; - border: 1px solid #ffffff; -} - -#jot-title::-webkit-input-placeholder{font-weight: normal;} -#jot-title:-moz-placeholder{font-weight: normal;} - - -#jot-title:hover, -#jot-title:focus { - border: 1px solid #cccccc; -} - -.jothidden { display:none; } - - -.fakelink, .fakelink:visited, .fakelink:link { - color: #3465a4; - text-decoration: none; - cursor: pointer; - margin-top: 15px; - margin-bottom: 15px; -} -.lockview { - cursor: pointer; -} - -#group-sidebar { - margin-bottom: 10px; -} - -.group-selected, .nets-selected { - padding: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - border: 1px solid #CCCCCC; - background: #F8F8F8; - font-weight: bold; -} - -.fakelink:hover { - color: #3465a4; - text-decoration: underline; - cursor: pointer; -} -.smalltext { - font-size: 0.7em; -} -#sysmsg { - /*width: 600px;*/ - margin-bottom: 10px; -} - -#register-fill-ext { - margin-bottom: 25px; -} - -#label-register-name, #label-register-email, #label-register-nickname, #label-register-openid { - float: left; - width: 350px; - margin-top: 10px; -} - -#register-name, #register-email, #register-nickname { - float: left; - margin-top: 10px; - width: 150px; -} - -#register-openid { - float: left; - margin-top: 10px; - width: 130px; -} - -#register-name-end, #register-email-end, #register-nickname-end, #register-submit-end, #register-openid-end { - clear: both; -} - -#register-nickname-desc { - margin-top: 30px; - width: 650px; -} -#register-sitename { - float: left; - margin-top: 10px; -} - -#register-submit-button { - margin-top: 10px; -} - - -#login_standard { - width: 210px; - float: left; -} -#login_openid { - width: 210px; - margin-left: 250px; -} - -#login_standard input, -#login_openid input { - width: 180px; -} - -#login-extra-links { - clear: both; -} - -#register-link, #lost-password-link { - float: left; - font-size: 80%; - margin-right: 15px; -} - -#login-name-end, #login-password-end, #login-extra-end, #login-submit-end { - height: 50px; -} - -#login-submit-button { -/* margin-top: 10px; */ - margin-left: 200px; -} - - -input#dfrn-url { - float: left; - background: url(friendika-16.png) no-repeat; - background-position: 2px center; - font-size: 17px; - padding-left: 21px; - height: 21px; - background-color: #FFFFFF; - color: #000000; - margin-bottom: 20px; -} - -#dfrn-url-label { - float: left; - width: 250px; -} - -#dfrn-request-url-end { - clear: both; -} - -#knowyouyes, #knowyouno { - float: left; -} - -#dfrn-request-knowyou-yes-wrapper, #dfrn-request-knowyou-no-wrapper { - - float: none; -} -#dfrn-request-knowyou-yes-label, #dfrn-request-knowyou-no-label { - float: left; - width: 75px; - margin-left: 50px; - margin-bottom: 7px; -} -#dfrn-request-knowyou-break, #dfrn-request-knowyou-end { - clear: both; - -} - -#dfrn-request-message-wrapper { - margin-bottom: 50px; -} -#dfrn-request-submit-wrapper { - clear: both; - margin-left: 50px; -} - -#dfrn-request-info-wrapper { - margin-left: 50px; -} - - - -#cropimage-wrapper, #cropimage-preview-wrapper { - float: left; - padding: 30px; -} - -#crop-image-form { - margin-top: 30px; - clear: both; -} - -.intro-wrapper { - margin-top: 20px; -} - -.intro-fullname { - font-size: 1.1em; - font-weight: bold; - -} -.intro-desc { - margin-bottom: 20px; - font-weight: bold; -} - -.intro-note { - padding: 10px; -} - -.intro-end { - padding: 30px; -} - -.intro-form { - float: left; -} -.intro-approve-form { - clear: both; -} -.intro-approve-as-friend-end { - clear: both; -} -.intro-submit-approve, .intro-submit-ignore { - margin-right: 20px; -} -.intro-submit-approve { - margin-top: 15px; -} - -.intro-approve-as-friend-label, .intro-approve-as-fan-label { - float: left; - width: 100px; - margin-left: 20px; -} -.intro-approve-as-friend, .intro-approve-as-fan { - float: left; -} -.intro-form-end { - clear: both; -} -.intro-approve-as-friend-desc { - margin-top: 15px; -} -.intro-approve-as-end { - clear: both; - margin-bottom: 10px; -} - -.intro-end { - clear: both; - margin-bottom: 30px; -} - -#profile-extra-links { - clear: both; - margin-top: 10px; -} - -#profile-extra-links ul { - list-style-type: none; - padding: 0px; -} - - -#profile-extra-links li { - margin-top: 5px; -} - -#profile-edit-links ul { - list-style-type: none; -} - -#profile-edit-links li { - margin-top: 10px; -} -.profile-edit-side-div { - float: right; -} -.profile-edit-side-link { - opacity: 0.3; - filter:alpha(opacity=30); -} -.profile-edit-side-link:hover { - opacity: 1.0; - filter:alpha(opacity=100); -} - -.view-contact-wrapper { - margin-top: 20px; - float: left; - margin-left: 20px; - width: 180px; -} - -.contact-wrapper { - float: left; - width: 150px; - overflow: auto; -} #view-contact-end { clear: both; From 9f6d38a61ac9efe0f489096349996b9ab62b6994 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 8 Jan 2012 04:30:35 -0800 Subject: [PATCH 3/3] something weird with git --- view/theme/duepuntozero/style.css | 578 ++++++++++++++++++++++++++++++ 1 file changed, 578 insertions(+) diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index c9c6534a0d..0251dae08a 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -1,3 +1,581 @@ +/** + * duepuntozero Frindika style + * Fabio Comuni + */ + + +/* generals */ +body { + font-family: helvetica,arial,freesans,clean,sans-serif; + font-size: 12px; + background-color: #ffffff; + background-image: url(head.jpg); + background-repeat: repeat-x; + color: #000000; + margin: 0px; +} + + +a, a:visited, a:link { color: #3465a4; text-decoration: none; } +a:hover {text-decoration: underline; } + +input { + border: 1px solid #666666; + -moz-border-radius: 3px; + border-radius: 3px; + padding: 3px; +} + +img { border :0px; } + +.openid input { + background: url(login-bg.gif) no-repeat; + background-position: 0 50%; + padding-left: 18px; +} +.openid:hover { + +} + +code { + font-family: Courier, monospace; + white-space: pre; + display: block; + overflow: auto; + border: 1px solid #444; + background: #EEE; + color: #444; + padding: 10px; + margin-top: 20px; +} +/*blockquote:before { + content: '>> '; +}*/ +blockquote { + background-color: #f4f8f9; + border-left: 4px solid #dae4ee; + padding: 0.4em; +} + +/*input[type=text] { + padding: 5px; +}*/ + +.icollapse-wrapper, .ccollapse-wrapper { + border: 1px solid #CCC; + padding: 5px; +} + +.hide-comments { + margin-left: 5px; +} + +#panel { + background-color: ivory; + position: absolute; + z-index: 2; + width: 30%; + padding: 25px; + border: 1px solid #444; +} + +.heart { + color: #FF0000; + font-size: 100%; +} + + + +/* nav */ +nav { + height: 94px; + display: block; + margin: 0px 10%; + border-bottom: 1px solid #babdb6; +} +nav #site-location { + color: #888a85; + font-size: 0.8em; + position: absolute; +} + +.error-message { + color: #FF0000; + font-size: 1.1em; + border: 1px solid #FF8888; + background-color: #FFEEEE; + padding: 10px; +} + +.info-message { + color: #204a87; + font-size: 1.1em; + border: 1px solid #3465a4; + background-color: #d7e3f1; + padding: 10px; +} + + +nav #banner { + display: block; + margin-top: 14px; + position: absolute; +} +nav #banner #logo-text a { + font-size: 40px; + font-weight: bold; + margin-left: 3px; + color: #000000; + +} +nav #banner #logo-text a:hover { text-decoration: none; } + + +.nav-commlink, .nav-login-link { + display: block; + height: 15px; + margin-top: 67px; + margin-right: 2px; + padding: 6px 10px; + float: left; + bottom: 140px; + border: 1px solid #babdb6; + border-bottom: 0px; + background-color: #aec0d3; + color: #565854; + -moz-border-radius: 3px 3px 0px 0px; + border-radius: 3px 3px 0px 0px; +} +nav .nav-link { + float: right; + margin: 0.2em 0em; + padding: 0em 0.5em; + background-color: transparent !important; +} + +.nav-commlink.selected { + background-color: #ffffff; + border-bottom: 1px solid #ffffff; + color: #000000 !important; + margin-top: 64px; + padding-top: 6px; + padding-bottom: 8px; +} +.nav-ajax-left { + font-size: 0.8em; + float: left; + margin-top: 62px; +} + + +nav #nav-link-wrapper .nav-link { + border-right: 1px solid #babdb6; +} + +/* aside */ +aside { + display: block; + min-height: 112px; + width: 200px; + margin-left: 10%; + padding: 1em; + float: left; + background-image: url(border.jpg); + background-position: top left; + background-repeat: no-repeat; + position: absolute; +} + +#dfrn-request-link { + display: block; + color: #FFFFFF; + -webkit-border-radius: 5px ; + -moz-border-radius: 5px; + border-radius: 5px; + padding: 5px; + font-weight: bold; + background: #3465a4 url('friendika-16.png') no-repeat 95% center; +} + +/* section */ +section { + margin: 0px 10%; + padding-top: 1em; + padding-left: 250px; + padding-right: 1em; + display: block; + background-color: #ffffff; + background-image: url(border.jpg); + background-position: top right; + background-repeat: no-repeat; + min-height: 112px; + +} +.tabs { + height: 27px; + background-image: url(head.jpg); + background-repeat: repeat-x; + background-position: 0px -20px; + border-bottom: 1px solid #babdb6; + padding:0px; +} +.tabs li { margin: 0px; list-style: none; } +.tab { + display:block; + float:left; + padding: 0.4em; + margin-right: 1em; +} +.tab.active { + font-weight: bold; +} + + +/* footer */ +footer { + display: none; + +} + +.birthday-today, .event-today { + font-weight: bold; +} + +div.wall-item-content-wrapper.shiny { + background-image: url('shiny.png'); + background-position: -5px 30px; + background-repeat:no-repeat; +} + +/* from default */ +#jot-perms-icon, +#profile-location, +#profile-nolocation, +#profile-youtube, +#profile-video, +#profile-audio, +#profile-link, +#profile-title, +#wall-image-upload, +#wall-file-upload, +#profile-upload-wrapper, +#wall-image-upload-div, +#wall-file-upload-div, +.hover, .focus { + cursor: pointer; +} + +#jot-perms-icon { + float: left; +} + + +#jot-title { + border: 0px; + margin: 0px; + height: 20px; + width: 530px; + margin-bottom: 5px; + font-weight: bold; + border: 1px solid #ffffff; +} + +#jot-title::-webkit-input-placeholder{font-weight: normal;} +#jot-title:-moz-placeholder{font-weight: normal;} + + +#jot-title:hover, +#jot-title:focus { + border: 1px solid #cccccc; +} + +.jothidden { display:none; } + + +.fakelink, .fakelink:visited, .fakelink:link { + color: #3465a4; + text-decoration: none; + cursor: pointer; + margin-top: 15px; + margin-bottom: 15px; +} +.lockview { + cursor: pointer; +} + +#group-sidebar { + margin-bottom: 10px; +} + +.group-selected, .nets-selected { + padding: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + border: 1px solid #CCCCCC; + background: #F8F8F8; + font-weight: bold; +} + +.fakelink:hover { + color: #3465a4; + text-decoration: underline; + cursor: pointer; +} +.smalltext { + font-size: 0.7em; +} +#sysmsg { + /*width: 600px;*/ + margin-bottom: 10px; +} + +#register-fill-ext { + margin-bottom: 25px; +} + +#label-register-name, #label-register-email, #label-register-nickname, #label-register-openid { + float: left; + width: 350px; + margin-top: 10px; +} + +#register-name, #register-email, #register-nickname { + float: left; + margin-top: 10px; + width: 150px; +} + +#register-openid { + float: left; + margin-top: 10px; + width: 130px; +} + +#register-name-end, #register-email-end, #register-nickname-end, #register-submit-end, #register-openid-end { + clear: both; +} + +#register-nickname-desc { + margin-top: 30px; + width: 650px; +} +#register-sitename { + float: left; + margin-top: 10px; +} + +#register-submit-button { + margin-top: 10px; +} + + +#login_standard { + width: 210px; + float: left; +} +#login_openid { + width: 210px; + margin-left: 250px; +} + +#login_standard input, +#login_openid input { + width: 180px; +} + +#login-extra-links { + clear: both; +} + +#register-link, #lost-password-link { + float: left; + font-size: 80%; + margin-right: 15px; +} + +#login-name-end, #login-password-end, #login-extra-end, #login-submit-end { + height: 50px; +} + +#login-submit-button { +/* margin-top: 10px; */ + margin-left: 200px; +} + + +input#dfrn-url { + float: left; + background: url(friendika-16.png) no-repeat; + background-position: 2px center; + font-size: 17px; + padding-left: 21px; + height: 21px; + background-color: #FFFFFF; + color: #000000; + margin-bottom: 20px; +} + +#dfrn-url-label { + float: left; + width: 250px; +} + +#dfrn-request-url-end { + clear: both; +} + +#knowyouyes, #knowyouno { + float: left; +} + +#dfrn-request-knowyou-yes-wrapper, #dfrn-request-knowyou-no-wrapper { + + float: none; +} +#dfrn-request-knowyou-yes-label, #dfrn-request-knowyou-no-label { + float: left; + width: 75px; + margin-left: 50px; + margin-bottom: 7px; +} +#dfrn-request-knowyou-break, #dfrn-request-knowyou-end { + clear: both; + +} + +#dfrn-request-message-wrapper { + margin-bottom: 50px; +} +#dfrn-request-submit-wrapper { + clear: both; + margin-left: 50px; +} + +#dfrn-request-info-wrapper { + margin-left: 50px; +} + + + +#cropimage-wrapper, #cropimage-preview-wrapper { + float: left; + padding: 30px; +} + +#crop-image-form { + margin-top: 30px; + clear: both; +} + +.intro-wrapper { + margin-top: 20px; +} + +.intro-fullname { + font-size: 1.1em; + font-weight: bold; + +} +.intro-desc { + margin-bottom: 20px; + font-weight: bold; +} + +.intro-note { + padding: 10px; +} + +.intro-end { + padding: 30px; +} + +.intro-form { + float: left; +} +.intro-approve-form { + clear: both; +} +.intro-approve-as-friend-end { + clear: both; +} +.intro-submit-approve, .intro-submit-ignore { + margin-right: 20px; +} +.intro-submit-approve { + margin-top: 15px; +} + +.intro-approve-as-friend-label, .intro-approve-as-fan-label { + float: left; + width: 100px; + margin-left: 20px; +} +.intro-approve-as-friend, .intro-approve-as-fan { + float: left; +} +.intro-form-end { + clear: both; +} +.intro-approve-as-friend-desc { + margin-top: 15px; +} +.intro-approve-as-end { + clear: both; + margin-bottom: 10px; +} + +.intro-end { + clear: both; + margin-bottom: 30px; +} + +#profile-extra-links { + clear: both; + margin-top: 10px; +} + +#profile-extra-links ul { + list-style-type: none; + padding: 0px; +} + + +#profile-extra-links li { + margin-top: 5px; +} + +#profile-edit-links ul { + list-style-type: none; +} + +#profile-edit-links li { + margin-top: 10px; +} +.profile-edit-side-div { + float: right; +} +.profile-edit-side-link { + opacity: 0.3; + filter:alpha(opacity=30); +} +.profile-edit-side-link:hover { + opacity: 1.0; + filter:alpha(opacity=100); +} + +.view-contact-wrapper { + margin-top: 20px; + float: left; + margin-left: 20px; + width: 180px; +} + +.contact-wrapper { + float: left; + width: 150px; + height: 150px; + overflow: auto; +} #view-contact-end { clear: both;