From: Dan Karran Date: Sat, 18 Aug 2007 12:22:04 +0000 (+0000) Subject: Moving inbox styling definitions into the stylesheet. X-Git-Tag: live~8170 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/9da455a32299d898acdb54e0e41409cd5d546d89 Moving inbox styling definitions into the stylesheet. --- diff --git a/app/views/message/_message_summary.rhtml b/app/views/message/_message_summary.rhtml index 1aca68014..56f6bb132 100644 --- a/app/views/message/_message_summary.rhtml +++ b/app/views/message/_message_summary.rhtml @@ -1,9 +1,7 @@ - - <%= link_to message_summary.sender.display_name , :controller => 'user', :action => message_summary.sender.display_name %> - <%= "" if not message_summary.message_read? %> - <%= link_to message_summary.title , :controller => 'message', :action => 'read', :message_id => message_summary.id %> - <%= "" if not message_summary.message_read? %> - <%= message_summary.sent_on %> +"> + <%= link_to message_summary.sender.display_name , :controller => 'user', :action => message_summary.sender.display_name %> + <%= link_to message_summary.title , :controller => 'message', :action => 'read', :message_id => message_summary.id %> + <%= message_summary.sent_on %> <% if message_summary.message_read? %> <%= button_to 'Mark as unread', :controller => 'message', :action => 'mark', :message_id => message_summary.id, :mark => 'unread' %> <% else %> diff --git a/public/stylesheets/site.css b/public/stylesheets/site.css index 164941b2e..2579e8a27 100644 --- a/public/stylesheets/site.css +++ b/public/stylesheets/site.css @@ -1,560 +1,565 @@ -a { - color: #0000ff; - text-decoration: none; -} -a:visited { - color: #0000ff; - text-decoration: none; -} -a:active { - color: #0000ff; - text-decoration: none; -} -a:link { - color: #0000ff; - text-decoration: none; -} -a:hover { - color: #0000ff; - text-decoration: underline; -} - -#frontpage_main { - width: 100%; - text-align: center; - font-family: sans-serif; -} - - -#frontpage_MAIN h1 { - font-size: xx-large; - font-weight: normal; -} - -body { - font-family: Arial,sans-serif; - color: Black; - margin: 0; - padding: 0; -} - -#left { - position: absolute; - top: -8px; - min-width: 150px; -} - -#logo { - width: 150px; - min-width: 150px; - padding: 10px; - margin: 10px; - height: 150px; - background: #ffffff; - border: 1px solid #ccccdd; -} -#logo h1 { - font-size: 14px; - text-align: center; - margin: 0; -} -#logo h2 { - font-size: 10px; - margin: 0; -} - -#greeting { - float: right; - height: 20px; - margin: 0px; - padding-right: 10px; - padding-top: 5px; - font-size: 13px; - line-height: 14px; - background: url('/images/tab_bottom.gif') repeat-x bottom; -} - -#intro { - width: 150px; - margin: 10px; - padding: 10px; - border: 1px solid #ccc; - font-size: 11px; -} - -#alert { - width: 150px; - margin: 10px; - padding: 10px; - border: 1px solid #ccc; - background: #d00; - line-height: 1.2em; - text-align: left; - font-size: 14px; -} - -.left_menu { - width: 150px; - min-width: 150px; - margin: 10px; - padding: 10px; - border: 1px solid #ccc; - left: 0px; - background: #ddd; - line-height: 1.2em; - text-align: Left; - font-size: 14px; - font-weight: bold; -} - -.left_menu td { - font-size: 12px; - padding-right: 4px; -} - -.left_menu h1 { - font-style: normal; - font-size: 15px; - padding: 0 0 0 1em; - text-align: left; -} - -.left_menu ul { - /*list-style: none;*/ - padding-left: 10px; - margin: 0; -} - -.left_menu li { - margin:0; - padding:0; -} - -.left_menu img { - margin: 2px 8px 0 0; -} - -.left_menu a { - color: #000000; - text-decoration: none; -} - -.left_menu a:visited { - color: #000000; - text-decoration: none; -} - -.left_menu a:active { - color: #000000; - text-decoration: none; -} - -.left_menu a:link { - color: #000000; - text-decoration: none; -} - -.left_menu a:hover { - color: #000000; - text-decoration: underline; -} - -#messages { - border: 1px solid #ccc; -} - - -#content { - padding: 0; - margin: 0; - position: absolute; - left: 192px; - right: 10px; - top: 35px; - bottom: 10px; - line-height: 1.2em; - text-align: left; -} - -#bottom_bar { - position: absolute; - bottom: 0px; - width: 100%; - font-size: x-small; - text-align: center; -} - -#mapImage { - position: absolute; - left: 0px; -} -#drag { - top: 0px; - left: 14px; -} - -#mapEpilog { - font-size: x-small; -} - -#keyvalue { - font-size: small; - text-align: left; - border-collapse: collapse; - border-width: 0; -} - -#keyvalue.th { - font-weight: bold; -} - -.emphasized { - background-color: #82bcff; -} - - -#header { - float:left; - width:100%; - background:#DAE0D2 url("bg.gif") repeat-x bottom; - font-size:93%; - line-height:normal; -} -#header ul { - margin:0; - padding:10px 10px 0px 215px; - list-style:none; -} -#header li { - float:left; - /*background:url("left.gif") no-repeat left top;*/ - margin:0; - padding:0 0 0 9px; -} -#header li a { - float:left; - display:block; - /*background:url("right.gif") no-repeat right top;*/ - padding:5px 15px 4px 6px; - text-decoration:none; - font-weight:bold; - color:#765; -} -/* Commented Backslash Hack -hides rule from IE5-Mac \*/ -#header li a {float:none;} -/* End IE5-Mac hack */ -#header li a:hover { - color:#333; -} -#header #current { - /* background-image:url("left_on.gif"); */ -} -#header #current a { - background-image:url("right_on.gif"); - color:#333; - padding-bottom:5px; -} - -#tabnav -{ - height: 20px; - margin: 0px; - padding-left: 215px; - padding-top: 5px; - background: url('/images/tab_bottom.gif') repeat-x bottom; -} -#tabnav li -{ - margin: 0; - padding: 0; - display: inline; - list-style-type: none; -} -#tabnav a, #tabnav a:link, #tabnav a:visited -{ - float: left; - background: #f3f3f3; - font-size: 13px; - line-height: 14px; - font-weight: bold; - padding: 2px 10px 2px 10px; - margin-right: 4px; - border: 1px solid #ccc; - text-decoration: none; - color: #333; -} -#tabnav a:link.active, #tabnav a:visited.active -{ - border-bottom: 1px solid #fff; - background: #fff; - color: #000; -} -#tabnav a:link:hover -{ - background: #fff; -} - -#gads { - /* position: absolute; */ - left: 100px; - width: 700px; - text-align: center; - font-size: 10px; -} - - -.gpxsummary { - font-size: 12px; - color: gray; -} - -.gpxdesc { - font-style: italic; -} - -.table0 { - background: #f6f6f6; -} - -.table1 { - background: #fff; -} - - -.optionalbox { - width: 150px; - min-width: 150px; - margin: 10px; - padding: 10px; - border: 1px solid #ccc; - left: 0px; - line-height: 1.2em; - text-align: Left; - font-size: 12px; - background: #eee; -} - -.oboxheader { - font-size: 14px; - font-weight: bold; - line-height: 1.4em; - text-align: top; -} - -.optionalbox form { - margin: 0px; - padding: 0px; -} - -.optionalbox input { - width: 100%; -} - -.rsssmall { - position: relative; - top: 4px; -} - -#cclogo { - width: 150px; - min-width: 150px; - margin: 10px; - padding: 10px; - left: 0px; - line-height: 1.2em; - text-align: Left; - font-size: 14px; - font-weight: bold; - background: #fff; -} - -#controls img -{ - z-index: 9999; -} - -#controls -{ - position:absolute; - top:0px; - left:0px; - width:64px; - height:32px; - z-index: 9998; - cursor: pointer; -} - -#map { - position: absolute; - border: 1px solid black; - margin: 0px; - padding: 0px; - left: 0px; - right: 2px; - top: 0px; - bottom: 0px; -} - -#search_results { - display: none; - position: absolute; - border: 1px solid black; - margin: 0px; - padding: 0px; - width: 30%; - left: 0px; - top: 0px; - bottom: 0px; -} - -#search_results_content { - overflow: auto; - position: absolute; - font-size: 13px; - line-height: 14px; - top: 29px; - bottom: 0px; - left: 0px; - right: 0px; -} - -.search_results_title { - margin: 0px; - padding: 3px 6px 3px 6px; - height: 29px; - font-size: 14px; - line-height: 15px; - border-bottom: 1px solid black; - background: #bbb; -} - -.search_results_heading { - margin: 0px; - padding: 3px 6px 3px 6px; - border: 1px solid #ccc; - background: #ddd; -} - -.search_results_entry { - margin: 0px; - padding: 2px 6px 2px 6px; -} - -.search_results_error { - margin: 0px; - padding: 2px 6px 0px 6px; - color: #f00; -} - -.search_help { - font-size: 10px; - line-height: 1em; - margin-top: 3px; - margin-bottom: 0px; -} - -/* rails error field stuff */ - -.fieldWithErrors { - padding: 2px; - background-color: red; - display: table; -} - -#notice { - border: 1px solid green; - padding: 7px; - background-color: #f0fff0; - margin-bottom: 20px; -} - -#errorExplanation { - width: 400px; - border: 2px solid red; - padding: 7px; - padding-bottom: 12px; - margin-bottom: 20px; - background-color: #f0f0f0; -} - -#errorExplanation h2 { - text-align: left; - font-weight: bold; - padding: 5px 5px 5px 15px; - font-size: 12px; - margin: -7px; - background-color: #c00; - color: #fff; -} - -#errorExplanation p { - color: #333; - margin-bottom: 0; - padding: 5px; -} - -#errorExplanation ul li { - font-size: 12px; - list-style: square; -} - -input { - border: 1px solid black; -} - -.nohome .location { - display: none; -} - -#homerow .message { - display: none; -} - -.nohome .message { - display: inline !important; -} - -.editDescription { - height : 10ex; - width : 30em; -} - -.nowrap { - white-space: nowrap; -} - -/** - * This now just used to detect the width/height required for the popup. - */ -#map p#highlightinfo { - visibility : hidden; - position : absolute; - z-index : 10000; - background : white; - border : 1px solid black; - left : 50px; - top : 5px; - margin : 0px; - padding : 2px; -} - -#map p#highlightinfo p, #popup p { - margin : 0; - padding : 2px; - } - - -/**State of the Map */ - -#sotminfo { - background: #9999FF; - font-size: 11px; - margin: 0px; - padding: 0px; - border: 1px solid #ccc; - left: 0px; - line-height: 1.2em; - text-align: Left; - font-weight: normal; -} +a { + color: #0000ff; + text-decoration: none; +} +a:visited { + color: #0000ff; + text-decoration: none; +} +a:active { + color: #0000ff; + text-decoration: none; +} +a:link { + color: #0000ff; + text-decoration: none; +} +a:hover { + color: #0000ff; + text-decoration: underline; +} + +#frontpage_main { + width: 100%; + text-align: center; + font-family: sans-serif; +} + + +#frontpage_MAIN h1 { + font-size: xx-large; + font-weight: normal; +} + +body { + font-family: Arial,sans-serif; + color: Black; + margin: 0; + padding: 0; +} + +#left { + position: absolute; + top: -8px; + min-width: 150px; +} + +#logo { + width: 150px; + min-width: 150px; + padding: 10px; + margin: 10px; + height: 150px; + background: #ffffff; + border: 1px solid #ccccdd; +} +#logo h1 { + font-size: 14px; + text-align: center; + margin: 0; +} +#logo h2 { + font-size: 10px; + margin: 0; +} + +#greeting { + float: right; + height: 20px; + margin: 0px; + padding-right: 10px; + padding-top: 5px; + font-size: 13px; + line-height: 14px; + background: url('/images/tab_bottom.gif') repeat-x bottom; +} + +#intro { + width: 150px; + margin: 10px; + padding: 10px; + border: 1px solid #ccc; + font-size: 11px; +} + +#alert { + width: 150px; + margin: 10px; + padding: 10px; + border: 1px solid #ccc; + background: #d00; + line-height: 1.2em; + text-align: left; + font-size: 14px; +} + +.left_menu { + width: 150px; + min-width: 150px; + margin: 10px; + padding: 10px; + border: 1px solid #ccc; + left: 0px; + background: #ddd; + line-height: 1.2em; + text-align: Left; + font-size: 14px; + font-weight: bold; +} + +.left_menu td { + font-size: 12px; + padding-right: 4px; +} + +.left_menu h1 { + font-style: normal; + font-size: 15px; + padding: 0 0 0 1em; + text-align: left; +} + +.left_menu ul { + /*list-style: none;*/ + padding-left: 10px; + margin: 0; +} + +.left_menu li { + margin:0; + padding:0; +} + +.left_menu img { + margin: 2px 8px 0 0; +} + +.left_menu a { + color: #000000; + text-decoration: none; +} + +.left_menu a:visited { + color: #000000; + text-decoration: none; +} + +.left_menu a:active { + color: #000000; + text-decoration: none; +} + +.left_menu a:link { + color: #000000; + text-decoration: none; +} + +.left_menu a:hover { + color: #000000; + text-decoration: underline; +} + +#messages { + border: 1px solid #ccc; +} + + +#content { + padding: 0; + margin: 0; + position: absolute; + left: 192px; + right: 10px; + top: 35px; + bottom: 10px; + line-height: 1.2em; + text-align: left; +} + +#bottom_bar { + position: absolute; + bottom: 0px; + width: 100%; + font-size: x-small; + text-align: center; +} + +#mapImage { + position: absolute; + left: 0px; +} +#drag { + top: 0px; + left: 14px; +} + +#mapEpilog { + font-size: x-small; +} + +#keyvalue { + font-size: small; + text-align: left; + border-collapse: collapse; + border-width: 0; +} + +#keyvalue.th { + font-weight: bold; +} + +.emphasized { + background-color: #82bcff; +} + + +#header { + float:left; + width:100%; + background:#DAE0D2 url("bg.gif") repeat-x bottom; + font-size:93%; + line-height:normal; +} +#header ul { + margin:0; + padding:10px 10px 0px 215px; + list-style:none; +} +#header li { + float:left; + /*background:url("left.gif") no-repeat left top;*/ + margin:0; + padding:0 0 0 9px; +} +#header li a { + float:left; + display:block; + /*background:url("right.gif") no-repeat right top;*/ + padding:5px 15px 4px 6px; + text-decoration:none; + font-weight:bold; + color:#765; +} +/* Commented Backslash Hack +hides rule from IE5-Mac \*/ +#header li a {float:none;} +/* End IE5-Mac hack */ +#header li a:hover { + color:#333; +} +#header #current { + /* background-image:url("left_on.gif"); */ +} +#header #current a { + background-image:url("right_on.gif"); + color:#333; + padding-bottom:5px; +} + +#tabnav +{ + height: 20px; + margin: 0px; + padding-left: 215px; + padding-top: 5px; + background: url('/images/tab_bottom.gif') repeat-x bottom; +} +#tabnav li +{ + margin: 0; + padding: 0; + display: inline; + list-style-type: none; +} +#tabnav a, #tabnav a:link, #tabnav a:visited +{ + float: left; + background: #f3f3f3; + font-size: 13px; + line-height: 14px; + font-weight: bold; + padding: 2px 10px 2px 10px; + margin-right: 4px; + border: 1px solid #ccc; + text-decoration: none; + color: #333; +} +#tabnav a:link.active, #tabnav a:visited.active +{ + border-bottom: 1px solid #fff; + background: #fff; + color: #000; +} +#tabnav a:link:hover +{ + background: #fff; +} + +#gads { + /* position: absolute; */ + left: 100px; + width: 700px; + text-align: center; + font-size: 10px; +} + + +.gpxsummary { + font-size: 12px; + color: gray; +} + +.gpxdesc { + font-style: italic; +} + +.table0 { + background: #f6f6f6; +} + +.table1 { + background: #fff; +} + + +.optionalbox { + width: 150px; + min-width: 150px; + margin: 10px; + padding: 10px; + border: 1px solid #ccc; + left: 0px; + line-height: 1.2em; + text-align: Left; + font-size: 12px; + background: #eee; +} + +.oboxheader { + font-size: 14px; + font-weight: bold; + line-height: 1.4em; + text-align: top; +} + +.optionalbox form { + margin: 0px; + padding: 0px; +} + +.optionalbox input { + width: 100%; +} + +.rsssmall { + position: relative; + top: 4px; +} + +#cclogo { + width: 150px; + min-width: 150px; + margin: 10px; + padding: 10px; + left: 0px; + line-height: 1.2em; + text-align: Left; + font-size: 14px; + font-weight: bold; + background: #fff; +} + +#controls img +{ + z-index: 9999; +} + +#controls +{ + position:absolute; + top:0px; + left:0px; + width:64px; + height:32px; + z-index: 9998; + cursor: pointer; +} + +#map { + position: absolute; + border: 1px solid black; + margin: 0px; + padding: 0px; + left: 0px; + right: 2px; + top: 0px; + bottom: 0px; +} + +#search_results { + display: none; + position: absolute; + border: 1px solid black; + margin: 0px; + padding: 0px; + width: 30%; + left: 0px; + top: 0px; + bottom: 0px; +} + +#search_results_content { + overflow: auto; + position: absolute; + font-size: 13px; + line-height: 14px; + top: 29px; + bottom: 0px; + left: 0px; + right: 0px; +} + +.search_results_title { + margin: 0px; + padding: 3px 6px 3px 6px; + height: 29px; + font-size: 14px; + line-height: 15px; + border-bottom: 1px solid black; + background: #bbb; +} + +.search_results_heading { + margin: 0px; + padding: 3px 6px 3px 6px; + border: 1px solid #ccc; + background: #ddd; +} + +.search_results_entry { + margin: 0px; + padding: 2px 6px 2px 6px; +} + +.search_results_error { + margin: 0px; + padding: 2px 6px 0px 6px; + color: #f00; +} + +.search_help { + font-size: 10px; + line-height: 1em; + margin-top: 3px; + margin-bottom: 0px; +} + +/* inbox and messaging stuff */ +.inbox-row-unread .inbox-subject { + font-weight: bold; +} + +/* rails error field stuff */ + +.fieldWithErrors { + padding: 2px; + background-color: red; + display: table; +} + +#notice { + border: 1px solid green; + padding: 7px; + background-color: #f0fff0; + margin-bottom: 20px; +} + +#errorExplanation { + width: 400px; + border: 2px solid red; + padding: 7px; + padding-bottom: 12px; + margin-bottom: 20px; + background-color: #f0f0f0; +} + +#errorExplanation h2 { + text-align: left; + font-weight: bold; + padding: 5px 5px 5px 15px; + font-size: 12px; + margin: -7px; + background-color: #c00; + color: #fff; +} + +#errorExplanation p { + color: #333; + margin-bottom: 0; + padding: 5px; +} + +#errorExplanation ul li { + font-size: 12px; + list-style: square; +} + +input { + border: 1px solid black; +} + +.nohome .location { + display: none; +} + +#homerow .message { + display: none; +} + +.nohome .message { + display: inline !important; +} + +.editDescription { + height : 10ex; + width : 30em; +} + +.nowrap { + white-space: nowrap; +} + +/** + * This now just used to detect the width/height required for the popup. + */ +#map p#highlightinfo { + visibility : hidden; + position : absolute; + z-index : 10000; + background : white; + border : 1px solid black; + left : 50px; + top : 5px; + margin : 0px; + padding : 2px; +} + +#map p#highlightinfo p, #popup p { + margin : 0; + padding : 2px; + } + + +/**State of the Map */ + +#sotminfo { + background: #9999FF; + font-size: 11px; + margin: 0px; + padding: 0px; + border: 1px solid #ccc; + left: 0px; + line-height: 1.2em; + text-align: Left; + font-weight: normal; +}