diff options
Diffstat (limited to 'view/theme/dispy')
| -rw-r--r-- | view/theme/dispy/dark/style.css | 45 | ||||
| -rw-r--r-- | view/theme/dispy/dark/style.less | 158 | ||||
| -rw-r--r-- | view/theme/dispy/dark/theme.php | 16 | ||||
| -rw-r--r-- | view/theme/dispy/light/_base.less | 3 | ||||
| -rw-r--r-- | view/theme/dispy/light/connect.png | bin | 443 -> 0 bytes | |||
| -rw-r--r-- | view/theme/dispy/light/style.css | 51 | ||||
| -rw-r--r-- | view/theme/dispy/light/style.less | 167 | ||||
| -rw-r--r-- | view/theme/dispy/light/theme.php | 12 |
8 files changed, 233 insertions, 219 deletions
diff --git a/view/theme/dispy/dark/style.css b/view/theme/dispy/dark/style.css index 3bb30be83..6f29ef1f4 100644 --- a/view/theme/dispy/dark/style.css +++ b/view/theme/dispy/dark/style.css @@ -37,8 +37,9 @@ img{border:0 none;} a{color:#88a9d2;text-decoration:none;margin-bottom:1px;}a:hover{color:#638ec4;border-bottom:1px dotted #638ec4;} a:hover img{text-decoration:none;} blockquote{background:#444444;color:#eeeecc;text-indent:5px;padding:5px;border:1px solid #9a9a9a;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;} -label{width:38%;display:inline-block;font-size:small;margin:0 10px 1em 0;border:1px solid #2e2f2e;padding:5px;background:#eeeecc;color:#111111;-moz-box-shadow:3px 3px 5px 0px #111111;-o-box-shadow:3px 3px 5px 0px #111111;-webkit-box-shadow:3px 3px 5px 0px #111111;-ms-box-shadow:3px 3px 5px 0px #111111;box-shadow:3px 3px 5px 0px #111111;} -input{width:250px;height:25px;border:1px solid #999999;}input[type="checkbox"],input[type="radio"]{margin:0;width:15px;height:15px;} +label{width:38%;display:inline-block;font-size:small;margin:0 10px 1em 0;border:1px solid #2e2f2e;padding:3px 5px;background:#eeeecc;color:#111111;-moz-box-shadow:3px 3px 5px 0px #111111;-o-box-shadow:3px 3px 5px 0px #111111;-webkit-box-shadow:3px 3px 5px 0px #111111;-ms-box-shadow:3px 3px 5px 0px #111111;box-shadow:3px 3px 5px 0px #111111;} +input{width:250px;height:25px;border:1px solid #999999;width:17em;}input[type="checkbox"],input[type="radio"]{width:15px;height:15px;margin:0;} +input[type="radio"]{margin:5px 0;} input[type="submit"],input[type="button"]{background-color:#eeeeee;border:2px outset #b1b1b1;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:1px 3px 4px 0 #111111;-o-box-shadow:1px 3px 4px 0 #111111;-webkit-box-shadow:1px 3px 4px 0 #111111;-ms-box-shadow:1px 3px 4px 0 #111111;box-shadow:1px 3px 4px 0 #111111;color:#2e302e;cursor:pointer;font-weight:bold;width:auto;-moz-text-shadow:1px 1px #111111;-o-text-shadow:1px 1px #111111;-webkit-text-shadow:1px 1px #111111;-ms-text-shadow:1px 1px #111111;text-shadow:1px 1px #111111;} input[type="submit"]:active,input[type="button"]:active{-moz-box-shadow:0 0 0 0 #111111;-o-box-shadow:0 0 0 0 #111111;-webkit-box-shadow:0 0 0 0 #111111;-ms-box-shadow:0 0 0 0 #111111;box-shadow:0 0 0 0 #111111;} h1,h2,h3,h4,h5,h6{margin:10px 0px;font-weight:bold;border-bottom:1px solid #638ec4;} @@ -55,9 +56,9 @@ h6{font-size:xx-small;} .action{margin:5px 0;} .tool{margin:5px 0;list-style:none;} #articlemain{width:100%;height:100%;margin:0 auto;} -.button,#profile-listing-desc{color:#eeeecc;padding:5px;cursor:pointer;}.button.active,#profile-listing-desc.active{-moz-box-shadow:4px 4px 7px 0px #111111;-o-box-shadow:4px 4px 7px 0px #111111;-webkit-box-shadow:4px 4px 7px 0px #111111;-ms-box-shadow:4px 4px 7px 0px #111111;box-shadow:4px 4px 7px 0px #111111;} -.button a,#profile-listing-desc a{color:#eeeecc;font-weight:bold;} -[class$="-desc"],[id$="-desc"]{color:#eeeecc;background:#2e2f2e;border:1px outset #eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;} +.button{color:#eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;padding:5px;cursor:pointer;}.button a{color:#eeeecc;font-weight:bold;} +#profile-listing-desc a{color:#eeeecc;font-weight:bold;} +[class$="-desc"],[id$="-desc"]{color:#eeeecc;background:#2e2f2e;border:3px outset #eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;} #item-delete-selected-desc{float:left;margin-right:5px;}#item-delete-selected-desc:hover{text-decoration:underline;} .intro-approve-as-friend-desc{margin-top:10px;} .intro-desc{margin-bottom:20px;font-weight:bold;} @@ -105,9 +106,9 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm #nav-buttons{clear:both;list-style:none;padding:0px;margin:0px;height:25px;}#nav-buttons>li{padding:0;display:inline-block;margin:0px -4px 0px 0px;} .floaterflip{display:block;position:fixed;z-index:110;top:56px;right:19px;width:22px;height:22px;overflow:hidden;margin:0px;background:transparent url(dark/icons.png) -190px -60px no-repeat;} .search-box{display:inline-block;margin:5px;position:fixed;right:0px;bottom:0px;z-index:100;background:#1d1f1d;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;} -#search-text,#mini-search-text{background:#2e2f2e;color:#eeeecc;margin:8px;} -#search-text{border:1px solid #eeeecc;} -#mini-search-text{font-size:8pt;height:14px;width:10em;} +#search-text,#mini-search-text{background:white;color:#2e2f2e;margin:8px;} +#search-text{border:1px solid #eeeeee;margin:8px 0;} +#mini-search-text{font-size:8pt;height:14px;width:10em;margin:5px;} #scrollup{position:fixed;right:5px;bottom:40px;z-index:100;}#scrollup a:hover{text-decoration:none;border:0;} #user-menu{-moz-box-shadow:5px 0 10px 0 #111111;-o-box-shadow:5px 0 10px 0 #111111;-webkit-box-shadow:5px 0 10px 0 #111111;-ms-box-shadow:5px 0 10px 0 #111111;box-shadow:5px 0 10px 0 #111111;display:block;width:75%;margin:3px 0 0 0;position:relative;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;background-color:#555753;background-image:url("data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAIAAwDASIAAhEBAxEB/8QAFgABAQEAAAAAAAAAAAAAAAAAAAMH/8QAIhAAAQMEAgIDAAAAAAAAAAAAAQIDBAAFBhESIQdBMVFh/8QAFQEBAQAAAAAAAAAAAAAAAAAAAgP/xAAXEQEBAQEAAAAAAAAAAAAAAAABAAIR/9oADAMBAAIRAxEAPwCXiHO8dbsEi35BEhIehNlbUhxhBU82O+G9bKgToD2D+VlmZX9OWZBJuAiMxGlni0w0gJCED4HXv7pSi6eFML//2Q==");background-position:98% center;background-repeat:no-repeat;clear:both;top:4px;left:10px;padding:2px;}#user-menu>a{vertical-align:top;outline:0 none;} #user-menu-label{font-size:small;padding:3px 20px 9px 5px;height:10px;} @@ -120,7 +121,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm #intro-update{background-position:-120px 0px;} #lang-select-icon{cursor:pointer;position:fixed;left:28px;bottom:6px;z-index:10;} #language-selector{position:fixed;bottom:2px;left:52px;z-index:10;} -.menu-popup{position:absolute;display:none;width:11em;background:white;color:#2e2f2e;margin:0px;padding:0px;border:3px solid #88a9d2;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;z-index:100000;-moz-box-shadow:5px 5px 5px 0px #111111;-o-box-shadow:5px 5px 5px 0px #111111;-webkit-box-shadow:5px 5px 5px 0px #111111;-ms-box-shadow:5px 5px 5px 0px #111111;box-shadow:5px 5px 5px 0px #111111;}.menu-popup a{display:block;color:#2e2f2e;padding:5px 10px;text-decoration:none;}.menu-popup a:hover{color:#eeeecc;background-color:#88a9d2;} +.menu-popup{position:absolute;display:none;background:white;color:#2e2f2e;margin:0px;padding:0px;font-size:small;line-height:1.1;border:3px solid #88a9d2;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;z-index:100000;-moz-box-shadow:5px 5px 5px 0px #111111;-o-box-shadow:5px 5px 5px 0px #111111;-webkit-box-shadow:5px 5px 5px 0px #111111;-ms-box-shadow:5px 5px 5px 0px #111111;box-shadow:5px 5px 5px 0px #111111;}.menu-popup a{display:block;color:#2e2f2e;padding:5px 10px;text-decoration:none;}.menu-popup a:hover{color:#eeeecc;background-color:#88a9d2;} .menu-popup .menu-sep{border-top:1px solid #4e4f4e;} .menu-popup li{float:none;overflow:auto;height:auto;display:block;}.menu-popup li img{float:left;width:16px;height:16px;padding-right:5px;} .menu-popup .empty{padding:5px;text-align:center;color:#9ea8ac;} @@ -155,7 +156,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm #profile-jot-text_tbl{margin-bottom:10px;background:#777777;} #profile-jot-text_ifr{width:99.900002% !important;} #profile-jot-text_toolbargroup,.mceCenter tr{background:#777777;} -[id$="jot-text_ifr"]{width:99.900002% !important;color:#2e2f2e;background:#eeeecc;}[id$="jot-text_ifr"] .mceContentBody{color:#2e2f2e;background:#eeeecc;} +[id$="jot-text_ifr"]{color:#2e2f2e;background:#eeeecc;}[id$="jot-text_ifr"] .mceContentBody{color:#2e2f2e;background:#eeeecc;} .defaultSkin tr.mceFirst{background:#777777;} .defaultSkin td.mceFirst,.defaultSkin td.mceLast{background-color:#eeeecc;} .defaultSkin span.mceIcon,.defaultSkin img.mceIcon,.defaultSkin .mceButtonDisabled .mceIcon{background-color:#eeeecc;} @@ -187,10 +188,10 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm #jot-preview-content{background-color:#2e3436;color:#eeeecc;border:1px solid #2e2f2e;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:5px 0 10px 0px #111111;-o-box-shadow:5px 0 10px 0px #111111;-webkit-box-shadow:5px 0 10px 0px #111111;-ms-box-shadow:5px 0 10px 0px #111111;box-shadow:5px 0 10px 0px #111111;padding:3px 3px 6px 10px;}#jot-preview-content .wall-item-outside-wrapper{border:0;-o-border-radius:0px 0px 0px 0px;-webkit-border-radius:0px 0px 0px 0px;-moz-border-radius:0px 0px 0px 0px;-ms-border-radius:0px 0px 0px 0px;border-radius:0px 0px 0px 0px;-moz-box-shadow:0 0 0 0 #111111;-o-box-shadow:0 0 0 0 #111111;-webkit-box-shadow:0 0 0 0 #111111;-ms-box-shadow:0 0 0 0 #111111;box-shadow:0 0 0 0 #111111;} #sectionmain{margin:20px;font-size:0.8em;min-width:475px;width:67%;float:left;display:inline;} .tabs{margin:0px;padding:0px;list-style:none;list-style-position:inside;margin:10px 0;}.tabs li{display:inline;font-size:smaller;} -.tab{border:1px solid #638ec4;padding:4px;}.tab:hover,.tab:active{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;} -.tab.active{background:#eeeecc;color:#2e2f2e;border:1px solid #638ec4;}.tab.active:hover{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;} -.tab.active a{color:#2e2f2e;text-decoration:none;} +.tab{border:1px solid #638ec4;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.tab:active,.tab:hover{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;} .tab a{border:0;text-decoration:none;} +.tab.active{background:#eeeecc;color:#2e2f2e;border:1px solid #638ec4;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.tab.active:hover{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;} +.tab.active a{color:#2e2f2e;text-decoration:none;} .wall-item-outside-wrapper{border:1px solid #a9a9a9;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:6px 1px 10px -2px #111111;-o-box-shadow:6px 1px 10px -2px #111111;-webkit-box-shadow:6px 1px 10px -2px #111111;-ms-box-shadow:6px 1px 10px -2px #111111;box-shadow:6px 1px 10px -2px #111111;}.wall-item-outside-wrapper.comment{margin-top:5px;} .wall-item-content-wrapper{position:relative;padding:0.75em;width:auto;} .wall-item-outside-wrapper .wall-item-comment-wrapper{} @@ -243,7 +244,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm .comment-edit-submit{height:22px;background-color:#555753;color:#eeeeee;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;border:0;} .wall-item-body code{background-color:#444444;border-bottom:1px dashed #cccccc;border-left:5px solid #cccccc;border-top:1px dashed #cccccc;color:#eeeecc;display:block;overflow-x:auto;padding:5px 0 15px 10px;width:95%;}.wall-item-body code a{color:#adc4e0;} div[id$="text"]{font-weight:bold;border-bottom:1px solid #cccccc;} -div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:left;} +div[id$="wrapper"]{height:100%;}div[id$="wrapper"] br{clear:left;} .profile-match-wrapper{float:left;margin:0 5px 40px 0;width:120px;height:120px;padding:3px;position:relative;} .icon.drophide.profile-match-ignore{margin:0 6px 0 -3px;} [id$="-end"],[class$="-end"]{clear:both;margin:0 0 10px 0;} @@ -317,17 +318,16 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le #contact-edit-last-update-text{margin-bottom:15px;} #contact-edit-last-updated{font-weight:bold;} #contact-edit-poll-text{display:inline;} -#contact-edit-info_tbl,#contact-edit-info_parent,.mceLayout{width:100%;} #contact-edit-end{clear:both;margin-bottom:65px;} .contact-photo-menu-button{position:absolute;background:url("dark/photo-menu.jpg") top left no-repeat transparent;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:#2e2f2e;color:#eeeecc;position:absolute;left:0px;top:90px;display:none;z-index:10000;}.contact-photo-menu li a{display:block;padding:2px;}.contact-photo-menu li a:hover{color:white;background:#3465A4;text-decoration:none;} +.contact-photo-menu{width:auto;border:2px solid #88a9d2;background:#2e2f2e;color:#eeeecc;position:absolute;font-size:smaller;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;left:0px;top:90px;display:none;z-index:10000;}.contact-photo-menu li a{display:block;padding:4px;color:#88a9d2;background:#eeeecc;line-height:1;}.contact-photo-menu li a:hover{background:#88a9d2;color:#eeeecc;text-decoration:none;} #id_openid_url{background:url(dark/login-bg.gif) no-repeat;background-position:0 50%;padding-left:18px;} #settings-default-perms{margin-bottom:20px;} #register-form div,#profile-edit-form div{clear:both;} .settings-block label{clear:left;} .settings-block input{margin:10px 5px;} -#register-form label,#profile-edit-form label{width:300px;float:left;} -#register-form span,#profile-edit-form span{color:#555753;display:block;margin-bottom:20px;} +#register-form label,#profile-edit-form label{width:23em;} +#register-form span,#profile-edit-form span{color:#555753;display:inline-block;margin-bottom:20px;} #profile-edit-marital-label span{margin:-4px;} .settings-submit-wrapper,.profile-edit-submit-wrapper{margin:0 0 30px;} .profile-edit-side-div{display:none;} @@ -389,18 +389,19 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le .fc-state-highlight{background:#eeeecc;color:#2e2f2e;} .directory-item{float:left;margin:0 5px 4px 0;padding:3px;width:180px;height:250px;position:relative;} #group-sidebar{margin-bottom:10px;} -.group-selected,.nets-selected,.fileas-selected{padding:3px;color:#2e2f2e;background:#eeeecc;border:1px solid #88a9d2;} -.group-selected:hover,.nets-selected:hover,.fileas-selected:hover{padding:3px;color:#88a9d2;background:#2e2f2e;border:1px solid #88a9d2;} +.group-selected,.nets-selected,.fileas-selected{background:#eeeecc;color:#2e2f2e;border:1px solid #638ec4;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.group-selected:hover,.nets-selected:hover,.fileas-selected:hover{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;} +.group-selected a,.nets-selected a,.fileas-selected a{color:#2e2f2e;text-decoration:none;} .groupsideedit{margin-right:10px;} #sidebar-group-ul{padding-left:0;} #sidebar-group-list{margin:0 0 5px 0;}#sidebar-group-list li{margin-top:10px;} #sidebar-group-list .icon{display:inline-block;width:12px;height:12px;} -.sidebar-group-element{padding:3px;}.sidebar-group-element:hover{color:#eeeecc;background:#2e3436;border:1px solid #638ec4;padding:3px;} +.sidebar-group-element{border:1px solid #638ec4;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.sidebar-group-element:active,.sidebar-group-element:hover{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;} +.sidebar-group-element a{border:0;text-decoration:none;} #sidebar-new-group{margin:auto;display:inline-block;color:#eeeeee;text-decoration:none;text-align:center;} #peoplefind-sidebar form{margin-bottom:10px;} #sidebar-new-group:hover{} #sidebar-new-group:active{position:relative;top:1px;} -#side-peoplefind-url{background-color:#2e2f2e;color:#eeeecc;border:1px solid #999999;margin-right:3px;width:75%;}#side-peoplefind-url:hover,#side-peoplefind-url:focus{background-color:#eeeeee;color:#222222;border:1px solid #333333;} +#side-peoplefind-url{border:1px solid #999999;margin-right:3px;width:75%;} .nets-ul{margin:0px;padding:0px;list-style:none;list-style-position:inside;}.nets-ul li{margin:10px 0 0;} .nets-link,.nets-all{margin-left:0px;} #netsearch-box{margin:20px 0px 30px;width:135px;}#netsearch-box #search-submit{margin:5px 5px 0px 0px;} diff --git a/view/theme/dispy/dark/style.less b/view/theme/dispy/dark/style.less index 4967ac9c2..000918a9b 100644 --- a/view/theme/dispy/dark/style.less +++ b/view/theme/dispy/dark/style.less @@ -190,7 +190,7 @@ label { font-size: small; margin: 0 10px 1em 0; .borders(1px, solid, @bg_colour); - padding: 5px; + padding: 3px 5px; background: @main_colour; color: darken(@main_alt_colour, 86.5%); .box_shadow(3px, 3px, 5px); @@ -198,10 +198,14 @@ label { input { .box(250px, 25px); .borders(1px, solid, darken(@main_alt_colour, 33.5%)); + width: 17em; &[type="checkbox"], &[type="radio"] { - margin: 0; .box(15px, 15px); + margin: 0; + } + &[type="radio"] { + margin: 5px 0; } &[type="submit"], &[type="button"] { @@ -280,30 +284,35 @@ h6 { .box(100%, 100%); margin: 0 auto; } -.button, -#profile-listing-desc { +.button { // .box(25%, auto); // background: @menu_bg_colour; color: @main_colour; // .borders(2px, outset, darken(@menu_bg_colour, 20%)); - // .rounded_corners; + .rounded_corners; padding: 5px; // font-size: smaller; cursor: pointer; - &.active { - .box_shadow(4px, 4px, 7px); - } + // &.active { + // .box_shadow(4px, 4px, 7px); + // } a { color: @main_colour; // font-size: smaller; font-weight: bold; } } +#profile-listing-desc { + a { + color: @main_colour; + font-weight: bold; + } +} [class$="-desc"], [id$="-desc"] { color: @main_colour; background: @bg_colour; - .borders(1px, outset, @main_colour); + .borders(3px, outset, @main_colour); .rounded_corners; // .box_shadow(3px, 3px, 5px); margin: 3px 10px 7px 0; @@ -658,17 +667,19 @@ nav #nav-notifications-linkmenu { } #search-text, #mini-search-text { - background: @bg_colour; - color: @main_colour; + background: white; + color: @bg_colour; margin: 8px; } #search-text { - .borders; + .borders(1px, solid, @main_alt_colour); + margin: 8px 0; } #mini-search-text { font-size: 8pt; height: 14px; width: 10em; + margin: 5px; } #scrollup { position: fixed; @@ -754,11 +765,13 @@ nav #nav-notifications-linkmenu { .menu-popup { position: absolute; display: none; - width: 11em; + // width: 11em; background: white; color: @bg_colour; margin: 0px; padding: 0px; + font-size: small; + line-height: 1.1; .borders(3px, solid, @link_colour); .rounded_corners; z-index: 100000; @@ -1016,7 +1029,7 @@ nav #nav-notifications-linkmenu { background: darken(@main_alt_colour, 46.8%); } [id$="jot-text_ifr"] { - width: 99.900002% !important; + // width: 99.900002% !important; color: @bg_colour; background: @main_colour; .mceContentBody { @@ -1226,34 +1239,45 @@ nav #nav-notifications-linkmenu { font-size: smaller; } } -.tab { +.multibutton () { .borders(1px, solid, @hover_colour); padding: 4px; - &:hover, - &:active { + .rounded_corners; + &:active, + &:hover { background: @shiny_colour; color: @main_colour; .borders(1px, solid, @hover_colour); } - &.active { - background: @main_colour; - color: @bg_colour; + a { + border: 0; + text-decoration: none; + } +} +.multibutton_active () { + background: @main_colour; + color: @bg_colour; + .borders(1px, solid, @hover_colour); + padding: 4px; + .rounded_corners; + &:hover { + background: @shiny_colour; + color: @main_colour; .borders(1px, solid, @hover_colour); - &:hover { - background: @shiny_colour; - color: @main_colour; - .borders(1px, solid, @hover_colour); - } - a { - color: @bg_colour; - text-decoration: none; - } } a { - border: 0; + color: @bg_colour; text-decoration: none; } } +.tab { + .multibutton; +} +.tab { + &.active { + .multibutton_active; + } +} /** @@ -1595,7 +1619,6 @@ div { } &[id$="wrapper"] { height: 100%; - margin-bottom: 1em; br { clear: left; } @@ -1933,11 +1956,6 @@ div { #contact-edit-poll-text { display: inline; } -#contact-edit-info_tbl, -#contact-edit-info_parent, -.mceLayout { - width: 100%; -} #contact-edit-end { clear: both; margin-bottom: 65px; @@ -1956,20 +1974,25 @@ div { } .contact-photo-menu { width: auto; - .borders(2px, solid, darken(@main_alt_colour, 66.5%)); + .borders(2px, solid, @link_colour); background: @bg_colour; color: @main_colour; position: absolute; + font-size: smaller; + .rounded_corners; left: 0px; top: 90px; display: none; z-index: 10000; li a { display: block; - padding: 2px; + padding: 4px; + color: @link_colour; + background: @main_colour; + line-height: 1; &:hover { - color: white; - background: #3465A4; + background: @link_colour; + color: @main_colour; text-decoration: none; } } @@ -2001,13 +2024,12 @@ div { } #register-form label, #profile-edit-form label { - width: 300px; - float: left; + width: 23em; } #register-form span, #profile-edit-form span { color: @menu_bg_colour; - display: block; + display: inline-block; margin-bottom: 20px; } #profile-edit-marital-label span { @@ -2020,12 +2042,6 @@ div { .profile-edit-side-div { display: none; } -/*.profile-edit-side-div:hover { - display: block; -} -.profile-edit-side-link { - margin: 3px 0px 0px 70px; -}*/ #profiles-menu-trigger { margin: 0px 0px 0px 25px; } @@ -2320,19 +2336,20 @@ div { .group-selected, .nets-selected, .fileas-selected { - padding: 3px; - color: @bg_colour; - background: @main_colour; - .borders(1px, solid, @link_colour); -} -.group-selected:hover, -.nets-selected:hover, -.fileas-selected:hover { - padding: 3px; - color: @link_colour; - background: @bg_colour; - .borders(1px, solid, @link_colour); -} + // padding: 4px; + // color: @bg_colour; + // background: @main_colour; + // .borders(1px, solid, @link_colour); + .multibutton_active; +} +// .group-selected:hover, +// .nets-selected:hover, +// .fileas-selected:hover { +// padding: 4px; +// color: @link_colour; +// background: @bg_colour; +// .borders(1px, solid, @link_colour); +// } .groupsideedit { margin-right: 10px; } @@ -2350,13 +2367,8 @@ div { } } .sidebar-group-element { - padding: 3px; - &:hover { - color: @main_colour; - background: @shiny_colour; - .borders(1px, solid, @hover_colour); - padding: 3px; - } + .multibutton; + .rounded_corners; } #sidebar-new-group { margin: auto; @@ -2380,17 +2392,9 @@ div { } } #side-peoplefind-url { - background-color: @bg_colour; - color: @main_colour; .borders(1px, solid, darken(@main_alt_colour, 33.5%)); margin-right: 3px; width: 75%; - &:hover, - &:focus { - background-color: @main_alt_colour; - color: darken(@main_alt_colour, 80%); - .borders(1px, solid, darken(@main_alt_colour, 73.5%)); - } } .nets-ul { .list_reset; diff --git a/view/theme/dispy/dark/theme.php b/view/theme/dispy/dark/theme.php index 339c477a0..e156b6a7d 100644 --- a/view/theme/dispy/dark/theme.php +++ b/view/theme/dispy/dark/theme.php @@ -1,19 +1,19 @@ <?php /* -* Name: Dispy Dark -* Description: Dispy Dark: Dark, Spartan, Sleek, and Functional -* Version: 1.2 -* Author: Simon <http://simon.kisikew.org/> -* Maintainer: Simon <http://simon.kisikew.org/> -* Screenshot: <a href="screenshot.jpg">Screenshot</a> -*/ + * Name: Dispy Dark + * Description: Dispy Dark: Dark, Spartan, Sleek, and Functional + * Version: 1.2.1 + * Author: Simon <http://simon.kisikew.org/> + * Maintainer: Simon <http://simon.kisikew.org/> + * Screenshot: <a href="screenshot.jpg">Screenshot</a> + */ $a = get_app(); $a->theme_info = array( 'family' => 'dispy', 'name' => 'dark', - 'version' => '1.2' + 'version' => '1.2.1' ); function dispy_dark_init(&$a) { diff --git a/view/theme/dispy/light/_base.less b/view/theme/dispy/light/_base.less index 70576145c..3046c1bac 100644 --- a/view/theme/dispy/light/_base.less +++ b/view/theme/dispy/light/_base.less @@ -59,7 +59,8 @@ @dk_main_colour: darken(@bg_colour, 10%); //* links */ -@link_colour: #3465a4; +// yes our link colour is "friendica blue" ;) +@link_colour: @friendica_blue; @dk_link_colour: darken(@link_colour, 10%); @lt_link_colour: lighten(@link_colour, 10%); //@hover_colour: #729fcf; diff --git a/view/theme/dispy/light/connect.png b/view/theme/dispy/light/connect.png Binary files differdeleted file mode 100644 index b76fc13dc..000000000 --- a/view/theme/dispy/light/connect.png +++ /dev/null diff --git a/view/theme/dispy/light/style.css b/view/theme/dispy/light/style.css index 1099f0913..bd3da3189 100644 --- a/view/theme/dispy/light/style.css +++ b/view/theme/dispy/light/style.css @@ -13,7 +13,7 @@ audio,canvas,video,time{display:inline-block;*display:inline;*zoom:1;} audio:not([controls]),[hidden]{display:none;} html{font-size:100%;overflow-y:scroll;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;-o-text-size-adjust:100%;font-size-adjust:100%;} body{margin:0;padding:0;font-size:14pt;line-height:1.1em;font-family:sans-serif;color:#111111;background-color:#eeeeec;} -button,input,select,textarea{color:#111111;background-color:#eeeeec;} +button,input,select,textarea{color:#111111;background-color:white;} select{border:1px dotted #555555;padding:1px;margin:3px;color:#111111;background:#eeeeec;max-width:85%;min-width:85px;} option{padding:1px;color:#111111;background:#eeeeec;}option[selected="selected"]{color:#eeeeec;background:#2e3436;} tr:nth-child(even){background-color:#d6d6d1;} @@ -37,8 +37,9 @@ img{border:0 none;} a{color:#3465a4;text-decoration:none;margin-bottom:1px;}a:hover{color:#284d7d;border-bottom:1px dotted #284d7d;} a:hover img{text-decoration:none;} blockquote{background:#aaaaaa;color:#111111;text-indent:5px;padding:5px;border:1px solid #111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;} -label{width:38%;display:inline-block;font-size:small;margin:0 10px 1em 0;border:1px solid #eeeeec;padding:5px;background:#cccccc;color:#111111;-moz-box-shadow:3px 3px 5px 0px #111111;-o-box-shadow:3px 3px 5px 0px #111111;-webkit-box-shadow:3px 3px 5px 0px #111111;-ms-box-shadow:3px 3px 5px 0px #111111;box-shadow:3px 3px 5px 0px #111111;} -input{width:250px;height:25px;border:1px solid #444444;}input[type="checkbox"],input[type="radio"]{margin:0;width:15px;height:15px;} +label{width:38%;display:inline-block;font-size:small;margin:0 10px 1em 0;border:1px solid #eeeeec;padding:3px 5px;background:#cccccc;color:#111111;-moz-box-shadow:3px 3px 5px 0px #111111;-o-box-shadow:3px 3px 5px 0px #111111;-webkit-box-shadow:3px 3px 5px 0px #111111;-ms-box-shadow:3px 3px 5px 0px #111111;box-shadow:3px 3px 5px 0px #111111;} +input{width:250px;height:25px;border:1px solid #444444;width:17em;}input[type="checkbox"],input[type="radio"]{width:15px;height:15px;margin:0;} +input[type="radio"]{margin:5px 0;} input[type="submit"],input[type="button"]{background-color:#555753;border:2px outset #444444;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:1px 3px 4px 0 #111111;-o-box-shadow:1px 3px 4px 0 #111111;-webkit-box-shadow:1px 3px 4px 0 #111111;-ms-box-shadow:1px 3px 4px 0 #111111;box-shadow:1px 3px 4px 0 #111111;color:#eeeeec;cursor:pointer;font-weight:bold;width:auto;-moz-text-shadow:1px 1px #111111;-o-text-shadow:1px 1px #111111;-webkit-text-shadow:1px 1px #111111;-ms-text-shadow:1px 1px #111111;text-shadow:1px 1px #111111;} input[type="submit"]:active,input[type="button"]:active{-moz-box-shadow:0 0 0 0 #111111;-o-box-shadow:0 0 0 0 #111111;-webkit-box-shadow:0 0 0 0 #111111;-ms-box-shadow:0 0 0 0 #111111;box-shadow:0 0 0 0 #111111;} h1,h2,h3,h4,h5,h6{margin:10px 0px;font-weight:bold;border-bottom:1px solid #284d7d;} @@ -55,9 +56,9 @@ h6{font-size:xx-small;} .action{margin:5px 0;} .tool{margin:5px 0;list-style:none;} #articlemain{width:100%;height:100%;margin:0 auto;} -.button,#profile-listing-desc{color:#111111;padding:5px;cursor:pointer;}.button.active,#profile-listing-desc.active{-moz-box-shadow:4px 4px 7px 0px #111111;-o-box-shadow:4px 4px 7px 0px #111111;-webkit-box-shadow:4px 4px 7px 0px #111111;-ms-box-shadow:4px 4px 7px 0px #111111;box-shadow:4px 4px 7px 0px #111111;} -.button a,#profile-listing-desc a{color:#eeeeec;font-weight:bold;} -[class$="-desc"],[id$="-desc"]{color:#eeeeec;background:#111111;border:1px outset #eeeeec;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;} +.button{color:#111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;padding:5px;cursor:pointer;}.button a{color:#111111;font-weight:bold;} +#profile-listing-desc a{color:#eeeeec;font-weight:bold;} +[class$="-desc"],[id$="-desc"]{color:#eeeeec;background:#2e3436;border:3px outset #111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;} #item-delete-selected-desc{float:left;margin-right:5px;}#item-delete-selected-desc:hover{text-decoration:underline;} .intro-approve-as-friend-desc{margin-top:10px;} .intro-desc{margin-bottom:20px;font-weight:bold;} @@ -106,8 +107,8 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm .floaterflip{display:block;position:fixed;z-index:110;top:56px;right:19px;width:22px;height:22px;overflow:hidden;margin:0px;background:transparent url(light/icons.png) -190px -60px no-repeat;} .search-box{display:inline-block;margin:5px;position:fixed;right:0px;bottom:0px;z-index:100;background:#2e3436;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;} #search-text,#mini-search-text{background:white;color:#111111;margin:8px;} -#search-text{border:1px solid #999999;} -#mini-search-text{font-size:8pt;height:14px;width:10em;} +#search-text{border:1px solid #999999;margin:8px 0;} +#mini-search-text{font-size:8pt;height:14px;width:10em;margin:5px;} #scrollup{position:fixed;right:5px;bottom:40px;z-index:100;}#scrollup a:hover{text-decoration:none;border:0;} #user-menu{-moz-box-shadow:5px 0 10px 0 #111111;-o-box-shadow:5px 0 10px 0 #111111;-webkit-box-shadow:5px 0 10px 0 #111111;-ms-box-shadow:5px 0 10px 0 #111111;box-shadow:5px 0 10px 0 #111111;display:block;width:75%;margin:3px 0 0 0;position:relative;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;background-color:#555753;background-image:url("data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAIAAwDASIAAhEBAxEB/8QAFgABAQEAAAAAAAAAAAAAAAAAAAMH/8QAIhAAAQMEAgIDAAAAAAAAAAAAAQIDBAAFBhESIQdBMVFh/8QAFQEBAQAAAAAAAAAAAAAAAAAAAgP/xAAXEQEBAQEAAAAAAAAAAAAAAAABAAIR/9oADAMBAAIRAxEAPwCXiHO8dbsEi35BEhIehNlbUhxhBU82O+G9bKgToD2D+VlmZX9OWZBJuAiMxGlni0w0gJCED4HXv7pSi6eFML//2Q==");background-position:98% center;background-repeat:no-repeat;clear:both;top:4px;left:10px;padding:2px;}#user-menu>a{vertical-align:top;outline:0 none;} #user-menu-label{font-size:small;padding:3px 20px 9px 5px;height:10px;} @@ -120,7 +121,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm #intro-update{background-position:-120px 0px;} #lang-select-icon{cursor:pointer;position:fixed;left:28px;bottom:6px;z-index:10;} #language-selector{position:fixed;bottom:2px;left:52px;z-index:10;} -.menu-popup{position:absolute;display:none;width:11em;background:white;color:#111111;margin:0px;padding:0px;border:3px solid #3465a4;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;z-index:100000;-moz-box-shadow:5px 5px 5px 0px #111111;-o-box-shadow:5px 5px 5px 0px #111111;-webkit-box-shadow:5px 5px 5px 0px #111111;-ms-box-shadow:5px 5px 5px 0px #111111;box-shadow:5px 5px 5px 0px #111111;}.menu-popup a{display:block;color:#111111;padding:5px 10px;text-decoration:none;}.menu-popup a:hover{color:#eeeeec;background-color:#3465a4;} +.menu-popup{position:absolute;display:none;background:white;color:#111111;margin:0px;padding:0px;font-size:small;line-height:1.1;border:3px solid #3465a4;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;z-index:100000;-moz-box-shadow:5px 5px 5px 0px #111111;-o-box-shadow:5px 5px 5px 0px #111111;-webkit-box-shadow:5px 5px 5px 0px #111111;-ms-box-shadow:5px 5px 5px 0px #111111;box-shadow:5px 5px 5px 0px #111111;}.menu-popup a{display:block;color:#111111;padding:5px 10px;text-decoration:none;}.menu-popup a:hover{color:#eeeeec;background-color:#3465a4;} .menu-popup .menu-sep{border-top:1px solid #4e4f4e;} .menu-popup li{float:none;overflow:auto;height:auto;display:block;}.menu-popup li img{float:left;width:16px;height:16px;padding-right:5px;} .menu-popup .empty{padding:5px;text-align:center;color:#ffffff;} @@ -140,7 +141,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm #asidemain #contact-block{width:99%;}#asidemain #contact-block .contact-block-content{width:99%;}#asidemain #contact-block .contact-block-content .contact-block-div{float:left;margin:0 5px 5px 0;width:50px;height:50px;padding:3px;position:relative;} .aprofile dt{background:transparent;color:#666666;font-weight:bold;-moz-box-shadow:3px 3px 5px 0px #111111;-o-box-shadow:3px 3px 5px 0px #111111;-webkit-box-shadow:3px 3px 5px 0px #111111;-ms-box-shadow:3px 3px 5px 0px #111111;box-shadow:3px 3px 5px 0px #111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:15px 0 5px;padding-left:5px;} #profile-extra-links ul{margin-left:0px;padding-left:0px;list-style:none;} -#dfrn-request-link{-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;color:#111111;display:block;font-size:1.2em;padding:0.2em 0.5em;background-color:#3465a4;background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAOCAYAAAAmL5yKAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAE4SURBVCiRpZKxLgRRFIa//64dKruZFRIlolBviFKiVHsHrRaFikTCC+hEQtRegMQDqDUKJOPOvauSMJmjYEU2M0viT071/+fLOTlHZkadQgjLkh1LPEoj661WKw5mXG034JxtAgtmrJoVK5WZYYCy1AVQSOYbjeSqMmRmQ8v755Ne77lb5w+d4HMNJopCT7X+bwDQZKfTyf4BIAHeawHe+/kQ/FGM+QagvpFl2VSM/tyMmV7PV14AYMQ5nUp0AULIp0HXzpVvSdLYMmNVAjNdAuNAUQHgxy/ZvEQTSMw0A33DxkIIi2ma3gwC9PKSzRWF2wbdpml62DfyPF9yjlNgAnQGLJjZnXON3Xa7ff8NGPbKQPNrbAOI0a9J2ilLEzAL7P0GqJJizF+BUeDhL2cclJnZPvAg6eADf+imKjSMX1wAAAAASUVORK5CYII=");background-repeat:no-repeat;background-position:95% center;} +#dfrn-request-link{-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;color:#eeeeec;display:block;font-size:1.2em;padding:0.2em 0.5em;background-color:#3465a4;background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAOCAYAAAAmL5yKAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAE4SURBVCiRpZKxLgRRFIa//64dKruZFRIlolBviFKiVHsHrRaFikTCC+hEQtRegMQDqDUKJOPOvauSMJmjYEU2M0viT071/+fLOTlHZkadQgjLkh1LPEoj661WKw5mXG034JxtAgtmrJoVK5WZYYCy1AVQSOYbjeSqMmRmQ8v755Ne77lb5w+d4HMNJopCT7X+bwDQZKfTyf4BIAHeawHe+/kQ/FGM+QagvpFl2VSM/tyMmV7PV14AYMQ5nUp0AULIp0HXzpVvSdLYMmNVAjNdAuNAUQHgxy/ZvEQTSMw0A33DxkIIi2ma3gwC9PKSzRWF2wbdpml62DfyPF9yjlNgAnQGLJjZnXON3Xa7ff8NGPbKQPNrbAOI0a9J2ilLEzAL7P0GqJJizF+BUeDhL2cclJnZPvAg6eADf+imKjSMX1wAAAAASUVORK5CYII=");background-repeat:no-repeat;background-position:95% center;} #wallmessage-link{color:#eeeeec;display:block;font-size:1.2em;padding:0.2em 0.5em;} .ttright{margin:0px;} .contact-block-div{width:50px;height:50px;float:left;} @@ -155,7 +156,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm #profile-jot-text_tbl{margin-bottom:10px;background:#808080;} #profile-jot-text_ifr{width:99.900002% !important;} #profile-jot-text_toolbargroup,.mceCenter tr{background:#808080;} -[id$="jot-text_ifr"]{width:99.900002% !important;color:#111111;background:#eeeeec;}[id$="jot-text_ifr"] .mceContentBody{color:#111111;background:#eeeeec;} +[id$="jot-text_ifr"]{color:#111111;background:#eeeeec;}[id$="jot-text_ifr"] .mceContentBody{color:#111111;background:#eeeeec;} .defaultSkin tr.mceFirst{background:#808080;} .defaultSkin td.mceFirst,.defaultSkin td.mceLast{background-color:#eeeeec;} .defaultSkin span.mceIcon,.defaultSkin img.mceIcon,.defaultSkin .mceButtonDisabled .mceIcon{background-color:#eeeeec;} @@ -187,10 +188,10 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm #jot-preview-content{background-color:#f2f2c3;color:#111111;border:1px solid #111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:5px 0 10px 0px #111111;-o-box-shadow:5px 0 10px 0px #111111;-webkit-box-shadow:5px 0 10px 0px #111111;-ms-box-shadow:5px 0 10px 0px #111111;box-shadow:5px 0 10px 0px #111111;padding:3px 3px 6px 10px;}#jot-preview-content .wall-item-outside-wrapper{border:0;-o-border-radius:0px 0px 0px 0px;-webkit-border-radius:0px 0px 0px 0px;-moz-border-radius:0px 0px 0px 0px;-ms-border-radius:0px 0px 0px 0px;border-radius:0px 0px 0px 0px;-moz-box-shadow:0 0 0 0 #111111;-o-box-shadow:0 0 0 0 #111111;-webkit-box-shadow:0 0 0 0 #111111;-ms-box-shadow:0 0 0 0 #111111;box-shadow:0 0 0 0 #111111;} #sectionmain{margin:20px;font-size:0.8em;min-width:475px;width:67%;float:left;display:inline;} .tabs{margin:0px;padding:0px;list-style:none;list-style-position:inside;margin:10px 0;}.tabs li{display:inline;font-size:smaller;} -.tab{border:1px solid #284d7d;padding:4px;}.tab:hover,.tab:active{background:#f2f2c3;color:#111111;border:1px solid #284d7d;} -.tab.active{background:#2e3436;color:#eeeeec;border:1px solid #284d7d;}.tab.active:hover{background:#f2f2c3;color:#111111;border:1px solid #284d7d;} -.tab.active a{color:#eeeeec;text-decoration:none;} +.tab{border:1px solid #284d7d;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.tab:active,.tab:hover{background:#f2f2c3;color:#111111;border:1px solid #284d7d;} .tab a{border:0;text-decoration:none;} +.tab.active{background:#2e3436;color:#eeeeec;border:1px solid #284d7d;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.tab.active:hover{background:#f2f2c3;color:#111111;border:1px solid #284d7d;} +.tab.active a{color:#eeeeec;text-decoration:none;} .wall-item-outside-wrapper{border:1px solid #545454;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:6px 1px 10px -2px #111111;-o-box-shadow:6px 1px 10px -2px #111111;-webkit-box-shadow:6px 1px 10px -2px #111111;-ms-box-shadow:6px 1px 10px -2px #111111;box-shadow:6px 1px 10px -2px #111111;}.wall-item-outside-wrapper.comment{margin-top:5px;} .wall-item-content-wrapper{position:relative;padding:0.75em;width:auto;} .wall-item-outside-wrapper .wall-item-comment-wrapper{} @@ -210,8 +211,8 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm .wall-item-title{font-size:1.2em;font-weight:bold;margin-bottom:1.4em;} .wall-item-body{margin:15px 10px 10px 0px;text-align:left;overflow-x:auto;} .wall-item-lock-wrapper{float:right;width:22px;height:22px;margin:0 -5px 0 0;opacity:1;} -.wall-item-dislike,.wall-item-like{clear:left;font-size:0.8em;color:#888b85;margin:5px 0 5px 10.2em;-webkit-transition:all 0.75s ease-in-out;-moz-transition:all 0.75s ease-in-out;-o-transition:all 0.75s ease-in-out;-ms-transition:all 0.75s ease-in-out;transition:all 0.75s ease-in-out;opacity:0.5;}.wall-item-dislike:hover,.wall-item-like:hover{opacity:1;} -.wall-item-author,.wall-item-actions-author,.wall-item-ago{clear:left;float:left;color:#eeeeec;line-height:1;display:inline-block;font-size:0.75em;margin:0.5em auto 0;} +.wall-item-dislike,.wall-item-like{clear:left;font-size:0.8em;color:#111111;margin:5px 0 5px 10.2em;-webkit-transition:all 0.75s ease-in-out;-moz-transition:all 0.75s ease-in-out;-o-transition:all 0.75s ease-in-out;-ms-transition:all 0.75s ease-in-out;transition:all 0.75s ease-in-out;opacity:0.5;}.wall-item-dislike:hover,.wall-item-like:hover{opacity:1;} +.wall-item-author,.wall-item-actions-author,.wall-item-ago{clear:left;float:left;color:#111111;line-height:1;display:inline-block;font-size:0.75em;margin:0.5em auto 0;} .wall-item-author,.wall-item-actions-author{margin:0.5em auto 0;font-size:0.75em;font-weight:bold;} .wall-item-location{margin-top:15px;width:100px;overflow:hidden;-moz-text-overflow:ellipsis;-ms-text-verflow:ellipsis;-o-text-overflow:ellipsis;-webkit-text-overflow:ellipsis;text-overflow:ellipsis;}.wall-item-location .icon{float:left;} .wall-item-location>a,.wall-item-location .smalltext{margin-left:25px;font-size:0.7em;display:block;} @@ -243,7 +244,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm .comment-edit-submit{height:22px;background-color:#555753;color:#eeeeec;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;border:0;} .wall-item-body code{background-color:#dddddd;border-bottom:1px dashed #888888;border-left:5px solid #888888;border-top:1px dashed #888888;color:#191919;display:block;overflow-x:auto;padding:5px 0 15px 10px;width:95%;}.wall-item-body code a{color:#477ec4;} div[id$="text"]{font-weight:bold;border-bottom:1px solid #eeeeec;} -div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:left;} +div[id$="wrapper"]{height:100%;}div[id$="wrapper"] br{clear:left;} .profile-match-wrapper{float:left;margin:0 5px 40px 0;width:120px;height:120px;padding:3px;position:relative;} .icon.drophide.profile-match-ignore{margin:0 6px 0 -3px;} [id$="-end"],[class$="-end"]{clear:both;margin:0 0 10px 0;} @@ -317,17 +318,16 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le #contact-edit-last-update-text{margin-bottom:15px;} #contact-edit-last-updated{font-weight:bold;} #contact-edit-poll-text{display:inline;} -#contact-edit-info_tbl,#contact-edit-info_parent,.mceLayout{width:100%;} #contact-edit-end{clear:both;margin-bottom:65px;} .contact-photo-menu-button{position:absolute;background:url("light/photo-menu.jpg") top left no-repeat transparent;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:#eeeeec;color:#111111;position:absolute;left:0px;top:90px;display:none;z-index:10000;}.contact-photo-menu li a{display:block;padding:2px;}.contact-photo-menu li a:hover{color:white;background:#3465A4;text-decoration:none;} +.contact-photo-menu{width:auto;border:2px solid #3465a4;background:#eeeeec;color:#111111;position:absolute;font-size:smaller;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;left:0px;top:90px;display:none;z-index:10000;}.contact-photo-menu li a{display:block;padding:4px;color:#3465a4;background:#eeeeec;line-height:1;}.contact-photo-menu li a:hover{background:#3465a4;color:#eeeeec;text-decoration:none;} #id_openid_url{background:url(light/login-bg.gif) no-repeat;background-position:0 50%;padding-left:18px;} #settings-default-perms{margin-bottom:20px;} #register-form div,#profile-edit-form div{clear:both;} .settings-block label{clear:left;} .settings-block input{margin:10px 5px;} -#register-form label,#profile-edit-form label{width:300px;float:left;} -#register-form span,#profile-edit-form span{color:#555753;display:block;margin-bottom:20px;} +#register-form label,#profile-edit-form label{width:23em;} +#register-form span,#profile-edit-form span{color:#555753;display:inline-block;margin-bottom:20px;} #profile-edit-marital-label span{margin:-4px;} .settings-submit-wrapper,.profile-edit-submit-wrapper{margin:0 0 30px;} .profile-edit-side-div{display:none;} @@ -389,18 +389,19 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le .fc-state-highlight{background:#eeeeec;color:#111111;} .directory-item{float:left;margin:0 5px 4px 0;padding:3px;width:180px;height:250px;position:relative;} #group-sidebar{margin-bottom:10px;} -.group-selected,.nets-selected,.fileas-selected{padding:3px;color:#eeeeec;background:#2e3436;border:1px solid #3465a4;} -.group-selected:hover,.nets-selected:hover,.fileas-selected:hover{padding:3px;color:#3465a4;background:#eeeeec;border:1px solid #3465a4;} +.group-selected,.nets-selected,.fileas-selected{background:#2e3436;color:#eeeeec;border:1px solid #284d7d;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.group-selected:hover,.nets-selected:hover,.fileas-selected:hover{background:#f2f2c3;color:#111111;border:1px solid #284d7d;} +.group-selected a,.nets-selected a,.fileas-selected a{color:#eeeeec;text-decoration:none;} .groupsideedit{margin-right:10px;} #sidebar-group-ul{padding-left:0;} #sidebar-group-list{margin:0 0 5px 0;}#sidebar-group-list li{margin-top:10px;} #sidebar-group-list .icon{display:inline-block;width:12px;height:12px;} -.sidebar-group-element{padding:3px;}.sidebar-group-element:hover{color:#111111;background:#f2f2c3;border:1px solid #284d7d;padding:3px;} +.sidebar-group-element{border:1px solid #284d7d;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.sidebar-group-element:active,.sidebar-group-element:hover{background:#f2f2c3;color:#111111;border:1px solid #284d7d;} +.sidebar-group-element a{border:0;text-decoration:none;} #sidebar-new-group{margin:auto;display:inline-block;color:#eeeeec;text-decoration:none;text-align:center;} #peoplefind-sidebar form{margin-bottom:10px;} #sidebar-new-group:hover{} #sidebar-new-group:active{position:relative;top:1px;} -#side-peoplefind-url{background-color:#eeeeec;color:#666666;border:1px solid #666666;margin-right:3px;width:75%;}#side-peoplefind-url:hover,#side-peoplefind-url:focus{background-color:#999999;color:#eeeeec;border:1px solid #111111;} +#side-peoplefind-url{border:1px solid #666666;margin-right:3px;width:75%;} .nets-ul{margin:0px;padding:0px;list-style:none;list-style-position:inside;}.nets-ul li{margin:10px 0 0;} .nets-link,.nets-all{margin-left:0px;} #netsearch-box{margin:20px 0px 30px;width:135px;}#netsearch-box #search-submit{margin:5px 5px 0px 0px;} diff --git a/view/theme/dispy/light/style.less b/view/theme/dispy/light/style.less index 4e1b85031..d8bd922cc 100644 --- a/view/theme/dispy/light/style.less +++ b/view/theme/dispy/light/style.less @@ -62,7 +62,7 @@ input, select, textarea { color: @main_colour; - background-color: @bg_colour; + background-color: white; } select { .borders(1px, dotted, darken(@main_alt_colour, 26.8%)); @@ -191,7 +191,7 @@ label { font-size: small; margin: 0 10px 1em 0; .borders(1px, solid, @bg_colour); - padding: 5px; + padding: 3px 5px; background: lighten(@main_alt_colour, 20%); color: @main_colour; .box_shadow(3px, 3px, 5px); @@ -199,10 +199,14 @@ label { input { .box(250px, 25px); .borders(1px, solid, darken(@main_alt_colour, 33.5%)); + width: 17em; &[type="checkbox"], &[type="radio"] { - margin: 0; .box(15px, 15px); + margin: 0; + } + &[type="radio"] { + margin: 5px 0; } &[type="submit"], &[type="button"] { @@ -281,30 +285,35 @@ h6 { .box(100%, 100%); margin: 0 auto; } -.button, -#profile-listing-desc { +.button { // .box(25%, auto); // background: @menu_bg_colour; color: @main_colour; // .borders(2px, outset, darken(@menu_bg_colour, 20%)); - // .rounded_corners; + .rounded_corners; padding: 5px; // font-size: smaller; cursor: pointer; - &.active { - .box_shadow(4px, 4px, 7px); + // &.active { + // .box_shadow(4px, 4px, 7px); + // } + a { + color: @main_colour; + // font-size: smaller; + font-weight: bold; } +} +#profile-listing-desc { a { color: @bg_colour; - // font-size: smaller; font-weight: bold; } } [class$="-desc"], [id$="-desc"] { color: @bg_colour; - background: @main_colour; - .borders(1px, outset, @bg_colour); + background: @dk_bg_colour; + .borders(3px, outset, @main_colour); .rounded_corners; // .box_shadow(3px, 3px, 5px); margin: 3px 10px 7px 0; @@ -569,6 +578,9 @@ div.jGrowl div { padding-left: 58px; margin-top: 50px; } + // &.jGrowl-message { + + // } } #nav-notifications-menu { margin: 30px 0 0 -20px; @@ -662,11 +674,13 @@ nav #nav-notifications-linkmenu { } #search-text { .borders(1px, solid, @main_alt_colour); + margin: 8px 0; } #mini-search-text { font-size: 8pt; height: 14px; width: 10em; + margin: 5px; } #scrollup { position: fixed; @@ -752,11 +766,13 @@ nav #nav-notifications-linkmenu { .menu-popup { position: absolute; display: none; - width: 11em; + // width: 11em; background: white; color: @main_colour; margin: 0px; padding: 0px; + font-size: small; + line-height: 1.1; .borders(3px, solid, @link_colour); .rounded_corners; z-index: 100000; @@ -904,11 +920,11 @@ nav #nav-notifications-linkmenu { } #dfrn-request-link { .rounded_corners; - color: @main_colour; + color: @bg_colour; display: block; font-size: 1.2em; padding: 0.2em 0.5em; - background-color: @friendica_blue; + background-color: @link_colour; // background-image: url(icons/connect.png); background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAOCAYAAAAmL5yKAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAE4SURBVCiRpZKxLgRRFIa//64dKruZFRIlolBviFKiVHsHrRaFikTCC+hEQtRegMQDqDUKJOPOvauSMJmjYEU2M0viT071/+fLOTlHZkadQgjLkh1LPEoj661WKw5mXG034JxtAgtmrJoVK5WZYYCy1AVQSOYbjeSqMmRmQ8v755Ne77lb5w+d4HMNJopCT7X+bwDQZKfTyf4BIAHeawHe+/kQ/FGM+QagvpFl2VSM/tyMmV7PV14AYMQ5nUp0AULIp0HXzpVvSdLYMmNVAjNdAuNAUQHgxy/ZvEQTSMw0A33DxkIIi2ma3gwC9PKSzRWF2wbdpml62DfyPF9yjlNgAnQGLJjZnXON3Xa7ff8NGPbKQPNrbAOI0a9J2ilLEzAL7P0GqJJizF+BUeDhL2cclJnZPvAg6eADf+imKjSMX1wAAAAASUVORK5CYII="); background-repeat: no-repeat; @@ -1014,7 +1030,7 @@ nav #nav-notifications-linkmenu { background: darken(@main_alt_colour, 10%); } [id$="jot-text_ifr"] { - width: 99.900002% !important; + // width: 99.900002% !important; color: @main_colour; background: @bg_colour; .mceContentBody { @@ -1224,34 +1240,45 @@ nav #nav-notifications-linkmenu { font-size: smaller; } } -.tab { +.multibutton () { .borders(1px, solid, @hover_colour); padding: 4px; - &:hover, - &:active { + .rounded_corners; + &:active, + &:hover { background: @shiny_colour; color: @main_colour; .borders(1px, solid, @hover_colour); } - &.active { - background: @dk_bg_colour; - color: @bg_colour; + a { + border: 0; + text-decoration: none; + } +} +.multibutton_active () { + background: @dk_bg_colour; + color: @bg_colour; + .borders(1px, solid, @hover_colour); + padding: 4px; + .rounded_corners; + &:hover { + background: @shiny_colour; + color: @main_colour; .borders(1px, solid, @hover_colour); - &:hover { - background: @shiny_colour; - color: @main_colour; - .borders(1px, solid, @hover_colour); - } - a { - color: @bg_colour; - text-decoration: none; - } } a { - border: 0; + color: @bg_colour; text-decoration: none; } } +.tab { + .multibutton; +} +.tab { + &.active { + .multibutton_active; + } +} /** @@ -1364,7 +1391,7 @@ nav #nav-notifications-linkmenu { .wall-item-like { clear: left; font-size: 0.8em; - color: lighten(@menu_bg_colour, 20%); + color: @main_colour; margin: 5px 0 5px 10.2em; .transition; opacity: 0.5; @@ -1377,7 +1404,7 @@ nav #nav-notifications-linkmenu { .wall-item-ago { clear: left; float: left; - color: @bg_colour; + color: @main_colour; line-height: 1; display: inline-block; font-size: 0.75em; @@ -1593,7 +1620,6 @@ div { } &[id$="wrapper"] { height: 100%; - margin-bottom: 1em; br { clear: left; } @@ -1931,11 +1957,6 @@ div { #contact-edit-poll-text { display: inline; } -#contact-edit-info_tbl, -#contact-edit-info_parent, -.mceLayout { - width: 100%; -} #contact-edit-end { clear: both; margin-bottom: 65px; @@ -1954,20 +1975,25 @@ div { } .contact-photo-menu { width: auto; - .borders(2px, solid, darken(@main_alt_colour, 33.5%)); + .borders(2px, solid, @link_colour); background: @bg_colour; color: @main_colour; position: absolute; + font-size: smaller; + .rounded_corners; left: 0px; top: 90px; display: none; z-index: 10000; li a { display: block; - padding: 2px; + padding: 4px; + color: @link_colour; + background: @bg_colour; + line-height: 1; &:hover { - color: white; - background: #3465A4; + background: @link_colour; + color: @bg_colour; text-decoration: none; } } @@ -1999,13 +2025,12 @@ div { } #register-form label, #profile-edit-form label { - width: 300px; - float: left; + width: 23em; } #register-form span, #profile-edit-form span { color: @menu_bg_colour; - display: block; + display: inline-block; margin-bottom: 20px; } #profile-edit-marital-label span { @@ -2018,12 +2043,6 @@ div { .profile-edit-side-div { display: none; } -/*.profile-edit-side-div:hover { - display: block; -} -.profile-edit-side-link { - margin: 3px 0px 0px 70px; -}*/ #profiles-menu-trigger { margin: 0px 0px 0px 25px; } @@ -2318,19 +2337,20 @@ div { .group-selected, .nets-selected, .fileas-selected { - padding: 3px; - color: @bg_colour; - background: @dk_bg_colour; - .borders(1px, solid, @link_colour); -} -.group-selected:hover, -.nets-selected:hover, -.fileas-selected:hover { - padding: 3px; - color: @link_colour; - background: @bg_colour; - .borders(1px, solid, @link_colour); -} + // padding: 4px; + // color: @bg_colour; + // background: @dk_bg_colour; + // .borders(1px, solid, @hover_colour); + .multibutton_active; +} +// .group-selected:hover, +// .nets-selected:hover, +// .fileas-selected:hover { +// padding: 4px; +// color: @link_colour; +// background: @bg_colour; +// .borders(1px, solid, @link_colour); +// } .groupsideedit { margin-right: 10px; } @@ -2348,13 +2368,8 @@ div { } } .sidebar-group-element { - padding: 3px; - &:hover { - color: @main_colour; - background: @shiny_colour; - .borders(1px, solid, @hover_colour); - padding: 3px; - } + .multibutton; + .rounded_corners; } #sidebar-new-group { margin: auto; @@ -2378,17 +2393,9 @@ div { } } #side-peoplefind-url { - background-color: @bg_colour; - color: darken(@main_alt_colour, 20%); .borders(1px, solid, darken(@main_alt_colour, 20%)); margin-right: 3px; width: 75%; - &:hover, - &:focus { - background-color: @main_alt_colour; - color: @bg_colour; - .borders(1px, solid, @main_colour); - } } .nets-ul { .list_reset; diff --git a/view/theme/dispy/light/theme.php b/view/theme/dispy/light/theme.php index 2b37c0671..df3cca042 100644 --- a/view/theme/dispy/light/theme.php +++ b/view/theme/dispy/light/theme.php @@ -1,9 +1,9 @@ <?php /* - * Name: Dispy - * Description: <p style="white-space:pre;"> Dispy: Light, Spartan, Sleek, and Functional<br /> Dispy Dark: Dark, Spartan, Sleek, and Functional</p> - * Version: 1.2 + * Name: Dispy Light + * Description: Dispy Light: Light, Spartan, Sleek, and Functional + * Version: 1.2.1 * Author: Simon <http://simon.kisikew.org/> * Maintainer: Simon <http://simon.kisikew.org/> * Screenshot: <a href="screenshot.jpg">Screenshot</a> @@ -13,7 +13,7 @@ $a = get_app(); $a->theme_info = array( 'family' => 'dispy', 'name' => 'light', - 'version' => '1.2' + 'version' => '1.2.1' ); function dispy_light_init(&$a) { @@ -21,10 +21,10 @@ function dispy_light_init(&$a) { /** @purpose set some theme defaults */ $cssFile = null; - $colour = false; $colour = 'light'; + $colour_path = "/light/"; - // custom css + // set css if (!is_null($cssFile)) { $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile); } |
