diff options
Diffstat (limited to 'view/theme/redbasic')
18 files changed, 900 insertions, 687 deletions
diff --git a/view/theme/redbasic/css/dark.css b/view/theme/redbasic/css/dark.css new file mode 100644 index 000000000..43912be69 --- /dev/null +++ b/view/theme/redbasic/css/dark.css @@ -0,0 +1,182 @@ +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..2da9d68d1 --- /dev/null +++ b/view/theme/redbasic/css/fancy.css @@ -0,0 +1,106 @@ +/* There's probably some stuff in here we don't need, and maybe some missing stuff we do need. We can clean it up incrementaly, just get the heavy lifting done for now */ + +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/style.css b/view/theme/redbasic/css/style.css index db73e27d5..8d33913c4 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -10,7 +10,7 @@ body { font-family: arial,freesans,clean,sans-serif; font-size: 12px; - background-color: #ffffff; + background-color: #FFFFFF; color: #000000; margin: 0px; } @@ -115,8 +115,8 @@ a:hover, .fakelink:hover { color: #44AAFF; text-decoration: underline; } input { border: 1px solid #666666; - -moz-border-radius: 5px; - border-radius: 5px; + -moz-border-radius: $radiuspx; + border-radius: $radiuspx; padding: 3px; } @@ -171,7 +171,7 @@ blockquote { nav { display: block; - border-bottom: 1px solid #d00; + } #langselector { @@ -209,8 +209,8 @@ nav #site-location { border: 1px solid #444; background-color: #ccc; padding: 10px; - -moz-border-radius: 5px; - border-radius: 5px; + -moz-border-radius: $radiuspx; + border-radius: $radiuspx; } @@ -229,14 +229,14 @@ 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; font-weight: bold; - + margin-top: 1px; } header #banner a, header #banner a:active, @@ -256,7 +256,7 @@ header #banner #logo-text { font-size: 22px; } -.nav-commlink { +.nav-commlink, .nav-login-link { display: block; height: 15px; margin-top: 67px; @@ -268,8 +268,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 { @@ -300,18 +300,19 @@ nav #nav-link-wrapper .nav-link { } .tabs { - height: 22px; + height: 28px; border-bottom: 1px solid #aaaaaa; padding:0px; - margin-right: 10px; + width: 90%; +/* margin-right: 5px; */ } .tabs li { margin: 0px; list-style: none; } .tab { display:block; float:left; - padding: 0.4em; - margin-right: 3px ; +/* padding: 0.4em; */ + margin-right: 15px ; } .tab.active { @@ -324,6 +325,7 @@ ul.tabs { margin-bottom: 0px; list-style-type: none; padding: 0px; + padding-right: 8px; } /* footer */ @@ -347,6 +349,16 @@ footer { font-weight: bold; } +.warning-text { + font-size: 1.2em; + font-weight: bold; + color: #ff0000; +} + +#noperm-msg { + margin-top: 15px; +} + .preview { background: url('../img/gray_and_white_diagonal_stripes_background_seamless.gif'); } @@ -377,7 +389,7 @@ footer { float: left; } -#jot-title, #jot-category { +#jot-title, #jot-category, #jot-pagetitle { border: 0px; margin: 0px; padding: 8px; @@ -385,17 +397,21 @@ footer { width: 530px; margin-bottom: 5px; font-weight: bold; - border: solid 1px #ccc; - border-radius: 5px; + border: solid 1px #ffffff; + border-radius: $radiuspx; } #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-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; @@ -419,22 +435,8 @@ footer { 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; +.group-selected, .nets-selected, .fileas-selected, .categories-selected, .settings-widget .selected { + color: #444444 !important; } .smalltext { @@ -513,62 +515,6 @@ footer { } -/* 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; padding: 30px; @@ -579,67 +525,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,29 +563,6 @@ input#dfrn-url { clear: both; } -#birthday-title { - float: left; - font-weight: bold; -} - -#birthday-adjust { - float: left; - font-size: 75%; - margin-left: 10px; -} - -#birthday-title-end { - clear: both; -} - -.birthday-list { - margin-left: 15px; -} - -#birthday-wrapper { - margin-bottom: 20px; -} - #profile-extra-links { clear: both; margin-top: 10px; @@ -849,12 +712,8 @@ input#dfrn-url { float: left; margin-bottom: 20px; } -#settings-normal, -#settings-soapbox, -#settings-freelove, -#settings-community { - float: left; -} + + #settings-notifications label { margin-left: 20px; } @@ -862,10 +721,7 @@ input#dfrn-url { font-weight: bold; margin-bottom: 15px; } -#settings-pagetype-desc { - color: #666666; - margin-bottom: 15px; -} + #profile-in-dir-yes-label, #profile-in-dir-no-label, @@ -916,24 +772,6 @@ input#dfrn-url { 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, @@ -960,11 +798,7 @@ input#dfrn-url { #hide-wall-break, #hide-wall-end, #hide-friends-break, -#hide-friends-end, -#settings-normal-break, -#settings-soapbox-break, -#settings-community-break, -#settings-freelove-break { +#hide-friends-end { clear: both; } @@ -1058,6 +892,7 @@ input#dfrn-url { #network-bmark-link { margin-top: 10px; } + .thread-wrapper .wall-item-comment-wrapper { margin-left: 50px; } @@ -1067,15 +902,18 @@ input#dfrn-url { .wall-item-content-wrapper { margin-top: 10px; position: relative; + border-radius: $radiuspx; + border: 1px solid #eec; + /* background: #fff; */ /* border-radius: 5px; */ /* box-shadow: 12px 12px 12px #111; */ - border-left: 1px solid #eec; +/* border-left: 1px solid #eec; */ } .wall-item-content-wrapper.comment { /* background: #fff; */ - border-left: 1px solid #e0e0e0; +/* border-left: 1px solid #e0e0e0; */ margin-left: 50px; /* box-shadow: 5px 5px 5px #222; */ } @@ -1086,9 +924,9 @@ input#dfrn-url { .wall-item-content-wrapper.comment { - background: #ffffff; +/* background: #ffffff; border-left: 1px solid #e0e0e0; - +*/ } .wall-item-like.comment, .wall-item-dislike.comment { @@ -1163,7 +1001,7 @@ input#dfrn-url { position: absolute; left: 75px; top: 70px; - z-index: 100; + z-index: 99; } .wall-item-wrapper { /*float: left; @@ -1205,7 +1043,9 @@ input#dfrn-url { } .like-rotator { - margin-left: 5px; + float: left; + margin: 8px; + color: #777; } .wall-item-delete-wrapper { @@ -1241,8 +1081,7 @@ input#dfrn-url { } .wall-item-content img { - max-height: 95% !important; - max-width: 95% !important; + max-width: 95% !important; /* box-shadow: 8px 8px 8px #666; can't really have this because of smileys */ } @@ -1260,7 +1099,8 @@ input#dfrn-url { } .thread-wrapper.toplevel_item { - width: 90%; + + width: 92%; } .wall-item-body { @@ -1269,6 +1109,10 @@ input#dfrn-url { margin-top: 10px; } +.wall-item-body.divmore { + padding-bottom: 15px; +} + .wall-item-tools { clear: both; padding: 5px 10px; @@ -1285,12 +1129,11 @@ input#dfrn-url { .comment-edit-wrapper { margin-top: 15px; - background: #ffffff; margin-left: 50px; } .comment-wwedit-wrapper { - background: #ffffff; + margin-top: 2px; } .comment-edit-photo { @@ -1313,14 +1156,14 @@ input#dfrn-url { padding: 3px 1px 1px 3px; border: 1px solid #ccc; padding: 8px; - border-radius: 5px 5px 5px 5px; + border-radius: $radiuspx; /* box-shadow: 5px 5px 5px #666 inset; */ } .comment-edit-text-empty { color: gray; height: 1.5em; - width: 80%; /*Too wide? */ + width: 40%; /*Too wide? */ overflow: auto; margin-bottom: 10px; } @@ -1360,15 +1203,16 @@ input#dfrn-url { } #profile-upload-wrapper { float: left; - margin-left: 30px; + margin-left: 15px; } #profile-attach-wrapper { float: left; - margin-left: 30px; + margin-left: 15px; } #profile-rotator { float: left; - margin-left: 30px; + margin: 8px 0px 0px 20px; + color: #777; } #profile-link-wrapper { float: left; @@ -1396,7 +1240,6 @@ input#dfrn-url { margin-top: 0px !important; } - #profile-nolocation-wrapper { float: left; margin-left: 15px; @@ -1414,7 +1257,7 @@ input#dfrn-url { height: auto; width: auto; background-color: #0080FF; - border-radius: 5px; + border-radius: $radiuspx; border: 2px outset; box-shadow: 5px 5px 5px #666; margin-right: 8px; @@ -1496,12 +1339,7 @@ input#dfrn-url { width: 200px; } -.fortune { - margin-top: 50px; - color: #4444FF; - font-weight: bold; - margin-bottom: 20px; -} + .directory-end { clear: both; @@ -1522,7 +1360,8 @@ input#dfrn-url { float: left; width: 225px; height: 260px; - overflow: auto; + overflow: hidden; + margin: 2px; } #directory-search-wrapper { @@ -1571,113 +1410,6 @@ input#dfrn-url { } -#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; } @@ -1743,34 +1475,6 @@ input#dfrn-url { } -.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; } @@ -1796,8 +1500,8 @@ border: 1px #111; /* #profile-jot-text_parent, .mceLayout { - border-radius: 5px; - -moz-border-radius: 5px; + border-radius: $radiuspx; + -moz-border-radius: $radiuspx; box-shadow: 4px 4px 3px 0 #444444; } */ @@ -1805,7 +1509,6 @@ border: 1px #111; iframe#profile-jot-text_ifr { width: 100% !important; -height: 100% !important; box-shadow: 5px 5px 5px #000 inset !important;} tr.mceLast { @@ -1819,26 +1522,33 @@ tr.mceLast { color:#000; border: 1px solid #cccccc; padding: 8px; - width: 90%; - -moz-border-radius: 5px; - border-radius: 5px; + margin-right: 0px; + width: 90%; + -moz-border-radius: $radiuspx; + border-radius: $radiuspx; /* box-shadow: 4px 4px 3px 0 #666 inset; */ } #profile-jot-text:hover { color: #000000; } +#profile-jot-text-loading { + float: left; + margin: 14px 0px 0px 12px; + color: #777; +} + .wall-item-photo, .photo, .contact-block-img, .my-comment-photo { - border-radius: 5px; - -moz-border-radius: 5px; + border-radius: $radiuspx; + -moz-border-radius: $radiuspx; box-shadow: 4px 4px 3px 0 #444444; } #datebrowse-sidebar select { margin-left: 25px; - border-radius: 5px; - -moz-border-radius: 5px; + border-radius: $radiuspx; + -moz-border-radius: $radiuspx; opacity: 0.3; filter:alpha(opacity=30); } @@ -1872,9 +1582,9 @@ 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; +.contact-entry-photo img, .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: 4px 4px 3px 0 #444444; } @@ -1883,9 +1593,9 @@ tr.mceLast { background-color: #0080FF; color: #eeeeec; font-weight: bold; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; + -webkit-border-radius: $radiuspx; + -moz-border-radius: $radiuspx; + border-radius: $radiuspx; border: 2px outset #222420 !important; margin: 0; float: right; @@ -1899,8 +1609,8 @@ tr.mceLast { } .settings-widget .selected { - border-radius: 5px; - -moz-border-radius: 5px; + border-radius: $radiuspx; + -moz-border-radius: $radiuspx; box-shadow: 4px 4px 3px 0 #444444; } @@ -1979,11 +1689,6 @@ tr.mceLast { -/*.photos { - height: auto; - overflow: auto; -}*/ - .photos-end { clear: both; margin-bottom: 25px; @@ -2146,7 +1851,7 @@ tr.mceLast { } #in-this-photo-text { - color: #0000FF; + color: #0080FF; margin-left: 30px; } @@ -2166,49 +1871,6 @@ tr.mceLast { } -#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 { - - -} - - -#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; -} - #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label { margin-bottom: 10px; margin-top: 20px; @@ -2407,43 +2069,17 @@ aside input[type='text'] { border-bottom: 1px solid #eec; padding: 8px; margin-top: 5px; - -moz-border-radius:5px; - -webkit-border-radius:5px; - border-radius:5px; - -} - - -#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; -} + -moz-border-radius: $radiuspx; + -webkit-border-radius: $radiuspx; + border-radius: $radiuspx; -#character-counter.orange { - color: orange; -} -#character-counter.red { - color: red; } -#profile-jot-banner-end { - /* clear: both; */ +#profile-jot-wrapper { + margin-top: 25px; } - #settings-default-perms-menu { margin-top: 15px; margin-bottom: 15px; @@ -2455,40 +2091,6 @@ aside input[type='text'] { 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; -} #dfrn-request-networks { margin-bottom: 30px; @@ -2571,14 +2173,12 @@ aside input[type='text'] { #nav-searchbar { float: right; - margin-top: 4px; + margin-top: 3px; } #nav-search-spinner { float: right; - margin-top: 8px; - margin-left: 5px; - margin-right: 5px; + margin: 12px 12px 0px 0px; } #nav-search-text:hover { @@ -2587,8 +2187,11 @@ aside input[type='text'] { } #nav-search-text { + margin-top: -1px; + font-size: 0.8em; border-radius: 14px; - background-color: #AAAAAA; + border: none; + background-color: #FFDDDD; color: #eec; } @@ -2600,9 +2203,21 @@ aside input[type='text'] { } #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; @@ -2630,6 +2245,9 @@ aside input[type='text'] { font-size: 70%; } +.descriptive-text { + color: #888; +} #plugin-settings-link, #account-settings-link { margin-bottom: 10px; @@ -2803,6 +2421,10 @@ aside input[type='text'] { overflow: hidden; } +.profile-match-note { + text-align: center; +} + .profile-match-break, .profile-match-end { clear: both; @@ -2900,33 +2522,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,16 +2559,20 @@ aside input[type='text'] { margin-top: 10px; } -.body-tag, .filesavetags, .categorytags { +.posttags a, .body-tag, .filesavetags, .categorytags { opacity: 0.5; filter:alpha(opacity=50); } -.body-tag:hover, .filesavetags:hover, .categorytags:hover { +.posttags a:hover, .body-tag:hover, .filesavetags:hover, .categorytags:hover { opacity: 1.0 !important; filter:alpha(opacity=100) !important; } +.posttags, .body-tag { + margin-top: 15px; +} + .item-select { opacity: 0.1; filter:alpha(opacity=10); @@ -3128,69 +2727,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 @@ -3406,6 +2942,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; @@ -3486,14 +3025,15 @@ div.jGrowl div.info { .slider { margin-top: 10px; - margin-bottom: 30px; + margin-bottom: 45px; } #main-slider { position: relative; - left: 5%; + left: 5px; width: 90%; + } @@ -3506,7 +3046,7 @@ div.jGrowl div.info { /* nav */ nav { width: 100%; - height: 32px; + height: 24px; position: fixed; // opacity: 0.6; // filter:alpha(opacity=60); @@ -3517,9 +3057,9 @@ nav { background-color: #d00; color: #eec; z-index: 100; - -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); +/* -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); + 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. */ @@ -3538,6 +3078,8 @@ color-stop(0.82, #b00) ); } +/* + nav:hover { background-image: linear-gradient(bottom, #f00 26%, #b00 82%); @@ -3555,16 +3097,22 @@ color-stop(0.82, #b00) ); } +*/ + nav a, nav a:active, nav a:visited, -nav a:link, -nav a:hover { +nav a:link { color: #ffffff; text-decoration: none; outline: none; } +nav a:hover { + color: #0080FF; +} +nav .fakelink:hover { text-decoration: none; } + #profiles-menu li a { color: #ffffff; } @@ -3588,14 +3136,19 @@ 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 { background-color: #FF0000; @@ -3611,26 +3164,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.selected a { + color: #444444; } 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.selected span { + color: #ffffff; +} + nav .nav-notify.show { display: block; } @@ -3638,9 +3198,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, @@ -3674,7 +3232,7 @@ ul.menu-popup { } ul.menu-popup a { display: block; - color: #; + color: #FFFFFF; padding: 5px 10px; text-decoration: none; } @@ -3682,7 +3240,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; @@ -3767,9 +3325,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 +3366,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 +3394,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 +3429,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 +3472,117 @@ ul.menu-popup { .contact-block-content { margin-top: 8px; -}
\ No newline at end of file +} + +.profile-match-connect { margin-top: 5px; } + +.reshared-content { margin-left: 30px; } +.shared_header img { margin-right: 10px; } + + +.mail-list-wrapper { + +border-bottom: 1px solid #ccc; +padding: 20px; +} + +span.mail-delete { +float: left; +width: 30px; +} + +a.mail-list-sender-url { +float: left; +width: 35px; +} + +img.mail-list-sender-photo { +height: 16px; +width: 16px; +} + + +span.mail-from { +float: left; +width: 200px; +} + +span.mail-subject.unseen{ +float: left; +width: 200px; +} + +span.mail-date { +float:left; +width: 200px; +} + + +.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; +} 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/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..10ca4cfa3 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -86,4 +86,16 @@ $('.savedsearchterm').hover( }); - +$(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); +});
\ No newline at end of file diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index ad5df57ce..4e7363362 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -4,42 +4,74 @@ */ function theme_content(&$a) { + // Doesn't yet work for anyone other than the channel owner, and stupid mode isn't finished, so return both for now. 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); + $shadow = get_pconfig(local_user(), 'redbasic', 'shadow' ); + $navcolour = get_pconfig(local_user(), 'redbasic', 'navcolour'); + $displaystyle = get_pconfig(local_user(), 'redbasic', 'displaystyle'); + $linkcolour = get_pconfig(local_user(), 'redbasic', 'linkcolour'); + $iconset = get_pconfig(local_user(), 'redbasic', 'iconset'); + $shiny = get_pconfig(local_user(), 'redbasic', 'shiny'); + $colour_scheme = get_pconfig(local_user(), 'redbasic', 'colour_scheme'); + $radius = get_pconfig(local_user(),'redbasic','radius'); + + return redbasic_form($a, $font_size, $line_height, $colour, $shadow, $navcolour, $opaquenav, $displaystyle, $linkcolour, $iconset, $shiny, $colour_scheme,$radius); } function theme_post(&$a) { if(!local_user()) { return; } - + if (isset($_POST['redbasic-settings-submit'])) { 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', 'shadow', $_POST['redbasic_shadow']); + set_pconfig(local_user(), 'redbasic', 'navcolour', $_POST['redbasic_navcolour']); + set_pconfig(local_user(), 'redbasic', 'displaystyle', $_POST['redbasic_displaystyle']); + set_pconfig(local_user(), 'redbasic', 'linkcolour', $_POST['redbasic_linkcolour']); + set_pconfig(local_user(), 'redbasic', 'iconset', $_POST['redbasic_iconset']); + set_pconfig(local_user(), 'redbasic', 'shiny', $_POST['redbasic_shiny']); + set_pconfig(local_user(), 'redbasic', 'colour_scheme', $_POST['redbasic_colour_scheme']); + set_pconfig(local_user(), 'redbasic', 'radius', $_POST['redbasic_radius']); } -} -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']); - } -} +// We probably don't want these if we're having global settings, but we'll comment out for now, just in case +//function theme_admin(&$a) { $font_size = get_config('redbasic', 'font_size' ); +// $line_height = get_config('redbasic', 'line_height' ); +// $colour = get_config('redbasic', 'colour' ); +// $shadow = get_config('redbasic', 'shadow' ); +// $navcolour = get_config('redbasic', 'navcolour' ); +// $opaquenav = get_config('redbasic', 'opaquenav' ); +// $itemstyle = get_config('redbasic', 'itemstyle' ); +// $linkcolour = get_config('redbasic', 'linkcolour' ); +// $iconset = get_config('redbasic', 'iconset' ); +// $shiny = get_config('redbasic', 'shiny' ); +// +// return redbasic_form($a, $font_size, $line_height, $colour, $shadow, $navcolour, $opaquenav, $itemstyle, $linkcolour, $iconset, $shiny); +//} -function 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']); +// set_config('redbasic', 'shadow', $_POST['redbasic_shadow']); +// set_config('redbasic', 'navcolour', $_POST['redbasic_navcolour']); +// set_config('redbasic', 'opaquenav', $_POST['redbasic_opaquenav']); +// set_config('redbasic', 'itemstyle', $_POST['redbasic_itemstyle']); +// set_config('redbasic', 'linkcolour', $_POST['redbasic_linkcolour']); +// set_config('redbasic', 'iconset', $_POST['redbasic_iconset']); +// set_config('redbasic', 'shiny', $_POST['redbasic_shiny']); +// } +//} + +// These aren't all used yet, but they're not bloat - we'll use drop down menus in idiot mode. +function redbasic_form(&$a, $font_size, $line_height, $colour, $shadow, $navcolour, $opaquenav, $displaystyle, $linkcolour, $iconset, $shiny, $colour_scheme,$radius) { $line_heights = array( "1.3" => "1.3", "---" => "---", @@ -65,16 +97,68 @@ function redbasic_form(&$a, $font_size, $line_height, $colour) { 'dark' => 'dark', ); - $t = get_markup_template('theme_settings.tpl'); - $o .= replace_macros($t, array( + $colour_schemes = array( + 'redbasic' => 'redbasic', + 'fancyred' => 'fancyred', + 'dark' => 'dark', + ); + $shadows = array( + 'true' => 'Yes', + 'false' => 'No', + ); + + $navcolours = array ( + 'red' => 'red', + 'black' => 'black', + ); + + $displaystyles = array ( + 'fancy' => 'fancy', + 'classic' => 'classic', + ); + + $linkcolours = array ( + 'blue' => 'blue', + 'red' => 'red', + ); + + $iconsets = array ( + 'default' => 'default', + ); + + $shinys = array ( + 'none' => 'none', + 'opaque' => 'opaque', + ); + if(feature_enabled(local_user(),'expert')) { + $t = get_markup_template('theme_settings.tpl'); + $o .= replace_macros($t, array( '$submit' => t('Submit'), '$baseurl' => $a->get_baseurl(), '$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), - )); - + '$shadow' => array('redbasic_shadow', t('Draw shadows'), $shadow, '', $shadows), + '$navcolour' => array('redbasic_navcolour', t('Navigation bar colour'), $navcolour, '', $navcolours), + '$displaystyle' => array('redbasic_displaystyle', t('Display style'), $displaystyle, '', $displaystyles), + '$linkcolour' => array('redbasic_linkcolour', t('Display colour of links - hex value, do not include the #'), $linkcolour, '', $linkcolours), + '$iconset' => array('redbasic_iconset', t('Icons'), $iconset, '', $iconsets), + '$shiny' => array('redbasic_shiny', t('Shiny style'), $shiny, '', $shinys), + '$radius' => array('redbasic_radius', t('Corner radius'), $radius, t('0-99 default: 5')), + ));} + + if(! feature_enabled(local_user(),'expert')) { + $t = get_markup_template('basic_theme_settings.tpl'); + $o .= replace_macros($t, array( + '$submit' => t('Submit'), + '$baseurl' => $a->get_baseurl(), + '$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_scheme' => array('redbasic_colour_scheme', t('Set colour scheme'), $colour_scheme, '', $colour_schemes), + ));} + return $o; } diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 99ad06c55..8643925d3 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -1,46 +1,159 @@ <?php + // This needs changing now, if we're going for global settings. Admin settings have been removed in preparation, You *should* just be able to remove all + // the get_config bits, though this is untested. + // We also need to eventually. Use the page owners settings for everybody - get_pconfig(page_owner()) or whatever that would look like. + + + $uid = get_theme_uid(); + + if($uid) + load_pconfig($uid,'redbasic'); + $line_height = false; $redbasic_font_size = false; $resolution = false; $colour = false; + $shadows = false; + $navcolour = false; + $nav_bg_1 = "f88"; + $nav_bg_2 = "b00"; + $nav_bg_3 = "f00"; + $nav_bg_4 = "b00"; + $displaystyle = false; + $linkcolour = false; + $shiny = false; + $radius = 5; $site_line_height = get_config("redbasic","line_height"); $site_redbasic_font_size = get_config("redbasic", "font_size" ); $site_colour = get_config("redbasic", "colour" ); + $shadows = get_config("redbasic", "shadow" ); + $navcolour = get_config("redbasic", "navcolour" ); + $displaystyle = get_config("redbasic", "displaystyle" ); + $linkcolour = get_config("redbasic", "linkcolour" ); + $shiny = get_config("redbasic", "shiny" ); - 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"); + $x = get_config('redbasic','radius'); + if($x !== false) + $radius = $x; + + if ($uid) { + $line_height = get_pconfig($uid, "redbasic","line_height"); + $redbasic_font_size = get_pconfig($uid, "redbasic", "font_size"); + $colour = get_pconfig($uid, "redbasic", "colour"); + $shadows = get_pconfig($uid, "redbasic", "shadow"); + $navcolour = get_pconfig($uid, "redbasic", "navcolour"); + $displaystyle = get_pconfig($uid, "redbasic", "displaystyle"); + $linkcolour = get_pconfig($uid, "redbasic", "linkcolour"); + $shiny = get_pconfig($uid, "redbasic", "shiny"); + $x = get_pconfig($uid,'redbasic','radius'); + if($x !== false) + $radius = $x; + + if (! feature_enabled($uid,'expert')) {$colour_scheme = get_pconfig($uid, "redbasic", "colour_scheme");} } - 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; - } - if($colour === false) { - $colour = "light"; - } - + // In non-expert mode, we just let them choose font size, line height, and a colour scheme. A colour scheme is just a pre-defined set of the above variables. + // But only apply these settings in non-expert mode to prevent confusion when turning expert mode on and off. + if(! feature_enabled($uid,'expert')) { + if ($colour_scheme === 'fancyred') {$shadows = true; $navcolour = 'black'; $displaystyle = 'fancy'; $linkcolour = 'f00'; $shiny = "opaque";} + // Dark themes are very different - we need to do some of these from scratch, so don't bother setting vars for anything else + if ($colour_scheme === 'dark') {$colour = 'dark'; $navcolour = 'black';} + if ($colour_scheme === 'redbasic'){$navcolour = 'red';} + $shadows = false; + $radius = 5; +} + +// This is probably the easiest place to apply global settings. Don't bother with site line height and such. Instead, check pconfig for global user settings. +// eg, if ($redbasic_font_size === false) {$redbasic_font_size = get_pconfig($uid, "global", "font_size"); If it's not set, we'll just use the CSS with no changes. +// Then all you need to do is add a "Global Settings" tab to settings/display, and make an equivalent of theme_settings.tpl and config.php to be loaded there. Easy. + + 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;} + if ($colour === false) {$colour = "light";} + if ($navcolour === "black") {$nav_bg_1 = "000"; + $nav_bg_2 = "2e2f2e";} + if(file_exists('view/theme/' . current_theme() . '/css/style.css')) { - echo file_get_contents('view/theme/' . current_theme() . '/css/style.css'); + $x = file_get_contents('view/theme/' . current_theme() . '/css/style.css'); + if(get_config('system','pcss_compress')) { + // this shaves off about 10%, probably not enough to worry about right now. + logger('pcss compress: original size: ' . strlen($x), LOGGER_DEBUG); + $x = str_replace(array("\r","\t"," "),array("",' ',' '),$x); + $x = preg_replace('/(\n[ ]+?)/s',"\n",$x); + $x = str_replace("\n","",$x); + logger('pcss compress: final size: ' . strlen($x), LOGGER_DEBUG); + } + echo str_replace(array('$radius'),array($radius),$x); } 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"; +// use $colour_scheme for idiot mode. + if($colour === "dark") {if (file_exists('view/theme/' . current_theme() . '/css/dark.css')) { + $dark = (file_get_contents('view/theme/' . current_theme() . '/css/dark.css')); + echo "$dark";} + } + + + +// Enforce sane limits for expert mode - otherwise we'll end up with "experts" who think font size is a percentage. + + if(($redbasic_font_size >= 8.0) && ($redbasic_font_size <= 20.0)) { + echo ".wall-item-content { font-size: ${redbasic_font_size}px;}\r\n"; } - if(($line_height >= 1.0) && ($line_height <= 1.5)) { + if(($line_height >= 1.0) && ($line_height <= 2.0)) { echo ".wall-item-content { line-height: $line_height; }\r\n"; } + + +// Minimum value shadows - they shouldn't all be the same size; just get it working, clean up later. + if($shadows === "true") { + echo "code, blockquote, .wall-item-content-wrapper, .wall-item-content-wrapper.comment, .wall-item-content img, #profile-jot-perms, #profile-jot-submit, .tab, .tab.active, .settings-widget li, .wall-item-photo, .photo, .contact-block-img, .my-comment-photo, #posted-date-selector:hover, .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 { + box-shadow: 5px 5px 5px #111;}\r\n + + .tab.active, #jot-title, #jot-category, .comment-edit-text-empty, .comment-edit-text-full, iframe#profile-jot-text_ifr, #profile-jot-text { + box-shadow: 5px 5px 5px #666 inset;}\r\n"; + + } + +// Since every change would otherwise require five lines, it's simpler to just set a default and echo this without first checking if we've set it. + echo "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%) !important; + 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%);}"; + + if($navcolour === false || $navcolour === 'red') { + echo "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%) !important; + 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%);}"; + } + +// This takes quite a lot of code, so we'll keep it in a separate file, and echo the lot. Devs still don't have to worry about - it's just overrides. +// Theme devs can play with it without facing scary PHP. + + if ($displaystyle === "fancy") + {if (file_exists('view/theme/' . current_theme() . '/css/fancy.css')) { + $fancy = (file_get_contents('view/theme/' . current_theme() . '/css/fancy.css')); + echo str_replace(array('$radius'),array($radius),$fancy); + } + } + +// Put the # here to force hex colours - if we don't, somebody is going to do something odd, using RGB and we're all going to be confused on the support forums +// until one of us works out what they've done. + + if ($linkcolour != false) { + echo "a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link {color: #$linkcolour;}\r\n"; + } + +// If you want a shiny that just sets a different colour, add an if $shiny != false and handle it as the linkcolour above. + + if ($shiny === 'opaque') { + echo "div.wall-item-content-wrapper.shiny {opacity: 1;}\r\n + .wall-item-content-wrapper {opacity: 0.8;}"; + }
\ No newline at end of file diff --git a/view/theme/redbasic/tpl/smarty3/theme_settings.tpl b/view/theme/redbasic/tpl/basic_theme_settings.tpl index f91f24de6..33a34b292 100644..100755 --- a/view/theme/redbasic/tpl/smarty3/theme_settings.tpl +++ b/view/theme/redbasic/tpl/basic_theme_settings.tpl @@ -7,6 +7,8 @@ {{include file="field_select.tpl" field=$line_height}} +{{include file="field_select.tpl" field=$colour_scheme}} + <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..cd980fbc3 100644..100755 --- a/view/theme/redbasic/tpl/theme_settings.tpl +++ b/view/theme/redbasic/tpl/theme_settings.tpl @@ -1,7 +1,23 @@ -{{inc field_select.tpl with $field=$font_size}}{{endinc}} +{{include file="field_select.tpl" field=$colour}} -{{inc field_select.tpl with $field=$line_height}}{{endinc}} +{{include file="field_input.tpl" field=$font_size}} + +{{include file="field_input.tpl" field=$line_height}} + +{{include file="field_select.tpl" field=$shadow}} + +{{include file="field_select.tpl" field=$navcolour}} + +{{include file="field_select.tpl" field=$displaystyle}} + +{{include file="field_input.tpl" field=$linkcolour}} + +{{include file="field_select.tpl" field=$iconset}} + +{{include file="field_select.tpl" field=$shiny}} + +{{include file="field_input.tpl" field=$radius}} <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> |
