diff options
Diffstat (limited to 'view/theme/redbasic')
23 files changed, 1475 insertions, 2401 deletions
diff --git a/view/theme/redbasic/css/dark.css b/view/theme/redbasic/css/dark.css new file mode 100644 index 000000000..3bcf15bc9 --- /dev/null +++ b/view/theme/redbasic/css/dark.css @@ -0,0 +1,186 @@ +/* This file is deprecated. We'll keep it here as reference until somebody +defines a dark colour scheme */ + + +body { font-family: sans-serif; + font-size: 12px; + background-color: #101010; + background-image: -moz-linear-gradient(top, #000 16%, #101010 82%); + background-image: linear-gradient(bottom, #000 16%, #101010 82%); + background-image: -o-linear-gradient(bottom, #000 16%, #101010 82%); + background-image: -webkit-linear-gradient(bottom, #000 16%, #101010 82%); + background-image: -ms-linear-gradient(bottom, #000 16%, #101010 82%); + background-repeat: no-repeat; + background-attachment: fixed; + color: #eec; + +} + +aside { +border: none; +color: #fff; +} + +.fn { + color: #fff; +} + +.acl-list-item, +.profile-jot-net { + color: #000; +} + + +.tab.active { + color: #fff; +} + +blockquote {color: #000;} + +.wall-item-content-wrapper { + background: #262626; + border-radius: 5px; + box-shadow: 12px 12px 12px #000; + margin-bottom: 20px; +} + +.wall-item-content-wrapper.comment { + margin-left: 50px; + box-shadow: 5px 5px 5px #000; +} + +.comment-edit-text-empty, .comment-edit-text-full { + border-radius: 5px 5px 5px 5px; + box-shadow: 5px 5px 5px #000 inset; +} + + +#profile-jot-text { + height: 20px; + color:#000; + border: 1px solid #cccccc; + padding: 8px; + margin-right: 0px; + width: 90%; + -moz-border-radius: 5px; + border-radius: 5px; + box-shadow: 4px 4px 3px 0 #666 inset; +} +#profile-jot-text:hover { + color: #000000; +} + +#profile-jot-submit { + height: auto; + background-color: #0080FF; + color: #eeeeec; + font-weight: bold; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + border: 2px outset #222420 !important; + margin: 0; + float: right; + text-shadow: 1px 1px #111; + width: auto; + box-shadow: 5px 5px 5px #444; +} + + +.widget { + border-bottom: 1px solid #eec; + padding: 8px; + margin-top: 5px; + -moz-border-radius:5px; + -webkit-border-radius:5px; + border-radius:5px; + +} + +nav a, +nav a:active, +nav a:visited, +nav a:link { + color: #ffffff; + text-decoration: none; + outline: none; +} + +.nav-menu.selected a { + color: #0080ff !important; +} + +nav .nav-menu-icon { + position: relative; + height: 22px; + padding: 5px; +/* margin: 3px 10px; */ + -moz-border-radius: 5px 5px 0 0; + -webkit-border-radius: 5px 5px 0 0; + border-radius: 5px 5px 0 0; +} + +nav .nav-notify { + background-color: #0080FF; + color: #fff; + -moz-border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; + opacity: 0.6; + filter:alpha(opacity=60); + +} +.nav-notify:hover, nav .nav-notify.selected span { + color: #ffffff; +} + +ul.menu-popup { + + position: absolute; + display: none; + width: 10em; + background: #000; + color: #fff; + padding: 0px; + list-style: none; + border-radius: 0px 0px 20px 20px; + z-index: 100000; + -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); +} +ul.menu-popup a { + display: block; + color: #FFFFFF; + padding: 5px 10px; + text-decoration: none; +} + + +ul.menu-popup a:hover { + background-color: #888888; + color: #FFFFFF; +} +ul.menu-popup .menu-sep { + border-top: 1px solid #9eabb0; +} + +.wall-item-photo, +.photo, +.contact-block-img, +.my-comment-photo { + border-radius: 5px; + box-shadow: 4px 4px 3px #000; +} + + +div#pagelist-content-wrapper { +width: 80%; +background: #111; +margin-left: auto; +margin-right: auto; +} + +div.page-list-item { +margin: 20px; +} diff --git a/view/theme/redbasic/css/fancy.css b/view/theme/redbasic/css/fancy.css new file mode 100644 index 000000000..9b8899d2f --- /dev/null +++ b/view/theme/redbasic/css/fancy.css @@ -0,0 +1,107 @@ +/*This file is deprecated. We'll keep it for reference until we provide window decorations */ + + +aside { +border-radius: $radiuspx;} + + +.tab { + height: auto; + background-color: #f00; + color: #fff !important; + font-weight: bold; + -webkit-border-radius: $radiuspx; + -moz-border-radius: $radiuspx; + border-radius: $radiuspx; + margin: 0; + width: auto; + margin-left: 8px; + padding: 4px; + text-align: center; +} +.tab:hover, .tab.active:hover { + background: #d00; + color: #fff; + ; +} +.tab:active { + background: #fff; + color: #f00; +} +.tab.active { + background: #f00; + color: #fff; + box-shadow: 3px 3px 3px #333 inset; + padding: 5px; /* strageness of the human mind - has to be larger than inactive tabs, or it looks smaller than them */ +} + + + +.wall-item-content-wrapper { + position: relative; + border-radius: $radiuspx; + box-shadow: 8px 8px 8px #000; + border: 1px solid #eec; +} + +.wall-item-content-wrapper.comment { + margin-top: 15px; +} + +.wall-item-like:hover, .wall-item-dislike:hover{ +opacity: 1; +} + +.wall-item-author { + margin-top: 10px; +} + +.comment-edit-wrapper { + margin-top: 15px; + background: #ffffff; + margin-left: 50px; +} + +#profile-jot-submit { + background-color: #dd0000; +} + +ul.menu-popup { + background: #dd0000; + color: #eec; + border-radius: $radiuspx; + z-index: 100000; + -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); +} +ul.menu-popup a { + color: #eec; +} +ul.menu-popup a:hover { + background-color: #eec; + color: #f00; +} + +section { +left: 0px; +width: 800px; +margin-left: auto; +margin-right: auto; +} +body {background-color: #d00 !important;} + +.page-content-wrapper {background: #fff; + color: #000; + border-radius: 20px; + box-shadow: 5px 5px 5px #111; +} + +h3.page-title { +padding-top: 30px; + color: #033} +.page-body {padding: 40px;} + +.page-body strong {color: #033;} + +.nav-links {margin-top: 5px;} diff --git a/view/theme/redbasic/css/mod_page.css b/view/theme/redbasic/css/mod_page.css new file mode 100644 index 000000000..37f597fac --- /dev/null +++ b/view/theme/redbasic/css/mod_page.css @@ -0,0 +1,24 @@ +/* +section { +left: 0px; +width: 800px; +margin-left: auto; +margin-right: auto; +} +body {background-color: #d00 !important;} + +.page-content-wrapper {background: #fff; + color: #000; + border-radius: 20px; + box-shadow: 5px 5px 5px #111; +} + +h3.page-title { +padding-top: 30px; + color: #033} +.page-body {padding: 40px;} + +.page-body strong {color: #033;} + +.nav-links {margin-top: 5px;} +*/
\ No newline at end of file diff --git a/view/theme/redbasic/css/sloppy_photos.css b/view/theme/redbasic/css/sloppy_photos.css new file mode 100644 index 000000000..78aedc9cc --- /dev/null +++ b/view/theme/redbasic/css/sloppy_photos.css @@ -0,0 +1,58 @@ + +.rotleft1 { +-webkit-transform: rotate(-1deg); +-moz-transform: rotate(-1deg); +-ms-transform: rotate(-1deg); +-o-transform: rotate(-1deg); +} + +.rotleft2 { +-webkit-transform: rotate(-2deg); +-moz-transform: rotate(-2deg); +-ms-transform: rotate(-2deg); +-o-transform: rotate(-2deg); +} + +.rotleft3 { +-webkit-transform: rotate(-3deg); +-moz-transform: rotate(-3deg); +-ms-transform: rotate(-3deg); +-o-transform: rotate(-3deg); +} + +.rotleft4 { +-webkit-transform: rotate(-4deg); +-moz-transform: rotate(-4deg); +-ms-transform: rotate(-4deg); +-o-transform: rotate(-4deg); +} + + +.rotright1 { +-webkit-transform: rotate(1deg); +-moz-transform: rotate(1deg); +-ms-transform: rotate(1deg); +-o-transform: rotate(1deg); +} + +.rotright2 { +-webkit-transform: rotate(2deg); +-moz-transform: rotate(2deg); +-ms-transform: rotate(2deg); +-o-transform: rotate(2deg); +} + +.rotright3 { +-webkit-transform: rotate(3deg); +-moz-transform: rotate(3deg); +-ms-transform: rotate(3deg); +-o-transform: rotate(3deg); +} + +.rotright4 { +-webkit-transform: rotate(4deg); +-moz-transform: rotate(4deg); +-ms-transform: rotate(4deg); +-o-transform: rotate(4deg); +} + diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index db73e27d5..f039b7374 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -8,25 +8,23 @@ /* generals */ body { - font-family: arial,freesans,clean,sans-serif; - font-size: 12px; - background-color: #ffffff; - color: #000000; + font-family: arial,freesans,sans-serif; + font-size: $body_font_size; + background-color: $bgcolour; + background-image: url('$background_image'); + background-attachment: fixed; + background-size: cover; + color: $font_colour; margin: 0px; } .jslider { - font-family: arial,freesans,clean,sans-serif; + font-family: arial,freesans,sans-serif; } abbr { border-bottom: none; } -aside { -border: none; -color: #444444; -} - /* icons */ .icon { background-color: transparent ; @@ -39,67 +37,6 @@ color: #444444; .icon.text { text-indent: 0px; } -.icon.notify { - background-image: url("../img/notify_on.png"); - min-width: 22px; - height: 22px; - margin-top: -4px; - background-position: left center; - padding: 1px; -} -.icon.gear { - background-image: url("../img/settings.png"); - min-width: 22px; - height: 22px; - margin-top: -2px; - background-position: left center; - padding: 1px; -} - -.icon.home { - background-image: url("../img/home.png"); - min-width: 22px; - height: 22px; - margin-top: -4px; - background-position: left center; - padding: 1px; -} - -.icon.network { - background-image: url("../img/network.png"); - min-width: 22px; - height: 22px; - margin-top: -3px; - background-position: left center; - padding: 1px; -} - -.icon.introductions { - background-image: url("../img/introductions.png"); - min-width: 22px; - height: 22px; - margin-top: -4px; - background-position: left center; - padding: 1px; -} - -.icon.mail { - background-image: url("../img/message.png"); - min-width: 22px; - height: 22px; - margin-top: -2px; - background-position: left center; - padding: 1px; -} - -.icon.events { - background-image: url("../img/events.png"); - min-width: 22px; - height: 22px; - margin-top: -4px; - background-position: left center; - padding: 1px; -} a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link { font-weight: bold; @@ -113,15 +50,29 @@ a:hover, .fakelink:hover { color: #44AAFF; text-decoration: underline; } cursor: pointer; } + +input[type="text"], +input[type="password"], +input[type="submit"], +select, +textarea { + font-family: arial,freesans,sans-serif; + font-size: $body_font_size; +} + input { border: 1px solid #666666; - -moz-border-radius: 5px; - border-radius: 5px; + -moz-border-radius: $radiuspx; + border-radius: $radiuspx; padding: 3px; } -img { border :0px; } - +input[type="submit"] { + background-color: #F0F0F0; + font-weight: bold; + color: #0080FF; + text-decoration: none; +} code { font-family: Courier, monospace; @@ -139,6 +90,7 @@ blockquote { background-color: #f4f8f9; border-left: 4px solid #dae4ee; padding: 0.4em; + color: #000; } .ccollapse-wrapper { @@ -146,10 +98,6 @@ blockquote { padding: 5px; } -.hide-comments { - margin-left: 5px; -} - #panel { background-color: ivory; position: absolute; @@ -167,13 +115,6 @@ blockquote { -/* nav */ - -nav { - display: block; - border-bottom: 1px solid #d00; -} - #langselector { position: fixed; top: 3px; @@ -189,6 +130,30 @@ nav { filter:alpha(opacity=100); } +nav { + background-image: linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%); + background-image: -o-linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%); + background-image: -moz-linear-gradient(bottom,$nav_bg_1 26%, $nav_bg_2 82%); + background-image: -webkit-linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%); + background-image: -ms-linear-gradient(bottom, $nav_bg_1 26%, $nav_bg_2 82%); + opacity: $nav_float_min_opacity; + filter:alpha(opacity=$nav_percent_min_opacity); + +} + + + +nav:hover { + background-image: linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%); + background-image: -o-linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%); + background-image: -moz-linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%); + background-image: -webkit-linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%); + background-image: -ms-linear-gradient(bottom, $nav_bg_3 26%, $nav_bg_4 82%); + opacity: 1.0; + filter:alpha(opacity=100); + +} + nav #site-location { color: #888a85; @@ -207,10 +172,10 @@ nav #site-location { .info-message { font-size: 1.1em; border: 1px solid #444; - background-color: #ccc; + background-color: #F0F0F0; padding: 10px; - -moz-border-radius: 5px; - border-radius: 5px; + -moz-border-radius: $radiuspx; + border-radius: $radiuspx; } @@ -229,21 +194,21 @@ header #site-location { } header #banner { + overflow: hidden; text-align: center; - width: 100%; - font-size: 2.2em; + font-size: 1.4em; font-family: tahoma, "Lucida Sans", sans; - color: #eec; + color: $banner_colour; font-weight: bold; - + margin-top: 1px; } header #banner a, header #banner a:active, header #banner a:visited, header #banner a:link, header #banner a:hover { - color: #eec; + color: #FFF; text-decoration: none; outline: none; vertical-align: bottom; @@ -256,7 +221,7 @@ header #banner #logo-text { font-size: 22px; } -.nav-commlink { +.nav-commlink, .nav-login-link { display: block; height: 15px; margin-top: 67px; @@ -268,8 +233,8 @@ header #banner #logo-text { border-bottom: 0px; background-color: #aec0d3; color: #565854; - -moz-border-radius: 5px 5px 0px 0px; - border-radius: 5px 5px 0px 0px; + -moz-border-radius: $radiuspx; + border-radius: $radiuspx; } nav .nav-link { @@ -279,7 +244,7 @@ nav .nav-link { background-color: transparent !important; } -.nav-commlink.selected { +.nav-commlink.active { background-color: #ffffff; border-bottom: 1px solid #ffffff; color: #000000 !important; @@ -300,22 +265,20 @@ nav #nav-link-wrapper .nav-link { } .tabs { - height: 22px; + height: 28px; border-bottom: 1px solid #aaaaaa; padding:0px; - margin-right: 10px; + width: 90%; } .tabs li { margin: 0px; list-style: none; } .tab { display:block; float:left; - padding: 0.4em; - margin-right: 3px ; + margin-right: 15px ; } .tab.active { -/* font-weight: bold; */ color: #444444; } @@ -324,27 +287,31 @@ ul.tabs { margin-bottom: 0px; list-style-type: none; padding: 0px; + padding-right: 8px; } /* footer */ footer { + position:fixed; + bottom:1px; text-align: right; padding-bottom: 1em; padding-right: 3em; } -#powered-by { - position: fixed; - bottom: 1px; - left: 15px; - opacity: 0.3; - filter:alpha(opacity=30); - +.birthday-today, .event-today { + font-weight: bold; } -.birthday-today, .event-today { +.warning-text { + font-size: 1.2em; font-weight: bold; + color: #ff0000; +} + +#noperm-msg { + margin-top: 15px; } .preview { @@ -355,86 +322,14 @@ footer { margin: 15px 0 15px 150px; } -/* 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, #jot-category { - border: 0px; - margin: 0px; - padding: 8px; - height: 20px; - width: 530px; - margin-bottom: 5px; - font-weight: bold; - border: solid 1px #ccc; - border-radius: 5px; -} - -#jot-title::-webkit-input-placeholder{font-weight: bold;} -#jot-category::-webkit-input-placeholder{font-weight: bold;} -#jot-title:-moz-placeholder{font-weight: bold;} -#jot-category:-moz-placeholder{font-weight: bold;} - -#jot-title:hover, -#jot-title:focus, -#jot-category:hover, -#jot-category:focus { - border: 1px solid #cccccc; -} - -.jothidden { display:none; } - - - .fakebutton { margin-top: 15px; margin-bottom: 15px; } -.lockview { - cursor: pointer; -} - - -#group-sidebar { - margin-bottom: 10px; -} - -.group-selected, .nets-selected, .fileas-selected, .categories-selected { - padding: 3px; - -moz-border-radius: 5px; - border-radius: 5px; - border: 1px solid #CCCCCC; - background: #F8F8F8; - font-weight: bold; -} - -.settings-widget .selected { - padding: 3px; - -moz-border-radius: 5px; - border-radius: 5px; - border: 1px solid #CCCCCC; - background: #F8F8F8; - font-weight: bold; +/*TODO: we should use one class for all this. */ +.group-selected, .fileas-selected, .categories-selected, .search-selected, .active { + color: #444444 !important; } .smalltext { @@ -495,9 +390,9 @@ footer { clear: both; } -#register-link, #lost-password-link { +#register-link, +#lost-password-link { float: left; - font-size: 90%; margin-left: 100px; } @@ -509,65 +404,8 @@ footer { margin-left: 100px; margin-top: 10px; -/* margin-left: 200px; */ -} - - -/* TODO - we don't use DFRN anymore. These probably have different names now. Check and clean up later */ - -input#dfrn-url { - float: left; - background: url(../img/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; @@ -579,67 +417,7 @@ input#dfrn-url { 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; -} .aprofile dt { font-weight: bold; } @@ -677,28 +455,13 @@ input#dfrn-url { clear: both; } -#birthday-title { - float: left; - font-weight: bold; -} - -#birthday-adjust { - float: left; - font-size: 75%; - margin-left: 10px; +.vcard-profile-edit-icon { + font-size: 1.2em; } - -#birthday-title-end { - clear: both; +.vcard-profile-edit-icon:hover { + text-decoration: none; } -.birthday-list { - margin-left: 15px; -} - -#birthday-wrapper { - margin-bottom: 20px; -} #profile-extra-links { clear: both; @@ -750,42 +513,7 @@ input#dfrn-url { #viewconnections { margin-top: 15px; } -#profile-edit-default-desc { - color: #FF0000; - border: 1px solid #FF8888; - background-color: #FFEEEE; - padding: 7px; -} - -#profile-edit-clone-link-wrapper { - float: left; - margin-left: 50px; - margin-bottom: 20px; - width: 300px; -} - - -#profile-edit-links-end { - clear: both; - margin-bottom: 15px; -} - -.profile-listing-photo { - border: none; -} - -.profile-edit-submit-wrapper { - margin-top: 20px; - margin-bottom: 20px; -} - -#profile-photo-link-select-wrapper { - margin-top: 2em; -} -#profile-photo-submit-wrapper { - margin-top: 10px; -} #profile-photo-wrapper img { width:175px; @@ -800,72 +528,6 @@ input#dfrn-url { } -#profile-edit-profile-name-label, -#profile-edit-name-label, -#profile-edit-pdesc-label, -#profile-edit-gender-label, -#profile-edit-dob-label, -#profile-edit-address-label, -#profile-edit-locality-label, -#profile-edit-region-label, -#profile-edit-postal-code-label, -#profile-edit-country-name-label, -#profile-edit-marital-label, -#profile-edit-sexual-label, -#profile-edit-politic-label, -#profile-edit-religion-label, -#profile-edit-pubkeywords-label, -#profile-edit-prvkeywords-label, -#profile-edit-homepage-label, -#profile-edit-hometown-label { - float: left; - width: 175px; -} - -#profile-edit-profile-name, -#profile-edit-name, -#profile-edit-pdesc, -#gender-select, -#profile-edit-dob, -#profile-edit-address, -#profile-edit-locality, -#profile-edit-region, -#profile-edit-postal-code, -#profile-edit-country-name, -#marital-select, -#sexual-select, -#profile-edit-politic, -#profile-edit-religion, -#profile-edit-pubkeywords, -#profile-edit-prvkeywords, -#profile-in-dir-yes, -#profile-in-dir-no, -#profile-in-netdir-yes, -#profile-in-netdir-no, -#hide-wall-yes, -#hide-wall-no, -#hide-friends-yes, -#hide-friends-no { - float: left; - margin-bottom: 20px; -} -#settings-normal, -#settings-soapbox, -#settings-freelove, -#settings-community { - float: left; -} -#settings-notifications label { - margin-left: 20px; -} -#settings-notify-desc, #settings-activity-desc { - font-weight: bold; - margin-bottom: 15px; -} -#settings-pagetype-desc { - color: #666666; - margin-bottom: 15px; -} #profile-in-dir-yes-label, #profile-in-dir-no-label, @@ -880,10 +542,6 @@ input#dfrn-url { width: 50px; } -#profile-edit-with-label { - width: 175px; - margin-left: 20px; -} #profile-publish-yes-reg, #profile-publish-no-reg { @@ -904,70 +562,6 @@ input#dfrn-url { } -#profile-edit-pdesc-desc, -#profile-edit-pubkeywords-desc, -#profile-edit-prvkeywords-desc { - float: left; - margin-left: 20px; -} - - -#profile-edit-homepage, #profile-edit-hometown { - float: left; - margin-bottom: 35px; -} -#settings-normal-label, -#settings-soapbox-label, -#settings-community-label, -#settings-freelove-label { - float: left; - width: 200px; -} -#settings-normal-desc, -#settings-soapbox-desc, -#settings-community-desc, -#settings-freelove-desc { - /*float: left; - margin-left: 75px;*/ - clear: left; - color: #666666; - display: block; - margin-bottom: 20px -} - -#profile-edit-profile-name-end, -#profile-edit-name-end, -#profile-edit-pdesc-end, -#profile-edit-gender-end, -#profile-edit-dob-end, -#profile-edit-address-end, -#profile-edit-locality-end, -#profile-edit-region-end, -#profile-edit-postal-code-end, -#profile-edit-country-name-end, -#profile-edit-marital-end, -#profile-edit-sexual-end, -#profile-edit-politic-end, -#profile-edit-religion-end, -#profile-edit-pubkeywords-end, -#profile-edit-prvkeywords-end, -#profile-edit-homepage-end, -#profile-edit-hometown-end, -#profile-in-dir-break, -#profile-in-dir-end, -#profile-in-netdir-break, -#profile-in-netdir-end, -#hide-wall-break, -#hide-wall-end, -#hide-friends-break, -#hide-friends-end, -#settings-normal-break, -#settings-soapbox-break, -#settings-community-break, -#settings-freelove-break { - clear: both; -} - .settings-widget ul { list-style-type: none; padding: 0px; @@ -979,493 +573,15 @@ input#dfrn-url { } -#gender-select, #marital-select, #sexual-select { - width: 220px; -} - -#profile-edit-profile-name-wrapper .required { - color: #FF0000; - float: left; -} - -#contacts-main { - margin-top: 20px; - margin-bottom: 20px; -} - -.contact-entry-wrapper { - float: left; - width: 120px; - height: 120px; - padding: 10px; -} -#contacts-search-end { - margin-bottom: 10px; -} - -.contact-entry-direction-icon { - margin-top: 24px; - margin-right: 2px; -} - -.contact-entry-photo img { - border: none; -} -.contact-entry-photo-end { - clear: both; -} -.contact-entry-name { - float: left; - margin-left: 0px; - margin-right: 10px; - width: 120px; - overflow: hidden; -} -.contact-entry-edit-links { - margin-top: 6px; - margin-left: 10px; - width: 16px; -} -.contact-entry-nav-wrapper { - float: left; - margin-left: 10px; -} - -.contact-entry-edit-links img { - border: none; - margin-right: 15px; -} -.contact-entry-photo { - float: left; - position: relative; -} -.contact-entry-end { - clear: both; -} #fsuggest-desc, #fsuggest-submit-wrapper { margin-top: 15px; margin-bottom: 15px; } -#network-star-link{ - margin-top: 10px; -} -.network-star { - float: left; - margin-right: 5px; -} -#network-bmark-link { - margin-top: 10px; -} -.thread-wrapper .wall-item-comment-wrapper { - margin-left: 50px; -} - -/* Give the top level post bigger shadows than the comments. This makes them appear "higher" and the comments "lower", which separates posts from each other reasonably without literally drawing a line under it */ - -.wall-item-content-wrapper { - margin-top: 10px; - position: relative; -/* background: #fff; */ -/* border-radius: 5px; */ -/* box-shadow: 12px 12px 12px #111; */ - border-left: 1px solid #eec; - -} -.wall-item-content-wrapper.comment { -/* background: #fff; */ - border-left: 1px solid #e0e0e0; - margin-left: 50px; -/* box-shadow: 5px 5px 5px #222; */ -} - .thread-end-wrapper { margin-left: 50px; } - - -.wall-item-content-wrapper.comment { - background: #ffffff; - border-left: 1px solid #e0e0e0; - -} - -.wall-item-like.comment, .wall-item-dislike.comment { - margin-left: 50px; -} - -.wall-item-info { - display: block; - float: left; - width:110px; - margin-right:10px; -} -.comment .wall-item-info { - width: 70px; -} - -.wall-item-photo-wrapper { - margin-top: 10px; - margin-left: 10px; - margin-bottom: 10px; - width: 100px; -} -.wall-item-photo-menu-button { - display: block; - position: absolute; - background-image: url("../img/photo-menu.jpg"); - background-position: top left; - background-repeat: no-repeat; - margin: 0px; padding: 0px; - width: 16px; - height: 16px; - top: 74px; left:10px; - overflow: hidden; - text-indent: 40px; - display: none; - -} -.wall-item-photo-menu { - width: auto; - border: 2px solid #444444; - background: #FFFFFF; - position: absolute; - left: 10px; top: 90px; - display: none; - z-index: 10000; -} -.wall-item-photo-menu ul { margin:0px; padding: 0px; list-style: none } -.wall-item-photo-menu li a { display: block; padding: 2px; } -.wall-item-photo-menu li a:hover { color: #FFFFFF; background: #3465A4; text-decoration: none; } - - -.comment .wall-item-photo-menu-button { top: 44px;} -.comment .wall-item-photo-menu { top: 60px; } - -.wallwall .wwto { - left: 50px; - margin: 0; - position: absolute; - top: 70px; - width: 30px -} -.wallwall .wwto img { - width: 30px !important; - height: 30px !important; -} - -.wallwall .wall-item-photo-end { - clear: both; -} - -.wall-item-arrowphoto-wrapper { - position: absolute; - left: 75px; - top: 70px; - z-index: 100; -} -.wall-item-wrapper { - /*float: left; - margin-right: 5px; - width: 250px;*/ - margin-left:10px; -} -.wall-item-lock { - /*height: 20px;*/ - /*margin-top: 10px;*/ - left: 105px; - position: absolute; - top: 1px; -} -.comment .wall-item-lock { - left: 65px; -} - -.wall-item-ago { - color: #888888; - font-size: 0.8em; -} - -.wall-item-location { - overflow: hidden; - /* add ellipsis on text overflow */ - /* this work on safari, opera, ie, chrome. */ - /* firefox users have to wait support or we */ - /* can use a jquery plugin http://bit.ly/zJskg */ - text-overflow: ellipsis; - -o-text-overflow: ellipsis; - width: 100%; -} - - -.item-tool { - float: left; - margin-right: 8px; -} - -.like-rotator { - margin-left: 5px; -} - -.wall-item-delete-wrapper { - float: right; -} - -.wall-item-delete-end { - clear: both; -} - -.wall-item-delete-icon { - border: none; -} - -.wall-item-wrapper-end { - clear: both; -} -.wall-item-name-link { - font-weight: bold; - text-decoration: none; - color: #3172BD; -} -.wall-item-photo { - border: none; -} -.comment .wall-item-photo { - width: 50px !important; - height: 50px !important; -} -.wall-item-content { - margin-left: 10px; - overflow: auto; -} - -.wall-item-content img { - max-height: 95% !important; - max-width: 95% !important; -/* box-shadow: 8px 8px 8px #666; can't really have this because of smileys */ -} - -.wall-item-content img.smiley { - box-shadow: none; -} -.wall-item-title { - float: left; - font-weight: bold; - /*width: 450px;*/ -} - -.wall-item-title-end { - clear: both; -} - -.thread-wrapper.toplevel_item { - width: 90%; -} - -.wall-item-body { -/* float: left; */ - /*width: 450px;*/ - margin-top: 10px; -} - -.wall-item-tools { - clear: both; - padding: 5px 10px; -} - -.wall-item-like, .wall-item-dislike { - margin-left: 0px; - margin-top: 3px; -} - -.wall-item-author { - margin-top: 10px; -} - -.comment-edit-wrapper { - margin-top: 15px; - background: #ffffff; - margin-left: 50px; -} - -.comment-wwedit-wrapper { - background: #ffffff; -} - -.comment-edit-photo { - margin-top: 10px; - margin-left: 10px; - margin-bottom: 10px; - width: 100px; - float: left; -} -.comment-wwedit-wrapper.threaded > .comment-edit-form > .comment-edit-photo { - width: 40px; -} - -.comment-edit-photo img { - width: 25px; -} -.comment-edit-text-empty, .comment-edit-text-full { - float: left; - margin-top: 10px; - padding: 3px 1px 1px 3px; - border: 1px solid #ccc; - padding: 8px; - border-radius: 5px 5px 5px 5px; -/* box-shadow: 5px 5px 5px #666 inset; */ -} - -.comment-edit-text-empty { - color: gray; - height: 1.5em; - width: 80%; /*Too wide? */ - overflow: auto; - margin-bottom: 10px; -} - -.comment-wwedit-wrapper.threaded > .comment-edit-form > .comment-edit-text-empty { - height: 1.5em; -} - -.comment-edit-text-full { - color: black; - height: 150px; - width: 80%; - overflow: auto; -} - - -.comment-edit-text-end { - clear: both; -} - -.comment-edit-submit { - margin: 10px 0px 10px 110px; -} - -.comment-wwedit-wrapper.threaded > .comment-edit-form > .comment-edit-submit-wrapper > .comment-edit-submit { - margin-left: 50px; -} - -#profile-jot-plugin-wrapper, -#profile-jot-submit-wrapper { - margin-top: 15px; - width:90%; -} - -#profile-jot-submit { - float: left; -} -#profile-upload-wrapper { - float: left; - margin-left: 30px; -} -#profile-attach-wrapper { - float: left; - margin-left: 30px; -} -#profile-rotator { - float: left; - margin-left: 30px; -} -#profile-link-wrapper { - float: left; - margin-left: 15px; -} -#profile-youtube-wrapper { - float: left; - margin-left: 15px; -} -#profile-video-wrapper { - float: left; - margin-left: 15px; -} -#profile-audio-wrapper { - float: left; - margin-left: 15px; -} -#profile-location-wrapper { - float: left; - margin-left: 15px; -} -#jot-preview-link { - float: left; - margin-left: 45px; - margin-top: 0px !important; -} - - -#profile-nolocation-wrapper { - float: left; - margin-left: 15px; -} -#profile-title-wrapper { - float: left; - margin-left: 15px; -} - -#profile-jot-perms { - float: right; - margin-left: 100px; - font-weight: bold; - font-size: 1.2em; - height: auto; - width: auto; - background-color: #0080FF; - border-radius: 5px; - border: 2px outset; - box-shadow: 5px 5px 5px #666; - margin-right: 8px; - padding: 4px; -} - -#profile-jot-perms:active { - box-shadow: 0 0 0 0; -} - -#profile-jot-perms-end { - /*clear: left;*/ - height: 30px; -} - -#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 { - /*clear: both;*/ - margin-bottom: 30px; -} -#about-jot-submit-wrapper { - margin-top: 15px; -} -#about-jot-end { - margin-bottom: 30px; -} -#contacts-main { - margin-bottom: 30px; -} - -#profile-listing-desc { - margin-left: 30px; -} - -#profile-listing-new-link-wrapper { - margin-left: 30px; - margin-bottom: 30px; -} .profile-listing-photo-wrapper { float: left; } @@ -1496,49 +612,12 @@ input#dfrn-url { width: 200px; } -.fortune { - margin-top: 50px; - color: #4444FF; - font-weight: bold; - margin-bottom: 20px; -} -.directory-end { - clear: both; -} -.directory-name { - text-align: center; -} -.directory-photo { - margin-left: 25px; -} + .directory-details { font-size: 0.7em; - text-align: center; - margin-left: 5px; - margin-right: 5px; -} -.directory-item { - float: left; - width: 225px; - height: 260px; - overflow: auto; -} - -#directory-search-wrapper { - margin-top: 20px; - margin-right: 20px; - margin-bottom: 50px; -} - -#directory-search-end { -} - -.directory-photo-img { - border: none; } - .pager { padding: 10px; text-align: center; @@ -1570,298 +649,14 @@ input#dfrn-url { padding: 4px; } - -#advanced-profile-name-wrapper, -#advanced-profile-gender-wrapper, -#advanced-profile-dob-wrapper, -#advanced-profile-age-wrapper, -#advanced-profile-marital-wrapper, -#advanced-profile-sexual-wrapper, -#advanced-profile-homepage-wrapper, -#advanced-profile-politic-wrapper, -#advanced-profile-religion-wrapper, -#advanced-profile-about-wrapper, -#advanced-profile-interest-wrapper, -#advanced-profile-contact-wrapper, -#advanced-profile-music-wrapper, -#advanced-profile-book-wrapper, -#advanced-profile-tv-wrapper, -#advanced-profile-film-wrapper, -#advanced-profile-romance-wrapper, -#advanced-profile-work-wrapper, -#advanced-profile-education-wrapper { - margin-top: 20px; -} - -#advanced-profile-name-text, -#advanced-profile-gender-text, -#advanced-profile-dob-text, -#advanced-profile-age-text, -#advanced-profile-marital-text, -#advanced-profile-sexual-text, -#advanced-profile-homepage-text, -#advanced-profile-politic-text, -#advanced-profile-religion-text, -#advanced-profile-about-text, -#advanced-profile-interest-text, -#advanced-profile-contact-text, -#advanced-profile-music-text, -#advanced-profile-book-text, -#advanced-profile-tv-text, -#advanced-profile-film-text, -#advanced-profile-romance-text, -#advanced-profile-work-text, -#advanced-profile-education-text { - width: 300px; - float: left; -} - -#advanced-profile-name-end, -#advanced-profile-gender-end, -#advanced-profile-dob-end, -#advanced-profile-age-end, -#advanced-profile-marital-end, -#advanced-profile-sexual-end, -#advanced-profile-homepage-end, -#advanced-profile-politic-end, -#advanced-profile-religion-end { - height: 10px; -} - -#advanced-profile-about-end, -#advanced-profile-interest-end, -#advanced-profile-contact-end, -#advanced-profile-music-end, -#advanced-profile-book-end, -#advanced-profile-tv-end, -#advanced-profile-film-end, -#advanced-profile-romance-end, -#advanced-profile-work-end, -#advanced-profile-education-end { - - -} - -#advanced-profile-name, -#advanced-profile-gender, -#advanced-profile-dob, -#advanced-profile-age, -#advanced-profile-marital, -#advanced-profile-sexual, -#advanced-profile-homepage, -#advanced-profile-politic, -#advanced-profile-religion { - float: left; - -} - - -#advanced-profile-about, -#advanced-profile-interest, -#advanced-profile-contact, -#advanced-profile-music, -#advanced-profile-book, -#advanced-profile-tv, -#advanced-profile-film, -#advanced-profile-romance, -#advanced-profile-work, -#advanced-profile-education { - margin-top: 10px; - margin-left: 50px; - margin-right: 20px; - padding: 10px; - border: 1px solid #CCCCCC; -} - -#advanced-profile-with { - float: left; - margin-left: 15px; -} - -#contact-edit-wrapper { - margin-top: 10px; -} - -#contact-edit-banner-name { - font-size: 1.4em; - font-weight: bold; -} - -#contact-edit-poll-wrapper { - margin-top: 15px; -} - -#contact-edit-poll-text { - margin-top: 15px; - margin-bottom: 5px; -} - -#contact-edit-update-now { - margin-top: 15px; -} - -#contact-edit-links{ - clear: both; -} - -#contact-edit-links ul { - list-style: none; - list-style-type: none; - margin-left: 0px; - padding-left: 0px; -} - -#contact-edit-links li { - margin-top: 5px; -} - -#contact-edit-drop-link { - float: right; - margin-right: 20px; -} - -#contact-edit-nav-end { - clear: both; -} - -#contact-edit-wrapper { - width: 100%; -} - -#contact-edit-end { - clear: both; - margin-top: 15px; -} - -#contact-profile-selector { - width: 175px; - margin-left: 175px; -} - -.contact-edit-submit { - margin-top: 20px; -} - - -.contact-photo-menu-button { - position: absolute; - background-image: url("../img/photo-menu.jpg"); - background-position: top left; - background-repeat: no-repeat; - margin: 0px; padding: 0px; - width: 16px; - height: 16px; - top: 64px; left:0px; - overflow: hidden; - text-indent: 40px; - display: none; - -} -.contact-photo-menu { - width: auto; - border: 2px solid #444444; - background: #FFFFFF; - position: absolute; - left: 0px; top: 90px; - display: none; - z-index: 10000; -} -.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none } -.contact-photo-menu li a { display: block; padding: 2px; } -.contact-photo-menu li a:hover { color: #FFFFFF; background: #3465A4; text-decoration: none; } - - #block-message, #ignore-message, #archive-message, #lost-contact-message { color: #FF0000; } -#profile-edit-insecure { - margin-top: 20px; - color: #FF0000; - font-size: 1.1em; - border: 1px solid #FF8888; - background-color: #FFEEEE; - padding-left: 5px; - /*: 3px 3px 3px 5px; */ - width: 587px; -} - -/* TinyMCE */ - -DIV#profile-jot-text_toolbargroup{ -background: #FFF; -border: 1px #111; -/*box-shadow: 5px 5px 5px #000 inset;*/ -} - -/* -#profile-jot-text_parent, .mceLayout { - border-radius: 5px; - -moz-border-radius: 5px; - box-shadow: 4px 4px 3px 0 #444444; -} -*/ - - -iframe#profile-jot-text_ifr { -width: 100% !important; -height: 100% !important; -box-shadow: 5px 5px 5px #000 inset !important;} - -tr.mceLast { - -} - -/* Not MCE */ - -#profile-jot-text { - height: 20px; - color:#000; - border: 1px solid #cccccc; - padding: 8px; - width: 90%; - -moz-border-radius: 5px; - border-radius: 5px; -/* box-shadow: 4px 4px 3px 0 #666 inset; */ -} -#profile-jot-text:hover { - color: #000000; -} - -.wall-item-photo, .photo, .contact-block-img, .my-comment-photo { - border-radius: 5px; - -moz-border-radius: 5px; - box-shadow: 4px 4px 3px 0 #444444; -} - - -#datebrowse-sidebar select { - margin-left: 25px; - border-radius: 5px; - -moz-border-radius: 5px; - opacity: 0.3; - filter:alpha(opacity=30); -} - -#datebrowse-sidebar select:hover { - opacity: 1.0; - filter:alpha(opacity=100); -} - -#posted-date-selector { - margin-left: 30px !important; - margin-top: 5px !important; - margin-right: 0px !important; - margin-bottom: 0px !important; -} - -#posted-date-selector:hover { - box-shadow: 4px 4px 3px 0 #444444; - margin-left: 25px !important; - margin-top: 0px !important; - margin-right: 5px !important; - margin-bottom: 5px !important; - +.photo, .contact-block-img { + border-radius: $radiuspx; + -moz-border-radius: $radiuspx; + box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444; } #side-bar-photos-albums { @@ -1872,44 +667,21 @@ tr.mceLast { list-style: none; } -.contact-entry-photo img, .profile-match-photo img, #photo-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo, .group-selected, .nets-selected, .fileas-selected, .categories-selected { - border-radius: 5px; - -moz-border-radius: 5px; - box-shadow: 4px 4px 3px 0 #444444; +.profile-match-photo img, #photo-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo { + border-radius: $radiuspx; + -moz-border-radius: $radiuspx; + box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444; } -#profile-jot-submit { - height: auto; - background-color: #0080FF; - color: #eeeeec; - font-weight: bold; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - border: 2px outset #222420 !important; - margin: 0; - float: right; - text-shadow: 1px 1px #111; - width: auto; - box-shadow: 5px 5px 5px #444; -} - -#profile-jot-submit:active { - box-shadow: 0 0 0 0; -} - -.settings-widget .selected { - border-radius: 5px; - -moz-border-radius: 5px; - box-shadow: 4px 4px 3px 0 #444444; +.profile-match-photo img { + width: $top_photo !important; + height: $top_photo !important; } #sidebar-page-list .label { margin-left: 5px; } -/*TODO - there appears to be significant redundancy here */ - .photo { border: 1px solid #AAAAAA; } @@ -1920,176 +692,15 @@ tr.mceLast { border: 1px solid #888888; } -.rotleft1 { --webkit-transform: rotate(-1deg); --moz-transform: rotate(-1deg); --ms-transform: rotate(-1deg); --o-transform: rotate(-1deg); -} - -.rotleft2 { --webkit-transform: rotate(-2deg); --moz-transform: rotate(-2deg); --ms-transform: rotate(-2deg); --o-transform: rotate(-2deg); -} -.rotleft3 { --webkit-transform: rotate(-3deg); --moz-transform: rotate(-3deg); --ms-transform: rotate(-3deg); --o-transform: rotate(-3deg); -} - -.rotleft4 { --webkit-transform: rotate(-4deg); --moz-transform: rotate(-4deg); --ms-transform: rotate(-4deg); --o-transform: rotate(-4deg); -} - - -.rotright1 { --webkit-transform: rotate(1deg); --moz-transform: rotate(1deg); --ms-transform: rotate(1deg); --o-transform: rotate(1deg); -} - -.rotright2 { --webkit-transform: rotate(2deg); --moz-transform: rotate(2deg); --ms-transform: rotate(2deg); --o-transform: rotate(2deg); -} - -.rotright3 { --webkit-transform: rotate(3deg); --moz-transform: rotate(3deg); --ms-transform: rotate(3deg); --o-transform: rotate(3deg); -} - -.rotright4 { --webkit-transform: rotate(4deg); --moz-transform: rotate(4deg); --ms-transform: rotate(4deg); --o-transform: rotate(4deg); -} - - - -/*.photos { - height: auto; - overflow: auto; -}*/ - -.photos-end { - clear: both; - margin-bottom: 25px; -} - -.photo-album-image-wrapper { - float: left; - margin-top: 15px; - margin-right: 15px; - margin-left: 15px; -/* width: 200px; height: 200px; - overflow: hidden; - position: relative; */ -} .photo-album-image-wrapper .caption { - display: none; - width: 100%; -/* position: absolute; */ - bottom: 0px; - padding: 0.5em 0.5em 0px 0.5em; background-color: rgba(245, 245, 255, 0.8); border-bottom: 2px solid #CCC; - margin: 0px; -} -.photo-album-image-wrapper a:hover .caption { - display:block; -} - -#photo-album-end { - clear: both; - margin-bottom: 25px; } -.photo-top-image-wrapper { -/* position: relative; */ - float: left; - margin-top: 15px; - margin-right: 15px; - margin-left: 15px; - margin-bottom: 15px; -/* width: 200px; height: 200px; - overflow: hidden; */ -} .photo-top-album-name { - width: 100%; - min-height: 2em; -/* position: absolute; */ - bottom: 0px; - padding: 0px 3px; - padding-top: 0.5em; background-color: rgb(255, 255, 255); } -#photo-top-end { - clear: both; -} - -#photo-top-links { - margin-bottom: 30px; - margin-left: 30px; -} - -#photos-upload-newalbum-div { - float: left; - width: 175px; -} - -#photos-upload-noshare { - margin-bottom: 10px; -} -#photos-upload-existing-album-text { - float: left; - width: 175px; -} -#photos-upload-newalbum { - float: left; -} -#photos-upload-album-select { - float: left; -} - -#photos-upload-spacer { - margin-top: 25px; -} -#photos-upload-new-end, #photos-upload-exist-end { - clear: both; -} -#photos-upload-exist-end { - margin-bottom: 15px; -} -#photos-upload-submit { - margin-top: 15px; -} - -#photos_upload_applet_wrapper { - margin-bottom: 15px; -} - -#photos-upload-no-java-message { - margin-bottom: 15px; -} - - -#photos-upload-select-files-text { - margin-top: 15px; - margin-bottom: 15px; -} #photos-upload-perms-menu, #photos-upload-perms-menu:visited, #photos-upload-perms-menu:link { color: #8888FF; @@ -2103,295 +714,42 @@ tr.mceLast { cursor: pointer; } - -#photo-edit-caption-label, #photo-edit-tags-label, #photo-edit-albumname-label, #photo-edit-rotate-label { - float: left; - width: 150px; -} - -#photo-edit-perms-end { - margin-bottom: 15px; -} - -#photo-edit-caption, #photo-edit-newtag, #photo-edit-albumname, #photo-edit-rotate { - float: left; - margin-bottom: 25px; -} -#photo-edit-link-wrap { - margin-bottom: 15px; -} -#photo-like-div { - margin-bottom: 25px; -} - -#photo-edit-caption-end, #photo-edit-tags-end, #photo-edit-albumname-end, #photo-edit-rotate-end { - clear: both; -} - -#photo-edit-rotate-end { - margin-bottom: 15px; -} - -#photo-edit-delete-button { - margin-left: 200px; -} -#photo-edit-end { - margin-bottom: 35px; -} #photo-caption { font-size: 110%; font-weight: bold; - margin-top: 15px; - margin-bottom: 15px; } #in-this-photo-text { - color: #0000FF; - margin-left: 30px; + color: #0080FF; } -#in-this-photo { - margin-left: 60px; - margin-top: 10px; - margin-bottom: 20px; -} - -#photo-album-edit-submit, #photo-album-edit-drop { - margin-top: 15px; - margin-bottom: 15px; -} - -#photo-album-edit-drop { - margin-left: 200px; -} - - -#group-new-submit-wrapper { - margin-top: 30px; -} - -#group-edit-name-label { - float: left; - width: 175px; - margin-top: 20px; - margin-bottom: 20px; -} - -#group-edit-name { - float: left; - width: 225px; - margin-top: 20px; - margin-bottom: 20px; -} - -#group-edit-name-wrapper { +#netsearch-box { margin-bottom: 5px; } - -} - - -#group_members_select_label { - display: block; - float: left; - width: 175px; -} - -.group_members_select { - float: left; - width: 230px; - overflow: auto; -} - -#group_members_select_end { - clear: both; -} -#group-edit-name-end { - clear: both; +#search-save { + margin-left: 5px; } -#prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { - margin-bottom: 10px; +#side-follow-wrapper { margin-top: 20px; } -#prvmail-submit { - float: left; - margin-top: 10px; - margin-right: 30px; -} -#prvmail-upload-wrapper, -#prvmail-link-wrapper, -#prvmail-rotator-wrapper { - float: left; - margin-top: 10px; - margin-right: 10px; - width: 24px; -} - -#prvmail-end { - clear: both; -} - -.mail-list-sender, -.mail-list-detail { - float: left; -} -.mail-list-detail { - margin-left: 20px; -} - -.mail-list-subject { - font-size: 1.1em; - margin-top: 10px; -} -a.mail-list-link { - font-weight: normal; - display: block; - font-size: 1.3em; - padding: 4px 0; -} - - - -/* -*a.mail-list-link:hover { -* background-color: #15607B; -* color: #F5F6FB; -*} -*/ - -.mail-list-outside-wrapper-end { - clear: both; -} - -.mail-list-outside-wrapper { - margin-top: 30px; -} - -.mail-list-delete-wrapper { - float: right; - margin-right: 30px; - margin-top: 15px; -} - -.mail-list-delete-icon { - border: none; -} - -.mail-conv-sender, -.mail-conv-detail { - float: left; -} -.mail-conv-detail { - margin-left: 20px; - width: 500px; -} - -.mail-conv-subject { - font-size: 1.4em; - margin: 10px 0; -} - -.mail-conv-outside-wrapper-end { - clear: both; -} - -.mail-conv-outside-wrapper { - margin-top: 30px; -} - -.mail-conv-delete-wrapper { - float: right; - margin-right: 30px; - margin-top: 15px; -} -.mail-conv-break { - clear: both; -} - -.mail-conv-delete-icon { - border: none; -} - -.message-links ul { - list-style-type: none; - padding: 0px; -} - -.message-links li { - margin-top: 10px; - float: left; -} -.message-links a { - padding: 3px 5px; -} - -.message-links-end { - clear: both; -} - -#sidebar-group-list ul { - list-style-type: none; -} - -#sidebar-group-list .icon, #sidebar-group-list .iconspacer { - display: inline-block; - height: 12px; - width: 12px; -} - -#sidebar-group-list li { - margin-top: 10px; -} - -.nets-ul, .fileas-ul, .categories-ul { - list-style-type: none; -} - -.nets-ul li, .fileas-ul li, .categories-ul li { - margin-top: 10px; -} - -.nets-link { - margin-left: 24px; -} -.nets-all { - margin-left: 42px; +#side-peoplefind-url { + margin-top: 5px; } -.fileas-link, .categories-link { - margin-left: 24px; +#side-peoplefind-url { + font-size: 1em; } -.fileas-all, .categories-all { - margin-left: 0px; +#side-peoplefind-url::-webkit-input-placeholder { + font-family: FontAwesome; } -#search-save { - margin-left: 5px; -} -.groupsideedit { - margin-right: 10px; -} -#saved-search-ul { - list-style-type: none; -} -.savedsearchdrop, .savedsearchterm { - float: left; - margin-top: 10px; -} -.savedsearchterm { - margin-left: 10px; +#side-peoplefind-url::-moz-placeholder { + font-family: FontAwesome; } - -#side-follow-wrapper { - margin-top: 20px; -} -#side-follow-url, #side-peoplefind-url { - margin-top: 5px; -} -#side-follow-submit, #side-peoplefind-submit { +#side-peoplefind-submit { margin-top: 15px; } @@ -2399,100 +757,40 @@ a.mail-list-link { margin-top: 10px; } -aside input[type='text'] { - width: 174px; -} -.widget { +.pmenu { border-bottom: 1px solid #eec; padding: 8px; margin-top: 5px; - -moz-border-radius:5px; - -webkit-border-radius:5px; - border-radius:5px; - -} - + -moz-border-radius: $radiuspx; + -webkit-border-radius: $radiuspx; + border-radius: $radiuspx; -#profile-jot-desc { - /*float: left;*/ - width: 480px; - color: #FF0000; - margin-top: 10px; - margin-bottom: 10px; } -#character-counter { - float: right; - font-size: 120%; -} - -#character-counter.grey { - color: #888888; -} - -#character-counter.orange { - color: orange; -} -#character-counter.red { - color: red; -} - -#profile-jot-banner-end { - /* clear: both; */ -} - - - #settings-default-perms-menu { margin-top: 15px; margin-bottom: 15px; } - .group-delete-wrapper { float: right; margin-right: 50px; } -#install-dbhost-label, -#install-dbuser-label, -#install-dbpass-label, -#install-dbdata-label, -#install-tz-desc { - float: left; - width: 250px; - margin-top: 10px; - margin-bottom: 10px; - -} - -#install-dbhost, -#install-dbuser, -#install-dbpass, -#install-dbdata { - float: left; - width: 200px; - margin-left: 20px; -} - -#install-dbhost-end, -#install-dbuser-end, -#install-dbpass-end, -#install-dbdata-end, -#install-tz-end { - clear: both; -} - -#install-form select#timezone_select { - float: left; - margin-top: 18px; - margin-left: 20px; +.rconnect { + display: block; + color: #FFFFFF; + margin-top: 15px; + background-color: $nav_bg_2; + -webkit-border-radius: $radiuspx ; + -moz-border-radius: $radiuspx; + border-radius: $radiuspx; + padding: 5px; + font-weight: bold; + clear: both; } -#dfrn-request-networks { - margin-bottom: 30px; -} #pause { position: fixed; @@ -2500,11 +798,6 @@ aside input[type='text'] { right: 5px; } -.sparkle { - cursor: url('../img/lock.cur'), pointer; -/* cursor: pointer !important; */ -} - #vcard-end { clear: both; } @@ -2571,38 +864,67 @@ aside input[type='text'] { #nav-searchbar { float: right; - margin-top: 4px; + margin-top: 2px; + margin-right: 10px; } #nav-search-spinner { float: right; - margin-top: 8px; - margin-left: 5px; - margin-right: 5px; + margin: 12px 12px 0px 0px; + color: #fff; } -#nav-search-text:hover { - background-color: #FFF; +#nav-search-text:hover, +#nav-search-text:focus { + background-color: #fff; color: #000; } #nav-search-text { - border-radius: 14px; - background-color: #AAAAAA; - color: #eec; + height: 20px; + padding: 0px 5px 0px 5px; + border-radius: 10px; + border: none; + background-color: $search_background; + transition: background-color 300ms ease 0s; } -/* this doesn't seem to work */ - -#nav-search-text::-moz-placeholder { color: #444; } #nav-search-text::-webkit-input-placeholder { - color: #444 !important; + font-family: FontAwesome; +} + +#nav-search-text::-moz-placeholder { + font-family: FontAwesome; +} + +#search-text { + font-size: 1em; +} + +#search-text::-webkit-input-placeholder { + font-family: FontAwesome; +} + +#search-text::-moz-placeholder { + font-family: FontAwesome; } #nav-user-linkmenu img { - border-radius: 5px; + border-radius: $radiuspx; + margin-top: -4px; +} + +.nav-dropdown-indicator { + opacity: 0.8; + filter:alpha(opacity=80); } +.nav-dropdown-indicator:hover { + opacity: 1.0; + filter:alpha(opacity=100); +} + + .location-label, .gender-label, .marital-label, .homepage-label { float: left; text-align: right; @@ -2625,12 +947,10 @@ aside input[type='text'] { clear: both; } -.cc-license { - margin-top: 50px; - font-size: 70%; +.descriptive-text { + color: #888; } - #plugin-settings-link, #account-settings-link { margin-bottom: 10px; } @@ -2777,19 +1097,6 @@ aside input[type='text'] { margin-top: 20px; } -#photo-prev-link, #photo-next-link { - padding: 10px; - float: left; -} - -#photo-photo { - float: left; -} - -#photo-photo-end { - clear: both; -} - .profile-match-photo { float: left; text-align: center; @@ -2797,10 +1104,14 @@ aside input[type='text'] { } .profile-match-name { - float: left; text-align: center; width: 120px; - overflow: hidden; + height: 18px; + overflow: hidden !important; +} + +.profile-match-note { + text-align: center; } .profile-match-break, @@ -2900,33 +1211,6 @@ aside input[type='text'] { margin-top: 15px; } -#crepair-name-label, -#crepair-nick-label, -#crepair-attag-label, -#crepair-url-label, -#crepair-request-label, -#crepair-confirm-label, -#crepair-notify-label, -#crepair-photo-label, -#crepair-poll-label { - float: left; - width: 200px; - margin-bottom: 15px; -} - -#crepair-name, -#crepair-nick, -#crepair-attag, -#crepair-url, -#crepair-request, -#crepair-confirm, -#crepair-notify, -#crepair-photo, -#crepair-poll { - float: left; - width: 300px; -} - #netsearch-box { margin-top: 20px; @@ -2964,29 +1248,6 @@ aside input[type='text'] { margin-top: 10px; } -.body-tag, .filesavetags, .categorytags { - opacity: 0.5; - filter:alpha(opacity=50); -} - -.body-tag:hover, .filesavetags:hover, .categorytags:hover { - opacity: 1.0 !important; - filter:alpha(opacity=100) !important; -} - -.item-select { - opacity: 0.1; - filter:alpha(opacity=10); - float: right; - margin-right: 10px; - -} -.item-select:hover, .checkeditem { - opacity: 1; - filter:alpha(opacity=100); -} - - #item-delete-selected { margin-top: 30px; } @@ -3051,7 +1312,7 @@ brain is weird like that */ .field label { float: left; - width: 200px; + width: 350px; } .field input, @@ -3061,38 +1322,11 @@ brain is weird like that */ .field textarea { height: 100px; } .field_help { display: block; - margin-left: 200px; + margin-left: 350px; color: #666666; } -.field_abook_help { - color: #888; -} -.abook-them { - margin-left: 225px; - margin-bottom: 15px; -} -.abook-me { - margin-left: 36px; - margin-bottom: 15px; -} -.acheckbox { - margin-bottom: 5px !important; -} - -#contact-slider { - width: 600px !important; -} - -.abook-edit-them, .abook-edit-me { - float: left; - width: 100px !important; -} -.field_abook_help { - float: left; -} - .field .onoff { float: left; width: 80px; @@ -3128,69 +1362,6 @@ brain is weird like that */ .field.radio .field_help { margin-left: 0px; } - - -/** - * ADMIN - */ -#pending-update { - float:right; - color: #ffffff; - font-weight: bold; - background-color: #FF0000; - padding: 0em 0.3em; - -} -#adminpage dl { - clear: left; - margin-bottom: 2px; - padding-bottom: 2px; - border-bottom: 1px solid black; -} -#adminpage dt { - width: 200px; - float: left; - font-weight: bold; -} -#adminpage dd { - margin-left: 200px; -} - -#adminpage h3 { - border-bottom: 1px solid #cccccc; -} -#adminpage .field label { - font-weight: bold; -} -#adminpage .submit { - clear:left; - text-align: right; -} - -#adminpage #pluginslist { - margin: 0px; padding: 0px; -} -#adminpage .plugin { - list-style: none; - display: block; - border: 1px solid #888888; - padding: 1em; - margin-bottom: 5px; - clear: left; -} -#adminpage .plugin .desc { margin-left: 2.5em;} -#adminpage .toggleplugin { - float:left; - margin-right: 1em; -} - -#adminpage table {width:100%; border-bottom: 1px solid #000000; margin: 5px 0px;} -#adminpage table th { text-align: left;} -#adminpage td .icon { float: left;} -#adminpage table#users img { width: 16px; height: 16px; } -#adminpage table tr:hover { background-color: #bbc7d7; } -#adminpage .selectall { text-align: right; } - /* * UPDATE @@ -3236,6 +1407,10 @@ brain is weird like that */ width: 48px; height: 48px; margin: 10px; } +.oauthapp .icon { + margin-right: 20px; +} + .oauthapp img.noicon { background-image: url("../../../../images/icons/48/plugin.png"); background-position: center center; @@ -3250,6 +1425,11 @@ brain is weird like that */ */ .iconspacer { display: block; width: 16px; height: 16px; +/* visibility: hidden; */ +} + +.iconspacer:hover { +/* visibility: visible; */ } .icon { @@ -3261,6 +1441,7 @@ brain is weird like that */ .block { background-position: -32px 0px;} .drop { background-position: -48px 0px;} .drophide { background-position: -64px 0px;} +.delete { background-position: -64px 0px;} .edit { background-position: -80px 0px;} .camera { background-position: -96px 0px;} .dislike { background-position: -112px 0px;} @@ -3290,108 +1471,21 @@ brain is weird like that */ .on { background-position: -144px -32px; } .off { background-position: 0px -48px; } -.starred { background-position: -16px -48px; } -.unstarred { background-position: -32px -48px; } .tagged { background-position: -48px -48px; } .yellow { background-position: -64px -48px; } - -.filer-icon { - display: block; width: 16px; height: 16px; - background-image: url('../img/file.gif'); +.starred { + color: gold; } .icon.dim { opacity: 0.3;filter:alpha(opacity=30); } -[class^="comment-edit-bb"] { - list-style: none; - display: none; - margin: 0px 0 -5px 0px; - padding: 0px; - width: 75%; -} -[class^="comment-edit-bb"] > li { - display: inline-block; - margin: 10px 10px 0 0; - visibility: none; -} -[class^="comment-edit-bb-end"] { - clear: both; -} -.editicon { - display: inline-block; - width: 16px; - height: 16px; - background-image: url(../img/bbedit.png); - background-color: #fff; - text-decoration: none; -} -.editicon:hover { - background-color: #ccc; -} -.boldbb { - background-position: 0px 0px; -} -.boldbb:hover { - background-position: 0px -16px; -} -.italicbb { - background-position: -16px 0px; -} -.italicbb:hover { - background-position: -16px -16px; -} -.underlinebb { - background-position: -32px 0px; -} -.underlinebb:hover { - background-position: -32px -16px; -} -.quotebb { - background-position: -48px 0px; -} -.quotebb:hover { - background-position: -48px -16px; -} -.codebb { - background-position: -64px 0px; -} -.codebb:hover { - background-position: -64px -16px; -} -.imagebb { - background-position: -80px 0px; -} -.imagebb:hover { - background-position: -80px -16px; -} -.urlbb { - background-position: -96px 0px; -} -.urlbb:hover { - background-position: -96px -16px; -} -.videobb { - background-position: -112px 0px; -} -.videobb:hover { - background-position: -112px -16px; -} -.attachtype { - display: block; width: 20px; height: 23px; - float: left; - background-image: url('../../../../images/content-types.png'); -} + .body-attach { margin-top: 10px; } -.type-video { background-position: 0px 0px; } -.type-image { background-position: -20px 0px; } -.type-audio { background-position: -40px 0px; } -.type-text { background-position: -60px 0px; } -.type-unkn { background-position: -80px 0px; } /* autocomplete popup */ @@ -3406,6 +1500,9 @@ brain is weird like that */ background-color:#ffffff; padding: 4px; clear:left; } +.acpopupitem.taggable { + background-color: #ddddff; +} .acpopupitem img { float: left; margin-right: 4px; @@ -3430,29 +1527,6 @@ div.jGrowl div.info { top: 15px; right: 15px; } -.qcomment { - border: 1px solid #EEE; - padding: 3px; - margin-top: 15px; - margin-left: 25px; - width: 125px; - overflow-y: auto; -} - - -.qcomment option { - width: 125px; - overflow-x: hidden; -} - -.qcomment { - opacity: 0.3; - filter:alpha(opacity=30); -} -.qcomment:hover { - opacity: 1.0; - filter:alpha(opacity=100); -} #id_term_label { @@ -3462,108 +1536,79 @@ div.jGrowl div.info { width:100px; } -#recip { - +#nav-search-text-ac .autocomplete { + position: fixed; + top: 24px; + border: 1px solid $nav_bg_1; + border-top: none; } -.autocomplete-w1 { background: #ffffff; no-repeat bottom right; position:absolute; top:0px; left:0px; margin:6px 0 0 6px; /* IE6 fix: */ _background:none; _margin:1px 0 0 0; } -.autocomplete { color:#000; border:1px solid #999; background:#FFF; cursor:default; text-align:left; max-height:350px; overflow:auto; margin:-6px 6px 6px -6px; /* IE6 specific: */ _height:350px; _margin:0; _overflow-x:hidden; } -.autocomplete .selected { background:#F0F0F0; } -.autocomplete div { padding:2px 5px; white-space:nowrap; overflow:hidden; } -#datebrowse-sidebar select { - margin-left: 25px; +#search-text-ac .autocomplete, +#recip-ac .autocomplete, +#poke-recip-ac .autocomplete, +#id-name-ac .autocomplete, +#contact-search-ac .autocomplete { + margin-top: 2px; + margin-left: $radiuspx; + border: 1px solid #666; + border-top: none; + } +.autocomplete { + color: $font_colour; + background: #FFF; + cursor: pointer; + text-align: left; + max-height: 350px; + overflow: auto; + border-bottom-left-radius: $radiuspx; + border-bottom-right-radius: $radiuspx; +} +.autocomplete .selected { + background: $search_background; +} + +.autocomplete div { + padding: 2px 5px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} .jslider .jslider-scale ins { color: #333; - font-size: 12px; + font-size: $body_font_size; width: 100px; text-align: center; } - -.slider { - margin-top: 10px; - margin-bottom: 30px; -} - - -#main-slider { - position: relative; - left: 5%; - width: 90%; -} - - #contact-slider { position: relative; left: 5%; width: 90%; } -/* nav */ -nav { - width: 100%; - height: 32px; - position: fixed; -// opacity: 0.6; -// filter:alpha(opacity=60); - - left: 0px; - top: 0px; - padding: 0px; - background-color: #d00; - color: #eec; - z-index: 100; - -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); - -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); - box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); - -/* TODO find a better way to do this without different code for every single browser. */ - - background-image: linear-gradient(bottom, #f88 26%, #b00 82%); - background-image: -o-linear-gradient(bottom, #f88 26%, #b00 82%); - background-image: -moz-linear-gradient(bottom, #f88 26%, #b00 82%); - background-image: -webkit-linear-gradient(bottom, #f88 26%, #b00 82%); - background-image: -ms-linear-gradient(bottom, #f88 26%, #b00 82%); - - background-image: -webkit-gradient( -linear, -left bottom, -left top, -color-stop(0.26, #f88), -color-stop(0.82, #b00) -); -} - -nav:hover { - - background-image: linear-gradient(bottom, #f00 26%, #b00 82%); - background-image: -o-linear-gradient(bottom, #f00 26%, #b00 82%); - background-image: -moz-linear-gradient(bottom, #f00 26%, #b00 82%); - background-image: -webkit-linear-gradient(bottom, #f00 26%, #b00 82%); - background-image: -ms-linear-gradient(bottom, #f00 26%, #b00 82%); - - background-image: -webkit-gradient( -linear, -left bottom, -left top, -color-stop(0.26, #f00), -color-stop(0.82, #b00) -); -} - +a.rconnect, nav a, nav a:active, nav a:visited, -nav a:link, -nav a:hover { +nav a:link { + color: #ffffff; + text-decoration: none; + outline: none; +} + +a.rconnect:hover, nav a:hover { + color: #0080FF; +} +nav .fakelink { color: #ffffff; text-decoration: none; outline: none; } +nav .fakelink:hover { text-decoration: none; } #profiles-menu li a { color: #ffffff; @@ -3588,16 +1633,21 @@ nav ul li .menu-popup { right: auto; top: 33px; } + +#nav-user-linkmenu { + margin-left: 5px; +} + nav .nav-menu-icon { position: relative; height: 22px; padding: 5px; - margin: 3px 10px; - -moz-border-radius: 5px 5px 0 0; - -webkit-border-radius: 5px 5px 0 0; - border-radius: 5px 5px 0 0; +/* margin: 3px 10px; */ + -moz-border-radius: $radiuspx; + -webkit-border-radius: $radiuspx; + border-radius: $radiuspx; } -nav .nav-menu-icon.selected { +nav .nav-menu-icon.active { background-color: #FF0000; } nav .nav-menu-icon img { @@ -3611,26 +1661,33 @@ nav .nav-menu { position: relative; height: 16px; padding: 5px; - margin: 3px 15px 0px; - font-size: 14px; - border-bottom: 3px solid #f88; + margin: 0px 5px 0px; + font-size: 1.0em; +/* border-bottom: 3px solid #f88; */ } nav:hover .nav-menu { - border-bottom: 3px solid #f00; +/* border-bottom: 3px solid #f00; */ } -nav .nav-menu.selected { - border-bottom: 4px solid #CCCCCC; +nav .nav-menu.active i { + color: $active_colour; } nav .nav-notify { background-color: #0080FF; color: #fff; - -moz-border-radius: 5px 5px 5px 5px; - -webkit-border-radius: 5px 5px 5px 5px; - border-radius: 5px 5px 5px 5px; + -moz-border-radius: $radiuspx; + -webkit-border-radius: $radiuspx; + border-radius: $radiuspx; +/* opacity: 0.6; + filter:alpha(opacity=60); */ + +} +.nav-notify:hover, nav .nav-notify.active span { + color: #ffffff; } + nav .nav-notify.show { display: block; } @@ -3638,9 +1695,7 @@ nav #nav-help-link, nav #nav-login-link, nav #nav-search-link, nav #nav-directory-link, -nav #nav-apps-link, -nav #nav-user-linkmenu, -nav #nav-site-linkmenu { +nav #nav-apps-link { float: right; } nav #nav-help-link .menu-popup, @@ -3652,10 +1707,10 @@ nav #nav-site-linkmenu .menu-popup { left: auto; } nav #nav-notifications-linkmenu.on .icon.s22.notify, -nav #nav-notifications-linkmenu.selected .icon.s22.notify { +nav #nav-notifications-linkmenu.active .icon.s22.notify { background-image: url("../../../../images/icons/22/notify_on.png"); } -nav #nav-apps-link.selected { +nav #nav-apps-link.active { background-color: #364e59; } ul.menu-popup { @@ -3674,7 +1729,7 @@ ul.menu-popup { } ul.menu-popup a { display: block; - color: #; + color: #FFFFFF; padding: 5px 10px; text-decoration: none; } @@ -3682,7 +1737,7 @@ ul.menu-popup a { ul.menu-popup a:hover { background-color: #888888; - color: #000000; + color: #FFFFFF; } ul.menu-popup .menu-sep { border-top: 1px solid #9eabb0; @@ -3737,7 +1792,7 @@ header { font-size: 10px; padding: 1px 3px; top: 0px; - right: -10px; + right: -5px; min-width: 15px; text-align: right; } @@ -3767,9 +1822,9 @@ ul.menu-popup { max-height: 400px; overflow-y: scroll;overflow-style:scrollbar; background-color:#FFFFFF; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; - border-radius:5px; + -moz-border-radius: $radiuspx; + -webkit-border-radius: $radiuspx; + border-radius: $radiuspx; border: 1px solid #888; } #nav-notifications-menu .contactname { font-weight: bold; font-size: 0.9em; } @@ -3808,20 +1863,19 @@ ul.menu-popup { } #page-spinner { - margin-left: 50%; + color: #777; + margin: 24px; } .tabs-end { clear: both; } - - - #acl-wrapper { width: 690px; float:left; } + #acl-search { float:right; background: #ffffff url("../../../../images/search_18.png") no-repeat right center; @@ -3837,9 +1891,9 @@ ul.menu-popup { background-position: 7px 7px; background-repeat: no-repeat; padding: 7px 5px 0px 30px; - -webkit-border-radius: 5px ; - -moz-border-radius: 5px; - border-radius: 5px; + -webkit-border-radius: $radiuspx; + -moz-border-radius: $radiuspx; + border-radius: $radiuspx; color: #999999; } #acl-showall.selected { @@ -3872,6 +1926,10 @@ ul.menu-popup { float: left; margin: 4px; } +.acl-list-item.taggable { + background-color: #ddddff; +} + .acl-list-item p { height: 12px; font-size: 10px; margin: 0px; padding: 2px 0px 1px; overflow: hidden;} .acl-list-item a { font-size: 8px; @@ -3911,4 +1969,479 @@ ul.menu-popup { .contact-block-content { margin-top: 8px; +} + +.profile-match-connect { margin-top: 5px; } + +.reshared-content { margin-left: 30px; } +.shared_header img { margin-right: 10px; } + +.tag1 { + font-size : 1.0em !important; + } +.tag2 { + font-size : 1.2em !important; + } + + +.tag3 { + font-size : 1.4em !important; + } + + +.tag4 { + font-size : 1.6em !important; + } + + +.tag5 { + font-size : 1.8em !important; + } + + +.tag6 { + font-size : 2.0em !important; + } + + +.tag7 { + font-size : 2.2em !important; + } + + +.tag8 { + font-size : 2.4em !important; + } + + +.tag9 { + font-size : 2.6em !important; + } + + +.tag10 { + font-size : 2.8em !important; + } + +.profile-thing-list { + list-style-type: none; +} +/* +.profile-thing-list li { + float: left; + margin-right: 25px; +} +*/ + + +div#pagelist-content-wrapper { +width: 80%; +background: #fff; +margin-left: auto; +margin-right: auto; +} + +div.page-list-item { +margin: 20px; +} + +div#write-pages { +display: block; +position: fixed; +top: 24px; +z-index: 99; +background: silver; +width: 100%; +} + +div#write-pages a { +color: #000; +margin-right: 50px; +} + +.pmenu ul { + list-style-type: none; +} + +.pmenu li { + margin-left: -20px; +} + +.admin-icons { + font-size: 1.2em; + color: $toolicon_colour; +} + +.nav-icon { + font-size: 1.4em; + margin-right: 15px; +} + +a .drop-icons { + color: $toolicon_colour;; + font-size: 1.2em; + text-decoration: none; +} + +a .drop-icons:hover { + color: #FF0000; +} + +.permission-inherited { + float: left; + margin-right: 10px; + color: #FF0000; +} + +.attachlink { + float: left; + border: 1px solid black; + padding: 5px; + margin-right: 8px; +} + +.attach-icons { + font-size: 1.4em; +} + +.attach-clip { + margin-right: 3px; + font-size: 1.8em; +} + +.item-category { + margin-right: 10px; +} + +.design-tools ul { + list-style-type: none; +} + +.design-icons { + margin-right: 10px; +} + +.design-icons:hover { +text-decoration: none; +} + +#menulist { + list-style-type: none; +} + +.admin-icons { + color: $toolicon_colour; + margin-right: 10px; +} + +/* message */ + +img.mail-list-sender-photo { + -moz-border-radius: $radiuspx; + border-radius: $radiuspx; +} + +/* jot */ + +#jot-title, +#jot-category, +#jot-pagetitle { + font-weight: bold; + border: solid 1px #ffffff; + border-radius: $radiuspx; +} + +#jot-category::-webkit-input-placeholder { + font-weight: bold; +} + +#jot-category:-moz-placeholder { + font-weight: bold; +} + +#jot-title::-webkit-input-placeholder { + font-weight: bold; +} + +#jot-title:-moz-placeholder { + font-weight: bold; +} + +#jot-pagetitle::-webkit-input-placeholder { + font-weight: bold; +} + +#jot-pagetitle:-moz-placeholder { + font-weight: bold; +} + +#jot-title:hover, +#jot-title:focus, +#jot-pagetitle:hover, +#jot-pagetitle:focus, +#jot-category:hover, +#jot-category:focus { + border: 1px solid #cccccc; +} + +#profile-jot-text { + color:#000; + border: 1px solid #cccccc; + -moz-border-radius: $radiuspx; + border-radius: $radiuspx; +} + +#profile-jot-text::-webkit-input-placeholder { + font-size:1.5em; +} + +#profile-jot-text::-moz-placeholder { + font-size:1.5em; +} + +#profile-jot-text:focus::-webkit-input-placeholder { + color: transparent; +} + +#profile-jot-text:focus::-moz-placeholder { + color: transparent; +} + +#profile-jot-text-loading { + color: #777; +} + +#profile-jot-submit { + background: linear-gradient(top, #0080ff 0%, #0080aa); + background: -webkit-linear-gradient(top, #0080ff 0%, #0080aa); + background: -moz-linear-gradient(top, #0080ff 0%, #0080aa); + background: -o-linear-gradient(top, #0080ff 0%, #0080aa); + background: -ms-linear-gradient(top, #0080ff 0%, #0080aa); + color: #fff; + font-weight: bold; + border-radius: 0px $radiuspx $radiuspx 0px; + text-shadow: 1px 1px #111; + cursor: pointer; +} + +#profile-jot-submit:hover { + background: linear-gradient(top, #0080aa 0%, #0080ff); + background: -webkit-linear-gradient(top, #0080aa 0%, #0080ff); + background: -moz-linear-gradient(top, #0080aa 0%, #0080ff); + background: -o-linear-gradient(top, #0080aa 0%, #0080ff); + background: -ms-linear-gradient(top, #0080aa 0%, #0080ff); +} + +#profile-jot-perms { + background-color: $toolicon_colour; + border: 1px solid #666; + border-right: none; + border-radius: $radiuspx 0px 0px $radiuspx; +} + +#profile-rotator { + color: #777; +} + +.jot-icons { + font-size: 1.2em; + color: $toolicon_colour; +} + +.jot-icons:hover { + color: $toolicon_activecolour; +} + +/* conversation */ + +.thread-wrapper .wall-item-comment-wrapper, +.wall-item-content-wrapper.comment { + margin-left: $comment_indent; + border-left: 2px solid #eee; +} + +.thread-wrapper.toplevel_item { + max-width: $converse_width; +} + +.wall-item-content-wrapper { + border-radius: $radiuspx; + background-color: $item_colour; + opacity: $item_opacity; +} + +.wallwall .wwto { + top: $wwtop; +} + +.wall-item-photo-menu-button { + background-image: url("../img/photo-menu.jpg"); + background-position: top left; + background-repeat: no-repeat; + top: $pmenu_top; +} + +.wall-item-photo-menu { + border: 2px solid #444444; + background: #FFFFFF; + top: $top_photo; +} + +.wall-item-photo-menu ul { + list-style: none +} + +.wall-item-photo-menu li a:hover { + color: #FFFFFF; + background: #3465A4; + text-decoration: none; +} + +.comment .wall-item-photo-menu-button { + top: $pmenu_reply; +} + +.comment .wall-item-photo-menu { + top: $reply_photo; +} + +.wall-item-photo { + border: none; + width: $top_photo !important; + height: $top_photo !important; + +} + +.comment .wall-item-photo { + width: $reply_photo !important; + height: $reply_photo !important; +} + +.wall-item-photo { + border-radius: $radiuspx; + -moz-border-radius: $radiuspx; + box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444; +} + +.wall-item-arrowphoto-wrapper { + top: $wwtop; +} + +.wall-item-lock { + font-size: 1.2em; + color: $toolicon_colour; +} + +.wall-item-ago .icon-ok { + color: darkgreen; +} + + +.wall-item-ago { + color: #777; + font-size: 0.8em; +} + +.wall-item-ago i { + font-size: 0.6em; +} + +.wall-item-content { + font-size: $font_size; +} + +.item-tool { + font-size: 1.2em; + color: $toolicon_colour; +} + +.item-tool:hover { + color: $toolicon_activecolour; +} + +.like-rotator { + color: $toolicon_colour; +} + +.my-comment-photo { + border-radius: $radiuspx; + -moz-border-radius: $radiuspx; + box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444; +} + +.comment-edit-photo img { + width: $reply_photo; +} + +[class^="comment-edit-bb"] { + list-style: none; +} + +.comment-icon { + font-size: 1.2em; + color: $toolicon_colour; +} + +.comment-icon:hover { + color: $toolicon_activecolour; +} + +.comment-edit-text-empty, +.comment-edit-text-full { + border: 1px solid #ccc; + border-radius: $radiuspx; +} + +.comment-edit-text-empty { + color: gray; +} + +.comment-edit-text-full { + color: black; +} + +/* widgets */ + +.widget { + border-bottom: 1px solid #eec; + -moz-border-radius: $radiuspx; + -webkit-border-radius: $radiuspx; + border-radius: $radiuspx; +} + +#note-text { + border: 1px solid #ccc; + border-radius: $radiuspx; + -moz-border-radius: $radiuspx; +} + +#saved-search-ul { + list-style-type: none; +} + +.fileas-ul { + list-style-type: none; +} + +#datebrowse-sidebar select { + border: 1px solid #ccc; + border-radius: $radiuspx; + -moz-border-radius: $radiuspx; +} + +.categories-ul { + list-style-type: none; +} + +#sidebar-group-list ul { + list-style-type: none; +} + +.profile-thing-list img, .thing-show img, .thing-edit-links a { + margin-top: 8px; + margin-right: 15px; +} + +.abook-self { + background-color: #ffdddd; }
\ No newline at end of file diff --git a/view/theme/redbasic/img/bg.png b/view/theme/redbasic/img/bg.png Binary files differdeleted file mode 100644 index eae49e037..000000000 --- a/view/theme/redbasic/img/bg.png +++ /dev/null diff --git a/view/theme/redbasic/img/events.png b/view/theme/redbasic/img/events.png Binary files differdeleted file mode 100644 index 96dd86899..000000000 --- a/view/theme/redbasic/img/events.png +++ /dev/null diff --git a/view/theme/redbasic/img/head.jpg b/view/theme/redbasic/img/head.jpg Binary files differdeleted file mode 100644 index 6210b76be..000000000 --- a/view/theme/redbasic/img/head.jpg +++ /dev/null diff --git a/view/theme/redbasic/img/home.png b/view/theme/redbasic/img/home.png Binary files differdeleted file mode 100644 index d1ba7b3f3..000000000 --- a/view/theme/redbasic/img/home.png +++ /dev/null diff --git a/view/theme/redbasic/img/introductions.png b/view/theme/redbasic/img/introductions.png Binary files differdeleted file mode 100644 index 9e0498227..000000000 --- a/view/theme/redbasic/img/introductions.png +++ /dev/null diff --git a/view/theme/redbasic/img/lock.cur b/view/theme/redbasic/img/lock.cur Binary files differdeleted file mode 100644 index 892c5e851..000000000 --- a/view/theme/redbasic/img/lock.cur +++ /dev/null diff --git a/view/theme/redbasic/img/message.png b/view/theme/redbasic/img/message.png Binary files differdeleted file mode 100644 index f3fea75ee..000000000 --- a/view/theme/redbasic/img/message.png +++ /dev/null diff --git a/view/theme/redbasic/img/network.png b/view/theme/redbasic/img/network.png Binary files differdeleted file mode 100644 index f3e45c3ec..000000000 --- a/view/theme/redbasic/img/network.png +++ /dev/null diff --git a/view/theme/redbasic/img/screenshot.jpg b/view/theme/redbasic/img/screenshot.jpg Binary files differindex 5f00ec39e..51d4cbb0d 100644 --- a/view/theme/redbasic/img/screenshot.jpg +++ b/view/theme/redbasic/img/screenshot.jpg diff --git a/view/theme/redbasic/img/settings.png b/view/theme/redbasic/img/settings.png Binary files differdeleted file mode 100644 index a935b225e..000000000 --- a/view/theme/redbasic/img/settings.png +++ /dev/null diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 00b8fa39f..e41fde2b8 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -1,35 +1,5 @@ -function insertFormatting(comment,BBcode,id) { - - var tmpStr = $("#comment-edit-text-" + id).val(); - if(tmpStr == comment) { - tmpStr = ""; - $("#comment-edit-text-" + id).addClass("comment-edit-text-full"); - $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); - openMenu("comment-edit-submit-wrapper-" + id); - $("#comment-edit-text-" + id).val(tmpStr); - } - - textarea = document.getElementById("comment-edit-text-" +id); - if (document.selection) { - textarea.focus(); - selected = document.selection.createRange(); - if (BBcode == "url"){ - selected.text = "["+BBcode+"]" + "http://" + selected.text + "[/"+BBcode+"]"; - } else - selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]"; - } else if (textarea.selectionStart || textarea.selectionStart == "0") { - var start = textarea.selectionStart; - var end = textarea.selectionEnd; - if (BBcode == "url"){ - textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length); - } else - textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length); - } - return true; -} - function cmtBbOpen(comment, id) { if($(comment).hasClass('comment-edit-text-full')) { $(".comment-edit-bb-" + id).show(); @@ -46,44 +16,50 @@ function cmtBbClose(comment, id) { return false; } +//document.jotpermslock = 'icon-lock'; +//document.jotpermsunlock = 'icon-unlock'; + + $(document).ready(function() { $('.group-edit-icon').hover( function() { - $(this).addClass('icon'); $(this).removeClass('iconspacer');}, + $(this).css('opacity','1.0');}, function() { - $(this).removeClass('icon'); $(this).addClass('iconspacer');} - ); + $(this).css('opacity','0');} +); $('.sidebar-group-element').hover( function() { id = $(this).attr('id'); - $('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');}, + $('#edit-' + id).css('opacity','1.0');}, function() { id = $(this).attr('id'); - $('#edit-' + id).removeClass('icon');$('#edit-' + id).addClass('iconspacer');} + $('#edit-' + id).css('opacity','0');} ); $('.savedsearchdrop').hover( function() { - $(this).addClass('drop'); $(this).addClass('icon'); $(this).removeClass('iconspacer');}, - function() { - $(this).removeClass('drop'); $(this).removeClass('icon'); $(this).addClass('iconspacer');} - ); - -$('.savedsearchterm').hover( - function() { - id = $(this).attr('id'); - $('#drop-' + id).addClass('icon'); $('#drop-' + id).addClass('drophide'); $('#drop-' + id).removeClass('iconspacer');}, - + $(this).css('opacity','1.0');}, function() { - id = $(this).attr('id'); - $('#drop-' + id).removeClass('icon');$('#drop-' + id).removeClass('drophide'); $('#drop-' + id).addClass('iconspacer');} + $(this).css('opacity','0');} ); }); - +$(document).ready(function(){ + var doctitle = document.title; + function checkNotify() { + var notifyUpdateElem = document.getElementById('notify-update'); + if(notifyUpdateElem !== null) { + if(notifyUpdateElem.innerHTML != "") + document.title = "("+notifyUpdateElem.innerHTML+") " + doctitle; + else + document.title = doctitle; + } + }; + setInterval(function () {checkNotify();}, 10 * 1000); +}); diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index ad5df57ce..20355197f 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -1,80 +1,111 @@ <?php -/** - * Theme settings - */ function theme_content(&$a) { - if(!local_user()) { return; } + if(!local_user()) { return;} - $font_size = get_pconfig(local_user(),'redbasic', 'font_size' ); - $line_height = get_pconfig(local_user(), 'redbasic', 'line_height' ); - $colour = get_pconfig(local_user(), 'redbasic', 'colour' ); - - return redbasic_form($a, $font_size, $line_height, $colour); + $arr = array(); + + $arr['schema'] = get_pconfig(local_user(),'redbasic', 'schema' ); + $arr['nav_colour'] = get_pconfig(local_user(),'redbasic', 'nav_colour' ); + $arr['banner_colour'] = get_pconfig(local_user(),'redbasic', 'banner_colour' ); + $arr['bgcolour'] = get_pconfig(local_user(),'redbasic', 'background_colour' ); + $arr['background_image'] = get_pconfig(local_user(),'redbasic', 'background_image' ); + $arr['item_colour'] = get_pconfig(local_user(),'redbasic', 'item_colour' ); + $arr['item_opacity'] = get_pconfig(local_user(),'redbasic', 'item_opacity' ); + $arr['toolicon_colour'] = get_pconfig(local_user(),'redbasic','toolicon_colour'); + $arr['toolicon_activecolour'] = get_pconfig(local_user(),'redbasic','toolicon_activecolour'); + $arr['font_size'] = get_pconfig(local_user(),'redbasic', 'font_size' ); + $arr['body_font_size'] = get_pconfig(local_user(),'redbasic', 'body_font_size' ); + $arr['font_colour'] = get_pconfig(local_user(),'redbasic', 'font_colour' ); + $arr['radius'] = get_pconfig(local_user(),'redbasic', 'radius' ); + $arr['shadow'] = get_pconfig(local_user(),'redbasic', 'photo_shadow' ); + $arr['converse_width']=get_pconfig(local_user(),"redbasic","converse_width"); + $arr['nav_min_opacity']=get_pconfig(local_user(),"redbasic","nav_min_opacity"); + $arr['top_photo']=get_pconfig(local_user(),"redbasic","top_photo"); + $arr['reply_photo']=get_pconfig(local_user(),"redbasic","reply_photo"); + $arr['sloppy_photos']=get_pconfig(local_user(),"redbasic","sloppy_photos"); + return redbasic_form($a, $arr); } function theme_post(&$a) { - if(!local_user()) { return; } - + if(!local_user()) { return;} + if (isset($_POST['redbasic-settings-submit'])) { + set_pconfig(local_user(), 'redbasic', 'schema', $_POST['redbasic_schema']); + set_pconfig(local_user(), 'redbasic', 'nav_colour', $_POST['redbasic_nav_colour']); + set_pconfig(local_user(), 'redbasic', 'background_colour', $_POST['redbasic_background_colour']); + set_pconfig(local_user(), 'redbasic', 'banner_colour', $_POST['redbasic_banner_colour']); + set_pconfig(local_user(), 'redbasic', 'background_image', $_POST['redbasic_background_image']); + set_pconfig(local_user(), 'redbasic', 'item_colour', $_POST['redbasic_item_colour']); + set_pconfig(local_user(), 'redbasic', 'item_opacity', $_POST['redbasic_item_opacity']); + set_pconfig(local_user(), 'redbasic', 'toolicon_colour', $_POST['redbasic_toolicon_colour']); + set_pconfig(local_user(), 'redbasic', 'toolicon_activecolour', $_POST['redbasic_toolicon_activecolour']); set_pconfig(local_user(), 'redbasic', 'font_size', $_POST['redbasic_font_size']); - set_pconfig(local_user(), 'redbasic', 'line_height', $_POST['redbasic_line_height']); - set_pconfig(local_user(), 'redbasic', 'colour', $_POST['redbasic_colour']); + set_pconfig(local_user(), 'redbasic', 'body_font_size', $_POST['redbasic_body_font_size']); + set_pconfig(local_user(), 'redbasic', 'font_colour', $_POST['redbasic_font_colour']); + set_pconfig(local_user(), 'redbasic', 'radius', $_POST['redbasic_radius']); + set_pconfig(local_user(), 'redbasic', 'photo_shadow', $_POST['redbasic_shadow']); + set_pconfig(local_user(), 'redbasic', 'converse_width', $_POST['redbasic_converse_width']); + set_pconfig(local_user(), 'redbasic', 'nav_min_opacity', $_POST['redbasic_nav_min_opacity']); + set_pconfig(local_user(), 'redbasic', 'top_photo', $_POST['redbasic_top_photo']); + set_pconfig(local_user(), 'redbasic', 'reply_photo', $_POST['redbasic_reply_photo']); + set_pconfig(local_user(), 'redbasic', 'sloppy_photos', $_POST['redbasic_sloppy_photos']); } } -function theme_admin(&$a) { - $font_size = get_config('redbasic', 'font_size' ); - $line_height = get_config('redbasic', 'line_height' ); - $colour = get_config('redbasic', 'colour' ); - - return redbasic_form($a, $font_size, $line_height, $colour); -} -function theme_admin_post(&$a) { - if (isset($_POST['redbasic-settings-submit'])) { - set_config('redbasic', 'font_size', $_POST['redbasic_font_size']); - set_config('redbasic', 'line_height', $_POST['redbasic_line_height']); - set_config('redbasic', 'colour', $_POST['redbasic_colour']); - } -} -function redbasic_form(&$a, $font_size, $line_height, $colour) { - $line_heights = array( - "1.3" => "1.3", - "---" => "---", - "1.6" => "1.6", - "1.5" => "1.5", - "1.4" => "1.4", - "1.2" => "1.2", - "1.1" => "1.1", - ); - $font_sizes = array( - '12' => '12', - '14' => '14', - "---" => "---", - "16" => "16", - "15" => "15", - '13.5' => '13.5', - '13' => '13', - '12.5' => '12.5', - '12' => '12', - ); - $colours = array( - 'light' => 'light', - 'dark' => 'dark', - ); +function redbasic_form(&$a, $arr) { + - $t = get_markup_template('theme_settings.tpl'); - $o .= replace_macros($t, array( + $scheme_choices = array(); + $scheme_choices["---"] = t("Default"); + $files = glob('view/theme/redbasic/schema/*.php'); + if($files) { + foreach($files as $file) { + $f = basename($file, ".php"); + $scheme_name = $f; + $scheme_choices[$f] = $scheme_name; + } + } + + + $nav_colours = array ( + '' => t('Scheme Default'), + 'red' => t('red'), + 'black' => t('black'), + 'silver' => t('silver'), + ); + +if(feature_enabled(local_user(),'expert')) + $expert = 1; + + $t = get_markup_template('theme_settings.tpl'); + $o .= replace_macros($t, array( '$submit' => t('Submit'), '$baseurl' => $a->get_baseurl(), + '$expert' => $expert, '$title' => t("Theme settings"), - '$font_size' => array('redbasic_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes), - '$line_height' => array('redbasic_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights), - '$colour' => array('redbasic_colour', t('Set colour scheme'), $colour, '', $colours), - )); + '$schema' => array('redbasic_schema', t('Set scheme'), $arr['schema'], '', $scheme_choices), + '$nav_colour' => array('redbasic_nav_colour', t('Navigation bar colour'), $arr['nav_colour'], '', $nav_colours), + '$banner_colour' => array('redbasic_banner_colour', t('Set font-colour for banner'), $arr['banner_colour']), + '$bgcolour' => array('redbasic_background_colour', t('Set the background colour'), $arr['bgcolour']), + '$background_image' => array('redbasic_background_image', t('Set the background image'), $arr['background_image']), + '$item_colour' => array('redbasic_item_colour', t('Set the background colour of items'), $arr['item_colour']), + '$item_opacity' => array('redbasic_item_opacity', t('Set the opacity of items'), $arr['item_opacity']), + '$toolicon_colour' => array('redbasic_toolicon_colour',t('Set the basic colour for item icons'),$arr['toolicon_colour']), + '$toolicon_activecolour' => array('redbasic_toolicon_activecolour',t('Set the hover colour for item icons'),$arr['toolicon_activecolour']), + '$body_font_size' => array('redbasic_body_font_size', t('Set font-size for the entire application'), $arr['body_font_size']), + '$font_size' => array('redbasic_font_size', t('Set font-size for posts and comments'), $arr['font_size']), + '$font_colour' => array('redbasic_font_colour', t('Set font-colour for posts and comments'), $arr['font_colour']), + '$radius' => array('redbasic_radius', t('Set radius of corners'), $arr['radius']), + '$shadow' => array('redbasic_shadow', t('Set shadow depth of photos'), $arr['shadow']), + '$converse_width' => array('redbasic_converse_width',t('Set maximum width of conversation regions'),$arr['converse_width']), + '$nav_min_opacity' => array('redbasic_nav_min_opacity',t('Set minimum opacity of nav bar - to hide it'),$arr['nav_min_opacity']), + '$top_photo' => array('redbasic_top_photo', t('Set size of conversation author photo'), $arr['top_photo']), + '$reply_photo' => array('redbasic_reply_photo', t('Set size of followup author photos'), $arr['reply_photo']), + '$sloppy_photos' => array('redbasic_sloppy_photos',t('Sloppy photo albums'),$arr['sloppy_photos'],t('Are you a clean desk or a messy desk person?')), + )); return $o; } - diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 99ad06c55..9956ccd31 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -1,46 +1,175 @@ <?php - $line_height = false; - $redbasic_font_size = false; - $resolution = false; - $colour = false; - $site_line_height = get_config("redbasic","line_height"); - $site_redbasic_font_size = get_config("redbasic", "font_size" ); - $site_colour = get_config("redbasic", "colour" ); - - if (local_user()) { - $line_height = get_pconfig(local_user(), "redbasic","line_height"); - $redbasic_font_size = get_pconfig(local_user(), "redbasic", "font_size"); - $colour = get_pconfig(local_user(), "redbasic", "colour"); - } - - if ($line_height === false) { - $line_height = $site_line_height; - } - if ($line_height === false) { - $line_height = "1.2"; - } - if ($redbasic_font_size === false) { - $redbasic_font_size = $site_redbasic_font_size; - } - if ($redbasic_font_size === false) { - $redbasic_font_size = "12"; - } - if ($colour === false) { - $colour = $site_colour; +// Get the UID of the channel owner + $uid = get_theme_uid(); + + if($uid) + load_pconfig($uid,'redbasic'); + +// Nav colours are mess. Set $nav_colour as a single word for the sake of letting folk pick one +// but it actually consists of at least two colours to form a gradient - $nav_bg_1 and $nav_bg_2 +// A further two - $nav_bg_3 and $nav_bg_4 are used to create the hover, if any particular scheme +// wants to implement that + $nav_colour = get_pconfig($uid, "redbasic", "nav_colour"); + +// Load the owners pconfig + $banner_colour = get_pconfig($uid,'redbasic','banner_colour'); + $schema = get_pconfig($uid,'redbasic','schema'); + $bgcolour = get_pconfig($uid, "redbasic", "background_colour"); + $background_image = get_pconfig($uid, "redbasic", "background_image"); + $toolicon_colour = get_pconfig($uid,'redbasic','toolicon_colour'); + $toolicon_activecolour = get_pconfig($uid,'redbasic','toolicon_activecolour'); + $item_colour = get_pconfig($uid, "redbasic", "item_colour"); + $item_opacity = get_pconfig($uid, "redbasic", "item_opacity"); + $body_font_size = get_pconfig($uid, "redbasic", "body_font_size"); + $font_size = get_pconfig($uid, "redbasic", "font_size"); + $font_colour = get_pconfig($uid, "redbasic", "font_colour"); + $radius = get_pconfig($uid, "redbasic", "radius"); + $shadow = get_pconfig($uid,"redbasic","photo_shadow"); + $converse_width=get_pconfig($uid,"redbasic","converse_width"); + $nav_min_opacity=get_pconfig($uid,'redbasic','nav_min_opacity'); + $sloppy_photos=get_pconfig($uid,'redbasic','sloppy_photos'); + $top_photo=get_pconfig($uid,'redbasic','top_photo'); + $reply_photo=get_pconfig($uid,'redbasic','reply_photo'); + +// Now load the scheme. If a value is changed above, we'll keep the settings +// If not, we'll keep those defined by the schema +// Setting $scheme to '' wasn't working for some reason, so we'll check it's +// not --- like the mobile theme does instead. + + if (($schema) && ($schema != '---')) { + // Check it exists, because this setting gets distributed to clones + if(file_exists('view/theme/redbasic/schema/' . $schema . '.php')) { + $schemefile = 'view/theme/redbasic/schema/' . $schema . '.php'; + require_once ($schemefile); + } } - if($colour === false) { - $colour = "light"; + // If we haven't got a schema, load the default. We shouldn't touch this - we + // should leave it for admins to define for themselves. + if (! $schema) { + if(file_exists('view/theme/redbasic/schema/default.php')) { + $schemefile = 'view/theme/redbasic/schema/' . 'default.php'; + require_once ($schemefile); + } + } + + +//Set some defaults - we have to do this after pulling owner settings, and we have to check for each setting +//individually. If we don't, we'll have problems if a user has set one, but not all options. + + if (! $nav_colour) { + $nav_colour = "red"; + $nav_bg_1 = "#f88"; + $nav_bg_2 = "#b00"; + $nav_bg_3 = "#f00"; + $nav_bg_4 = "#b00"; + } + if (! $banner_colour) + $banner_colour = "fff"; + if (! $bgcolour) + $bgcolour = "#fdfdfd"; + if (! $background_image) + $background_image =''; + if (! $item_colour) + $item_colour = "#fdfdfd"; + if (! $toolicon_colour) + $toolicon_colour = '#777777'; + if (! $toolicon_activecolour) + $toolicon_activecolour = '#000'; + if (! $item_opacity) + $item_opacity = "1"; + if (! $font_size) + $font_size = "1.0em"; + if (! $body_font_size) + $body_font_size = "11px"; + if (! $font_colour) + $font_colour = "#4D4D4D"; + if (! $radius) + $radius = "0"; + if (! $shadow) + $shadow = "0"; + if(! $active_colour) + $active_colour = '#FFFFFF'; + if (! $converse_width) + $converse_width="1024px"; + if(! $top_photo) + $top_photo = '64px'; + $pmenu_top = intval($top_photo) - 16 . 'px'; + $wwtop = intval($top_photo) - 15 . 'px'; + $comment_indent = intval($top_photo) + 10 . 'px'; + + if(! $reply_photo) + $reply_photo = '32px'; + $pmenu_reply = intval($reply_photo) - 16 . 'px'; + + if($nav_min_opacity === false || $nav_min_opacity === '') { + $nav_float_min_opacity = 1.0; + $nav_percent_min_opacity = 100; } - - if(file_exists('view/theme/' . current_theme() . '/css/style.css')) { - echo file_get_contents('view/theme/' . current_theme() . '/css/style.css'); - } - echo "\r\n"; - - if(($redbasic_font_size >= 10.0) && ($redbasic_font_size <= 16.0)) { - echo ".wall-item-content { font-size: $redbasic_font_size; }\r\n"; + else { + $nav_float_min_opacity = (float) $nav_min_opacity; + $nav_percent_min_opacity = (int) 100 * $nav_min_opacity; } + + +// Nav colours have nested values, so we have to define the actual variables +// used in the CSS from the higher level "red", "black", etc here + if ($nav_colour == "red") { + $nav_bg_1 = $nav_bg_3 = "#ba002f"; + $nav_bg_2 = $nav_bg_4 = "#ad002c"; + $search_background = "#EEEEEE"; + $active_colour = '#444444'; + } + + if ($nav_colour == "black") { + $nav_bg_1 = $nav_bg_3 = "#000"; + $nav_bg_2 = $nav_bg_4 = "#222"; + $search_background = '#EEEEEE'; + $active_colour = '#AAAAAA'; + } + if ($nav_colour == "silver") { + $nav_bg_1 = $nav_bg_2 = $nav_bg_3 = $nav_bg_4 = "silver"; + $search_background = '#EEEEEE'; + } + + +// Apply the settings + if(file_exists('view/theme/redbasic/css/style.css')) { + $x = file_get_contents('view/theme/redbasic/css/style.css'); + +$options = array ( +'$nav_bg_1' => $nav_bg_1, +'$nav_bg_2' => $nav_bg_2, +'$nav_bg_3' => $nav_bg_3, +'$nav_bg_4' => $nav_bg_4, +'$banner_colour' => $banner_colour, +'$search_background' => $search_background, +'$bgcolour' => $bgcolour, +'$background_image' => $background_image, +'$item_colour' => $item_colour, +'$item_opacity' => $item_opacity, +'$toolicon_colour' => $toolicon_colour, +'$toolicon_activecolour' => $toolicon_activecolour, +'$font_size' => $font_size, +'$font_colour' => $font_colour, +'$body_font_size' => $body_font_size, +'$radius' => $radius, +'$shadow' => $shadow, +'$active_colour' => $active_colour, +'$converse_width' => $converse_width, +'$nav_float_min_opacity' => $nav_float_min_opacity, +'$nav_percent_min_opacity' => $nav_percent_min_opacity, +'$top_photo' => $top_photo, +'$reply_photo' => $reply_photo, +'$pmenu_top' => $pmenu_top, +'$pmenu_reply' => $pmenu_reply, +'$wwtop' => $wwtop, +'$comment_indent' => $comment_indent +); + +echo str_replace(array_keys($options), array_values($options), $x); + +} - if(($line_height >= 1.0) && ($line_height <= 1.5)) { - echo ".wall-item-content { line-height: $line_height; }\r\n"; - } +if($sloppy_photos && file_exists('view/theme/redbasic/css/sloppy_photos.css')) { + echo file_get_contents('view/theme/redbasic/css/sloppy_photos.css'); +} diff --git a/view/theme/redbasic/php/theme.php b/view/theme/redbasic/php/theme.php index 3d69a7e22..e68533bb4 100644 --- a/view/theme/redbasic/php/theme.php +++ b/view/theme/redbasic/php/theme.php @@ -1,9 +1,15 @@ <?php +/** + * * Name: Redbasic + * * Description: RedMatrix standard theme + * * Version: 1.0 + * * Author: Fabrixxm + * * Maintainer: Mike Macgirvin + * * Compat: Red [*] + * + */ + function redbasic_init(&$a) { - if($a->config['system']['theme_engine']) - $a->set_template_engine($a->config['system']['theme_engine']); - else - $a->set_template_engine('smarty3'); -// head_add_js('redbasic.js'); + } diff --git a/view/theme/redbasic/php/theme_init.php b/view/theme/redbasic/php/theme_init.php new file mode 100644 index 000000000..ccb85a070 --- /dev/null +++ b/view/theme/redbasic/php/theme_init.php @@ -0,0 +1,5 @@ +<?php + +head_add_css('library/font_awesome/css/font-awesome.min.css'); +require_once('view/php/theme_init.php'); + diff --git a/view/theme/redbasic/schema/dark.php b/view/theme/redbasic/schema/dark.php new file mode 100644 index 000000000..bd3642914 --- /dev/null +++ b/view/theme/redbasic/schema/dark.php @@ -0,0 +1,10 @@ +<?php + + if (! $nav_colour) + $nav_colour = "black"; + if (! $bgcolour) + $bgcolour = '#010101'; + if (! $item_colour) + $item_colour = '#111'; + if (! $font_colour) + $font_colour = '#fff'; diff --git a/view/theme/redbasic/tpl/smarty3/theme_settings.tpl b/view/theme/redbasic/tpl/smarty3/theme_settings.tpl deleted file mode 100644 index f91f24de6..000000000 --- a/view/theme/redbasic/tpl/smarty3/theme_settings.tpl +++ /dev/null @@ -1,12 +0,0 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} -{{include file="field_select.tpl" field=$font_size}} - -{{include file="field_select.tpl" field=$line_height}} - -<div class="settings-submit-wrapper"> - <input type="submit" value="{{$submit}}" class="settings-submit" name="redbasic-settings-submit" /> -</div> diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl index d0d153e73..e0f546896 100644 --- a/view/theme/redbasic/tpl/theme_settings.tpl +++ b/view/theme/redbasic/tpl/theme_settings.tpl @@ -1,7 +1,28 @@ -{{inc field_select.tpl with $field=$font_size}}{{endinc}} - -{{inc field_select.tpl with $field=$line_height}}{{endinc}} +{{include file="field_select.tpl" field=$schema}} +<div class="settings-submit-wrapper"> + <input type="submit" value="{{$submit}}" class="settings-submit" name="redbasic-settings-submit" /> +</div> +{{if $expert}} +{{include file="field_select.tpl" field=$nav_colour}} +{{include file="field_input.tpl" field=$banner_colour}} +{{include file="field_input.tpl" field=$bgcolour}} +{{include file="field_input.tpl" field=$background_image}} +{{include file="field_input.tpl" field=$item_colour}} +{{include file="field_input.tpl" field=$item_opacity}} +{{include file="field_input.tpl" field=$toolicon_colour}} +{{include file="field_input.tpl" field=$toolicon_activecolour}} +{{include file="field_input.tpl" field=$body_font_size}} +{{include file="field_input.tpl" field=$font_size}} +{{include file="field_input.tpl" field=$font_colour}} +{{include file="field_input.tpl" field=$radius}} +{{include file="field_input.tpl" field=$shadow}} +{{include file="field_input.tpl" field=$converse_width}} +{{include file="field_input.tpl" field=$nav_min_opacity}} +{{include file="field_input.tpl" field=$top_photo}} +{{include file="field_input.tpl" field=$reply_photo}} +{{include file="field_checkbox.tpl" field=$sloppy_photos}} <div class="settings-submit-wrapper"> - <input type="submit" value="$submit" class="settings-submit" name="redbasic-settings-submit" /> + <input type="submit" value="{{$submit}}" class="settings-submit" name="redbasic-settings-submit" /> </div> +{{/if}} |
