From c2d5c8cd3914c4139f750287fa95f307c0c5aee7 Mon Sep 17 00:00:00 2001
From: Samantha Doherty <sammy@status.net>
Date: Sat, 27 Aug 2011 07:58:20 -0400
Subject: [PATCH] A little more theme cleanup.

---
 theme/base/css/display.css            |  19 ++--
 theme/base/images/icons/README        |   1 +
 theme/base/images/icons/lock.png      | Bin 0 -> 749 bytes
 theme/base/images/icons/lock_open.png | Bin 0 -> 727 bytes
 theme/neo/css/display.css             | 146 +++++++++++++++-----------
 5 files changed, 96 insertions(+), 70 deletions(-)
 create mode 100644 theme/base/images/icons/lock.png
 create mode 100644 theme/base/images/icons/lock_open.png

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 6328098a51..b698ff9221 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -297,7 +297,7 @@ address .poweredby {
     display: none;
 }
 
-.form_notice #notice_data-text-label { /* XXX remove? */
+.form_notice #notice_data-text-label { /* TODO can remove this now? */
     display: none;
 }
 
@@ -524,7 +524,7 @@ address .poweredby {
 
 .checkbox-wrapper.unchecked label.checkbox {
     padding-left: 20px;
-    background: url(../images/lock_open.png) no-repeat 0px 0px;
+    background: url(../images/icons/lock_open.png) no-repeat 0px 0px;
     opacity: 0.6;
 }
 
@@ -535,7 +535,7 @@ address .poweredby {
 
 .checkbox-wrapper.checked label.checkbox {
     padding-left: 20px;
-    background: url(../images/lock.png) no-repeat 0px 0px;
+    background: url(../images/icons/lock.png) no-repeat 0px 0px;
     color: red;
     opacity: 1;
 }
@@ -599,10 +599,6 @@ address .poweredby {
     margin-bottom: 20px;
 }
 
-body[id$=adminpanel] #aside_primary {
-    display:none;
-}
-
 
 /* notices */
 
@@ -834,7 +830,7 @@ clear:both;
 
 #jOverlayContent,
 #jOverlayContent #content,
-#jOverlayContent #content_inner { /* XXX still needed? */
+#jOverlayContent #content_inner { /* TODO can remove this now? */
 width: auto !important;
 margin-bottom:0;
 }
@@ -1479,12 +1475,13 @@ margin-bottom:11px;
 }
 
 .form_settings .form_note {
-border-radius:4px;
--moz-border-radius:4px;
--webkit-border-radius:4px;
 padding:0 7px;
 }
 
+.form_settings .form_response {
+    margin-top: 10px;
+}
+
 .form_settings input {
     margin-right: 20px;
 }
diff --git a/theme/base/images/icons/README b/theme/base/images/icons/README
index f701959ca0..d124671da1 100644
--- a/theme/base/images/icons/README
+++ b/theme/base/images/icons/README
@@ -57,3 +57,4 @@ Created by various authors
 * Atom feed icon from http://intertwingly.net/wiki/pie/Icon with Public Domain license
 * RSS feed icon from http://www.feedicons.com/ (Mozilla, Microsoft, Matt Brett) with MPL/GPL/LGPL tri-license
 * Processing icon from/by Unknown with Unknown license //FIXME
