From 2c15bdd99eea9fa234d0d0adb3219af171de8f60 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Mon, 15 Oct 2012 22:48:25 -0400 Subject: [PATCH 1/2] merge HEAD Signed-off-by: Simon L'nu --- view/theme/dispy/dark/style.css | 1 + view/theme/dispy/dark/style.less | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/view/theme/dispy/dark/style.css b/view/theme/dispy/dark/style.css index 5cb9ee205d..efb00776a2 100644 --- a/view/theme/dispy/dark/style.css +++ b/view/theme/dispy/dark/style.css @@ -549,4 +549,5 @@ footer{display:block;clear:both;text-align:center;} #sidebar-page-list ul{padding:0;margin:5px 0;} #sidebar-page-list li{list-style:none;} #jappix_mini{margin-left:130px;position:fixed;bottom:0;right:175px !important;z-index:999;} +#fancybox-content{color:#111;} @media handheld and screen{body{font-size:15pt;}}@media only screen and (min-device-width:320px) and (max-device-width:480px){body{font-size:12pt;}}@media only screen and (min-width:321px){body{font-size:12pt;}}@media only screen and (max-width:320px){body{font-size:12pt;}}@media only screen and (min-device-width:768px) and (max-device-width:1024px){body{font-size:14pt;}}@media only screen and (min-device-width:768px) and (max-device-width:1024px) and (orientation:landscape){body{font-size:14pt;}}@media only screen and (min-device-width:768px) and (max-device-width:1024px) and (orientation:portrait){body{font-size:14pt;}}@media only screen and (min-width:1024px){body{font-size:14pt;}}@media only screen and (min-width:1520px){body{font-size:16pt;}}@media only screen and (-webkit-min-device-pixel-ratio:1.5),only screen and (min-device-pixel-ratio:1.5){body{font-size:14pt;}} diff --git a/view/theme/dispy/dark/style.less b/view/theme/dispy/dark/style.less index d7becbedb8..9d17abdd15 100644 --- a/view/theme/dispy/dark/style.less +++ b/view/theme/dispy/dark/style.less @@ -3230,4 +3230,8 @@ footer { z-index: 999; } +#fancybox-content { + color: #111; +} + @import "../css/media"; From 00ee068b6523e45b258f4e53fa8d0f9316e99bc5 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Thu, 25 Oct 2012 02:59:49 -0400 Subject: [PATCH 2/2] fix for preview post thingy blocking the posting buttons Signed-off-by: Simon L'nu --- view/theme/dispy/dark/style.css | 4 ++-- view/theme/dispy/dark/style.less | 1 + view/theme/dispy/light/style.css | 4 ++-- view/theme/dispy/light/style.less | 1 + 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/view/theme/dispy/dark/style.css b/view/theme/dispy/dark/style.css index efb00776a2..cc5197dab1 100644 --- a/view/theme/dispy/dark/style.css +++ b/view/theme/dispy/dark/style.css @@ -191,7 +191,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm #jot-title-wrapper{margin-bottom:5px;} #jot-title-display{font-weight:bold;} .jothidden{display:none;} -#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;} +#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;margin:5em auto 1em;}#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:1em;font-size:0.8em;min-width:475px;width:69%;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;-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;} @@ -519,7 +519,7 @@ div[id$="wrapper"]{height:100%;}div[id$="wrapper"] br{clear:left;} .type-text{background-position:-60px 0px;} .type-unkn{background-position:-80px 0;} .cc-license{margin-top:100px;font-size:0.7em;} -footer{display:block;clear:both;text-align:center;} +footer{display:block;clear:both;} #sectionfooter{margin:1em 0 1em 0;} #profile-jot-text{height:20px;color:#eeeecc;background:#2e2f2e;border:1px solid #eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;width:99.5%;} #photo-edit-perms-select,#photos-upload-permissions-wrapper,#profile-jot-acl-wrapper{display:block !important;background:#2e2f2e;color:#eeeecc;} diff --git a/view/theme/dispy/dark/style.less b/view/theme/dispy/dark/style.less index 9d17abdd15..d6920c7733 100644 --- a/view/theme/dispy/dark/style.less +++ b/view/theme/dispy/dark/style.less @@ -1258,6 +1258,7 @@ nav #nav-notifications-linkmenu { .rounded_corners; .box_shadow(5px, 0, 10px); padding: 3px 3px 6px 10px; + margin: 5em auto 1em; .wall-item-outside-wrapper { border: 0; .rounded_corners(0px 0px 0px 0px); diff --git a/view/theme/dispy/light/style.css b/view/theme/dispy/light/style.css index fe8d6884cc..bb237be48e 100644 --- a/view/theme/dispy/light/style.css +++ b/view/theme/dispy/light/style.css @@ -191,7 +191,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm #jot-title-wrapper{margin-bottom:5px;} #jot-title-display{font-weight:bold;} .jothidden{display:none;} -#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;} +#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;margin:5em auto 1em;}#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:1em;font-size:0.8em;min-width:475px;width:69%;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;-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;} @@ -519,7 +519,7 @@ div[id$="wrapper"]{height:100%;}div[id$="wrapper"] br{clear:left;} .type-text{background-position:-60px 0px;} .type-unkn{background-position:-80px 0;} .cc-license{margin-top:100px;font-size:0.7em;} -footer{display:block;clear:both;text-align:center;} +footer{display:block;clear:both;} #sectionfooter{margin:1em 0 1em 0;} #profile-jot-text{height:20px;color:#666666;background:#cccccc;border:1px solid #111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;width:99.5%;} #photo-edit-perms-select,#photos-upload-permissions-wrapper,#profile-jot-acl-wrapper{display:block !important;background:#eeeeec;color:#111111;} diff --git a/view/theme/dispy/light/style.less b/view/theme/dispy/light/style.less index 3db91a8507..950aaff5d6 100644 --- a/view/theme/dispy/light/style.less +++ b/view/theme/dispy/light/style.less @@ -1259,6 +1259,7 @@ nav #nav-notifications-linkmenu { .rounded_corners; .box_shadow(5px, 0, 10px); padding: 3px 3px 6px 10px; + margin: 5em auto 1em; .wall-item-outside-wrapper { border: 0; .rounded_corners(0px 0px 0px 0px);