+* lock and lock_open icons by Mark James http://www.famfamfam.com/lab/icons/silk/ (Creative Commons Attribution 2.5 License)
diff --git a/theme/base/images/icons/lock.png b/theme/base/images/icons/lock.png
new file mode 100644
index 0000000000000000000000000000000000000000..2ebc4f6f9663e32cad77d67ef93ab8843dfea3c0
GIT binary patch
literal 749
zcmV<J0uud+P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!e@R3^R5;6R
zQbB7IK^T3Tq)8K-7_~JtN==(+K|#b@JqUt5h~h!Lc~ek?Ku+zk2XpMN@Q@-NdiDp1
z1*uxlMiZNsG$@o5lP0D~c6MfcvuoP5I`A<w-+bSj_uh<Q+cvyoX=!OhDK#ghoMD_~
zfbo;DVp-N=E|>e|tv9>?g+k#9o0pTx<YX)sgU{y!_vrO{sMqV*;vmqy`T6;^e*oA#
z!o!d0bUI_2CTg`BI-QQb9f3dqiA2JwD;A3z%w1ksSm^4#Z-B()v+?oqj1U6la(T1e
zZl|~o>d@;_sq{kwlU;^VvV*?BV8P@}BoaZTQUROpWV6|-M`|^n&)=+8tHo3*<<$NU
zU`%V~ZF;?hBSYsjJ6%JzV}E(D{pOLqQklliUf9um_tGl-wty`y*p?eYNW56P>X@1s
zZs7KrRZKtmV7Lqj^5Fgr7_`LjhdJK@ltF&O`j7?*NUM$KvmNGz)3WjM?V$vHlP<J&
zUm*}0g<*`aa0m#;nO4C59%Snq%<gw6YaijsENrvy0U$*veUpji`g`g;hWN#6sJ&if
z|7lEIpGEWQIsqDprcRKsge^=jfN*5kq#B>T0AFyF?kLE<#HZabCSW3-o<y$`V(q@e
zY5?H;1Doz@RIRn~d5tXI@x+4aDfGLfYLi*%3!3F^SFTb{&mjZ7(WsOVKc9j>a*6;Z
zrXD`Ulwd<^2glP%1Y1Kc1Ij%DU^=ME(jKf6APNlA$Uu;J4bVilQHSWX5uJ$9Zsp4M
z0%!@LvyTxz=Z6stxlichODIY+yNGt%RM;m`>H4LOKLFs9Y%b5aUN|2|{0Zw|<_~i}
fmXz*V19AKYa<a0`hi}0}00000NkvXXu0mjf@;P6V

literal 0
HcmV?d00001

diff --git a/theme/base/images/icons/lock_open.png b/theme/base/images/icons/lock_open.png
new file mode 100644
index 0000000000000000000000000000000000000000..a471765ff1432092e7113e56b42f2798968b443f
GIT binary patch
literal 727
zcmV;|0x127P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!X-PyuR5;6Z
zlFMroQ51*2J82WE8I8mWDN;4o2fA>rLKlJyH=-*k3W|aiVYC~e{STzB+=%NyKm^5w
z3m4+bm8cXnzG}0Gw2c^Ol0K$0_i<c|k0ICthkH2O`|<modz6Tfj%u}f(pq~filSq{
z7Gul{W6ZrE2ww7^P-#G=Qn~K?{{5k$A?0}<04pmi%+1Y7tJS(OIXU^D7toh_d?=sK
zPnSw1)o3(mHk$zWzE7!CQehZQm&@g!^?Lnr8sPmYy4~)pVzKDY&(G6rHZKN2pn@P!
zi;IhwW@l$96bkvVv9UY73cOUEGsdv6u&@*aLG@2_YHF$iv^t%R8XO$VZ)gF?SZfgx
z+k0tZVq%aDLWu~CS6AfO%u$R}SZg_R<P90oh&6~wQfvFvb=yyY^9nibiQ(Y2cPddJ
z!uaK5C_GeV0L5u=3i>ty0#@^}dhsl97GUJu9lkxh`Okt_0|=(|h`!tol*)tahk*i!
zgS8GLCq{|Gd7N1T=a4u`0gM4BU}M^~w|L$b3WtyL{rO$Q?PPfL6z$J7;&2In&vryC
zqT@6`g9u_Zg@Xt1vO7RIY-D-g8eo{1!oIz%ujUZ52IBq#JOI%e5ertc^kIf}?KOA?
zx9*6-2qdQc<rD3%jl`~Vh}J0uS|?N+Q`o<U%;q9^G35*6l(m8G54P<aBHQgx6gcSx
z#NZsx#I$QQGMjzal!v}7I0M}_;nGj^>N5WDRs@&WP6I?Nxm{No*quRTbIBKa{opLb
zA%3`w)e+)sGB0CNfH<Q5<aRO(V-TZ%r}=wgZL(O_Cbdfz_7}jmaaS&KPgno|002ov
JPDHLkV1kHsN2LG&

literal 0
HcmV?d00001

diff --git a/theme/neo/css/display.css b/theme/neo/css/display.css
index 9082687442..63aeff4e89 100644
--- a/theme/neo/css/display.css
+++ b/theme/neo/css/display.css
@@ -102,7 +102,7 @@ h6 {font-size: 1em;}
     background: #364A84;
     background: -moz-linear-gradient(top, #516499 , #364a84);
     background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#516499), color-stop(100%,#364a84));
-    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#516499', endColorstr='#364a84',GradientType=0 ); /* XXX move all to ie.css */ 
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#516499', endColorstr='#364a84',GradientType=0 ); /* TODO move all filters to ie.css */ 
 }
 
 #site_nav_global_primary li {
@@ -222,7 +222,7 @@ h6 {font-size: 1em;}
 .form_notice textarea ,
 .input_form .form_settings li input,
 .input_form .form_settings li textarea,
-.threaded-replies .placeholder {
+.threaded-replies .placeholder { /* TODO combine all these declarations */
     -webkit-border-radius: 4px;
     -moz-border-radius: 4px;
     border-radius: 4px;
@@ -446,6 +446,25 @@ div.entry-content a.response:after {
     margin-top: 4px;
 }
 
+.notice-options .form_repeat.dialogbox {
+    margin-right: 0px;
+    border: 1px solid #aaa;
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    border-radius: 4px;
+    box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.4);
+    -moz-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.4);
+    -webkit-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.4);
+}
+
+.notice-options .form_repeat.dialogbox legend {
+    padding-top: 10px;
+}
+
+.notice-options .form_repeat.dialogbox input.submit_dialogbox {
+    min-width: 80px;
+}
+
 #content .threaded-replies .notice .author .photo {
     box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);
     -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);
@@ -568,8 +587,9 @@ div.entry-content a.response:after {
 
 .form_notice input.submit, .form_settings input.submit, .form_settings input.cancel, #form_invite input.submit,
 .entity_subscribe .dialogbox input.submit_dialogbox,
-.entity_tag .dialogbox input.submit_dialogbox
- {
+.entity_tag .dialogbox input.submit_dialogbox,
+.form_repeat.dialogbox input.submit_dialogbox
+{ /* TODO combine all these declarations */
     height: 1.9em;
     padding: 0px 10px;
     color:#fff;
@@ -589,8 +609,9 @@ div.entry-content a.response:after {
 
 .form_notice input.submit:hover, .form_settings input.submit:hover, .form_settings input.cancel:hover, #form_invite input.submit:hover,
 .entity_subscribe .dialogbox input.submit_dialogbox:hover,
-.entity_tag .dialogbox input.submit_dialogbox:hover
- {
+.entity_tag .dialogbox input.submit_dialogbox:hover,
+.form_repeat.dialogbox input.submit_dialogbox:hover
+{
     text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.6);
     background: #ff9d63;
     background: -moz-linear-gradient(top, #FB6104 , #fc8035);
@@ -742,7 +763,61 @@ padding-right:0;
     margin-top: 60px;
 }
 
+/* Limited-scope */
+
+.limited-scope .entry-content .timestamp {
+    padding-left: 20px;
+    position: relative;
+}
+
+.limited-scope .entry-content .timestamp:before {
+    content: url(../images/lock.png);
+    position: absolute;
+    top: -2px;
+    left: 0px;
+}
+
+.limited-scope li .entry-content .timestamp {
+    padding-left: 0px;
+}
+
+.limited-scope li .entry-content .timestamp:before {
+    content: none;
+}
+
+.limited-scope li.limited-scope .entry-content .timestamp {
+    padding-left: 20px;
+}
+
+.limited-scope li.limited-scope .entry-content .timestamp:before {
+    content: url(../images/lock.png);
+    position: absolute;
+    top: -2px;
+    left: 0px;
+}
+
+/* Blog */
+
+label[for=blog-entry-content] {
+    display: none !important;
+}
+
+#input_form_blog td {
+    padding-top: 0px;
+    padding-bottom: 0px;
+}
+
+#input_form_blog td.mceToolbar {
+    padding-top: 4px;
+}
+
+h4.blog-entry-title {
+    margin-bottom: 8px;
+    line-height: 1.2em;
+}
+
 /* Bookmark specific styles */
+/* TODO separate base styles and move to plugin */
 
 .bookmark h3 {
     margin: 0px 0px 8px 0px;
@@ -824,10 +899,6 @@ ul.bookmark-tags a:hover {
     opacity: 1;
 }
 
-.bookmark .notice-options {
-    margin-top: 16px;
-}
-
 #bookmarkpopup {
     min-width: 600px;
     margin-top: 0px;
@@ -883,6 +954,7 @@ ul.bookmark-tags a:hover {
 }
 
 /* Onboard specific styles */
+/* TODO move to plugin */
 
 #cboxOverlay{
     background: url(../images/lightbox_bg.png) repeat 0 0 !important;
@@ -968,6 +1040,7 @@ ul.bookmark-tags a:hover {
 }
 
 /* Billing specific styles */
+/* TODO move to plugin */
 
 #content table.billing_info {
     margin-top: 10px;
@@ -992,6 +1065,7 @@ ul.bookmark-tags a:hover {
 }
 
 /* Directory specific styles */
+/* TODO separate base styles and move to plugin */
 
 div#profile_directory div.alpha_nav > a {
     border-left: 1px solid #ccc !important;
@@ -1132,6 +1206,7 @@ td.entity_profile {
 }
 
 /* Event specific styles */
+/* TODO separate base styles and move to plugin */
 
 .notice .vevent div {
     margin-bottom: 8px;
@@ -1215,40 +1290,7 @@ label[for=event-starttime], label[for=event-endtime] {
     width: 120px;
 }
 
-/* Limited-scope specific styles */
-
-.limited-scope .entry-content .timestamp {
-    padding-left: 20px;
-    position: relative;
-}
-
-.limited-scope .entry-content .timestamp:before {
-    content: url(../images/lock.png);
-    position: absolute;
-    top: -2px;
-    left: 0px;
-}
-
-.limited-scope li .entry-content .timestamp {
-    padding-left: 0px;
-}
-
-.limited-scope li .entry-content .timestamp:before {
-    content: none;
-}
-
-.limited-scope li.limited-scope .entry-content .timestamp {
-    padding-left: 20px;
-}
-
-.limited-scope li.limited-scope .entry-content .timestamp:before {
-    content: url(../images/lock.png);
-    position: absolute;
-    top: -2px;
-    left: 0px;
-}
-
-/* QnA specific styles */
+/* QnA */
 
 .question div.question-description {
     font-size: 1em;
@@ -1315,21 +1357,6 @@ label[for=event-starttime], label[for=event-endtime] {
     content: none !important;
 }
 
-/* Blog specific styles */
-
-label[for=blog-entry-content] {
-    display: none !important;
-}
-
-#input_form_blog td {
-    padding-top: 0px;
-    padding-bottom: 0px;
-}
-
-#input_form_blog td.mceToolbar {
-    padding-top: 4px;
-}
-
 /* Poll specific styles */
 
 .notice div.poll-content {
@@ -1341,6 +1368,7 @@ label[for=blog-entry-content] {
 }
 
 /* SNOD CompanyLogo styling */
+/* TODO move to plugin */
 
 #site_nav_local_views a.company_logo {
     width: 138px;