Tidy up the stylesheets, removing lots of ancient, unused junk and

trying to group everything else together in more logical fashion.
This commit is contained in:
Tom Hughes 2010-03-03 15:46:16 +00:00
parent 4bbd7f5310
commit 318c7a9854
10 changed files with 531 additions and 589 deletions

View file

@ -7,9 +7,9 @@
<%= javascript_include_tag 'site' %>
<!--[if lt IE 7]><%= javascript_include_tag 'pngfix' %><![endif]--> <!-- thanks, microsoft! -->
<%= stylesheet_link_tag 'common' %>
<!--[if IE]><%= stylesheet_link_tag 'site', :media => "screen" %><![endif]--> <!-- IE is totally broken with CSS media queries -->
<%= stylesheet_link_tag 'site-sml', :media => "only screen and (max-width: 481px)" %>
<%= stylesheet_link_tag 'site', :media => "screen and (min-width: 482px)" %>
<!--[if IE]><%= stylesheet_link_tag 'large', :media => "screen" %><![endif]--> <!-- IE is totally broken with CSS media queries -->
<%= stylesheet_link_tag 'small', :media => "only screen and (max-width: 481px)" %>
<%= stylesheet_link_tag 'large', :media => "screen and (min-width: 482px)" %>
<%= stylesheet_link_tag 'print', :media => "print" %>
<%= tag("link", { :rel => "search", :type => "application/opensearchdescription+xml", :title => "OpenStreetMap Search", :href => "/opensearch/osm.xml" }) %>
<%= tag("meta", { :name => "description", :content => "OpenStreetMap is the free wiki world map." }) %>
@ -134,7 +134,7 @@
<a href="http://donate.openstreetmap.org/" title="<%= h(t('layouts.make_a_donation.title')) %>"><%= h(t('layouts.make_a_donation.text')) %></a>
</div>
<div id="cclogo" class="button" style="width: 88px">
<div id="cclogo" style="width: 88px">
<%= link_to(
image_tag("cc_button.png",
:alt => t('layouts.license.alt'),

View file

@ -32,8 +32,8 @@
<% content_for "optionals" do %>
<div class="optionalbox">
<span class="oboxheader"><%= t 'site.search.search' %></span>
<span class="whereami"><a href="javascript:describeLocation()" title="<%= t 'site.search.where_am_i_title' %>"><%= t 'site.search.where_am_i' %></a></span>
<h1><%= t 'site.search.search' %></h1>
<div class="search_form">
<div id="search_field">
<% form_remote_tag(:before => "setSearchViewbox()",

View file

@ -10,7 +10,7 @@
<% end %>
</td>
<td class="<%= cl %>"><%= link_to trace.name, {:controller => 'trace', :action => 'view', :display_name => trace.user.display_name, :id => trace.id} %>
<span class="gpxsummary" title="<%= trace.timestamp %>"> ...
<span class="trace_summary" title="<%= trace.timestamp %>"> ...
<% if trace.inserted %>
(<%= t'trace.trace.count_points', :count => trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/,'\1,') %>)
<% end %>

View file

@ -1,6 +1,6 @@
<%= render :partial => 'trace_paging_nav' %>
<table id="keyvalue" cellpadding="3">
<table id="trace_list" cellpadding="3">
<tr>
<th></th>
<th></th>

View file

@ -1,7 +1,6 @@
<% content_for "optionals" do %>
<div class="optionalbox">
<span class="oboxheader"><%= t'trace.trace_optionals.tags' %></span>
<br />
<h1><%= t'trace.trace_optionals.tags' %></h1>
<br />
<% if @all_tags %>
<% @all_tags.each do |tag| %>

View file

@ -1,23 +1,6 @@
a, a:visited, a:active, a:link, a:hover {
color: #00f;
text-decoration: none;
}
/* Styles common to large and small screens */
a:hover {
text-decoration: underline;
}
#frontpage_main {
width: 100%;
text-align: center;
font-family: sans-serif;
}
#frontpage_MAIN h1 {
font-size: xx-large;
font-weight: normal;
}
/* Default rules for the body of every page */
body {
font-family: Arial,sans-serif;
@ -27,12 +10,36 @@ body {
padding: 0px;
}
/* Rules for links */
a {
color: #00f;
text-decoration: none;
}
a:hover {
text-decoration: underline;
}
/* Rules for horizontal lines */
hr {
border: none;
background-color: #ccc;
color: #ccc;
height: 1px;
}
/* Rules for the whole left sidebar, including the logo */
#left {
position: absolute;
top: -8px;
min-width: 150px;
}
/* Rules for the OpenStreetMap logo in the top left corner */
#logo {
width: 150px;
min-width: 150px;
@ -42,54 +49,19 @@ body {
background: #fff;
border: 1px solid #ccd;
}
#logo h1 {
font-size: 14px;
text-align: center;
margin: 0px;
}
#logo h2 {
font-size: 10px;
margin: 0px;
}
/* The Map Key sidebar */
#mapkey h3 {
font-size: 110%;
font-weight: normal;
text-align: center;
}
#mapkey .mapkey-table {
padding-left: 5px;
padding-right: 5px;
}
/*#mapkey .mapkey-table-key {}*/
#mapkey .mapkey-table-value {
font-size: 90%;
}
#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;
}
#small-greeting {
display: none;
}
/* An unread message (e.g. "inbox(1)") */
.greeting-bar-unread {
font-weight: bold;
}
/* Rules for the introductory text displayed in the left sidebar to new users */
#intro {
width: 170px;
@ -100,6 +72,12 @@ body {
#intro p { margin: 10px; }
/*
* Rules for alert boxes shown in the left sidebar when important
* information needs to be conveyed such as when the site is
* undergoing maintenance.
*/
#alert {
width: 150px;
margin: 10px;
@ -111,10 +89,11 @@ body {
font-size: 14px;
}
#sotm {
width: 170px;
padding: 0px;
}
/*
* Rules for notice boxes shown in the left sidebar when important, but
* non-critical information needs to be conveyed such as notices about
* donation drives.
*/
.notice {
width: 150px;
@ -127,16 +106,7 @@ body {
font-size: 14px;
}
.donate {
width: 150px;
margin: 10px;
padding: 10px;
border: 1px solid #ccc;
background: #cbeea7;
line-height: 1.2em;
text-align: center;
font-size: 14px;
}
/* Rules for the menu displayed in the left sidebar */
.left_menu {
width: 150px;
@ -165,7 +135,6 @@ body {
}
.left_menu ul {
/*list-style: none;*/
padding-left: 10px;
margin: 0px;
}
@ -179,193 +148,22 @@ body {
margin: 2px 8px 0px 0px;
}
.left_menu a, .left_menu a:visited, .left_menu a:active, .left_menu a:link, .left_menu a:hover {
.left_menu a {
color: #000;
text-decoration: none;
}
.left_menu a:hover {
color: #000;
text-decoration: underline;
}
/* Rules for SOTM advert */
#messages {
border: 1px solid #ccc;
}
#content {
#sotm {
width: 170px;
padding: 0px;
margin: 0px;
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;
}
#changeset_list, #keyvalue {
font-size: small;
text-align: left;
border-collapse: collapse;
border-width: 0px;
}
#changeset_list {
width: 100%;
}
#changeset_list .date {
white-space: nowrap;
}
#changeset_list .user {
white-space: nowrap;
}
#changeset_list .area {
white-space: nowrap;
}
#changeset_list.th {
font-weight: bold;
}
.emphasized {
background-color: #82bcff;
}
#header {
float: left;
width: 100%;
background: #DAE0D2;
font-size: 93%;
line-height: normal;
}
#header ul {
margin: 0px;
padding: 10px 10px 0px 215px;
list-style: none;
}
#header li {
float: left;
margin: 0px;
padding: 0px 0px 0px 9px;
}
#header li a {
float: left;
display: block;
padding: 5px 15px 4px 6px;
text-decoration: none;
font-weight: bold;
color: #765;
}
#header li a {float:none;}
#header li a:hover {
color: #333;
}
#header #current a {
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: 0px;
padding: 0px;
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;
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;
}
hr {
border: none;
background-color: #ccc;
color: #ccc;
height: 1px;
}
.gpxsummary {
font-size: 12px;
color: gray;
}
.gpxdesc {
font-style: italic;
}
.table0 {
background: #f6f6f6;
}
.table1 {
background: #fff;
}
/*
* Rules for "optional boxes" which appear in the left sidebar on
* certain pages. Current users are the seach box on the main page
* and the tag cloud on the traces pages.
*/
.optionalbox {
width: 150px;
@ -380,27 +178,31 @@ hr {
background: #eee;
}
.oboxheader {
.optionalbox h1 {
font-size: 14px;
font-weight: bold;
line-height: 22px;
margin: 0px;
vertical-align: bottom;
}
/* Rules for the search box */
.whereami {
position: absolute;
right: 21px;
line-height: 22px;
vertical-align: bottom;
float: right;
}
.optionalbox form {
margin: 0px;
padding: 0px;
.search_form {
height: 16px;
padding-bottom: 6px;
}
#search_field form {
width: 100%;
margin: 0px;
padding: 0px;
}
#search_field input[type="text"] {
@ -411,37 +213,106 @@ hr {
width: 26px;
}
.search_form {
height: 16px;
padding-bottom: 6px;
.search_help {
font-size: 10px;
line-height: 1em;
margin-top: 3px;
margin-bottom: 0px;
}
.rsssmall {
position: relative;
top: 4px;
/* Rules for donation request box */
.donate {
width: 150px;
margin: 10px;
padding: 10px;
border: 1px solid #ccc;
background: #cbeea7;
line-height: 1.2em;
text-align: center;
font-size: 14px;
}
.button {
/* Rules for Creative Commons logo button */
#cclogo {
margin-top: 10px;
margin-bottom: 10px;
}
#controls img
/* Rules for tabbed navigation bar */
#tabnav
{
z-index: 9999;
height: 20px;
margin: 0px;
padding-left: 215px;
padding-top: 5px;
background: url('../images/tab_bottom.gif') repeat-x bottom;
}
#controls
#tabnav li
{
position:absolute;
top: 0px;
left: 0px;
width: 64px;
height: 32px;
z-index: 9998;
cursor: pointer;
margin: 0px;
padding: 0px;
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;
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;
}
/* Rules for greeting bar in the top right corner */
#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;
}
.greeting-bar-unread {
font-weight: bold;
}
/* Rules for the message shown in place of the map when javascript is disabled */
#noscript {
z-index: 20000000;
position: absolute;
top: 15px;
left: 15px
}
/* Rules for OpenLayers maps */
#map {
position: absolute;
border: 1px solid black;
@ -453,6 +324,27 @@ hr {
bottom: 0px;
}
.olControlAttribution {
display: none !important;
}
#map #permalink {
z-index:10000;
position:absolute;
bottom:15px;
right:15px;
font-size:smaller;
text-align: right;
}
/* Rules for attribution text under the main map shown on printouts */
#attribution {
display: none;
}
/* Rules for the popout map sidebar */
#sidebar {
display: none;
position: absolute;
@ -486,16 +378,31 @@ hr {
background: #bbb;
}
.browse_heading {
margin: 0px;
padding: 3px 6px;
border: 1px solid #ccc;
background: #ddd;
/* Rules for the map key which appears in the popout sidebar */
#mapkey h3 {
font-size: 110%;
font-weight: normal;
text-align: center;
}
.browse_details {
margin: 0px;
padding: 0px 6px;
#mapkey .mapkey-table {
padding-left: 5px;
padding-right: 5px;
}
#mapkey .mapkey-table-key {
}
#mapkey .mapkey-table-value {
font-size: 90%;
}
/* Rules for search results which appear in the popout sidebar */
.search_searching {
margin-top: 5px;
margin-bottom: 5px;
}
.search_results_heading {
@ -516,145 +423,21 @@ hr {
color: #f00;
}
.search_help {
font-size: 10px;
line-height: 1em;
margin-top: 3px;
margin-bottom: 0px;
}
/* Rules for data browser information which appears in the popout sidebar */
.search_searching {
margin-top: 5px;
margin-bottom: 5px;
}
.olControlAttribution {
display: none !important;
}
/* inbox and messaging stuff */
.inbox-row-unread .inbox-subject {
font-weight: bold;
}
/* rails error field stuff */
.fieldWithErrors {
padding: 2px;
background-color: red;
display: table;
}
#error {
border: 1px solid red;
padding: 7px;
background-color: #fff0f0;
margin-bottom: 20px;
}
#warning {
border: 1px solid orange;
padding: 7px;
background-color: #fff6f0;
margin-bottom: 20px;
}
#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: 0px;
padding: 5px;
}
#errorExplanation ul li {
font-size: 12px;
list-style: square;
}
input[type="text"], input[type="password"], textarea {
border: 1px solid black;
}
input[type="submit"] {
border: 1px solid black;
}
#accountForm td {
padding-bottom: 10px;
}
#accountImage td {
padding-bottom: 0px;
}
.fieldName {
text-align:right;
font-weight:bold;
}
.nohome .location {
display: none;
}
#homerow .message {
display: none;
}
.nohome .message {
display: inline !important;
}
.minorNote {
font-size:0.8em;
}
.nowrap {
white-space: nowrap;
}
#map #popup p {
.browse_heading {
margin: 0px;
padding: 2px;
padding: 3px 6px;
border: 1px solid #ccc;
background: #ddd;
}
#permalink {
z-index:10000;
position:absolute;
bottom:15px;
right:15px;
font-size:smaller;
text-align: right;
.browse_details {
margin: 0px;
padding: 0px 6px;
}
#attribution {
display: none;
}
/* Rules for export information which appears in the popout sidebar */
.export_heading {
margin: 0px;
@ -698,17 +481,174 @@ input[type="submit"] {
text-align: center;
}
#noscript {
z-index: 20000000;
position: absolute;
top: 15px;
left: 15px
/* Rules for the main content area */
#content {
padding: 0px;
margin: 0px;
position: absolute;
right: 10px;
bottom: 10px;
line-height: 1.2em;
text-align: left;
}
abbr.geo {
border-bottom: none;
/* Rules for the changeset list shown by the history tab etc */
#changeset_list, #keyvalue {
width: 100%;
font-size: small;
text-align: left;
border-collapse: collapse;
border-width: 0px;
}
#changeset_list .date {
white-space: nowrap;
}
#changeset_list .user {
white-space: nowrap;
}
#changeset_list .area {
white-space: nowrap;
}
#changeset_list.th {
font-weight: bold;
}
/* Rules for the trace list shown by the traces tab etc */
#trace_list {
font-size: small;
text-align: left;
border-collapse: collapse;
border-width: 0px;
}
#trace_list .trace_summary {
font-size: 12px;
color: gray;
}
/* Rules for the account settings page */
#accountForm td {
padding-bottom: 10px;
}
#accountImage td {
padding-bottom: 0px;
}
.nohome .location {
display: none;
}
#homerow .message {
display: none;
}
.nohome .message {
display: inline !important;
}
/* Rules for message in/out box page */
#messages {
border: 1px solid #ccc;
}
.inbox-row-unread .inbox-subject {
font-weight: bold;
}
/* Rules for "flash" notice boxes shown at the top of the content area */
#error {
border: 1px solid red;
padding: 7px;
background-color: #fff0f0;
margin-bottom: 20px;
}
#warning {
border: 1px solid orange;
padding: 7px;
background-color: #fff6f0;
margin-bottom: 20px;
}
#notice {
border: 1px solid green;
padding: 7px;
background-color: #f0fff0;
margin-bottom: 20px;
}
/* Rules for highlighting fields with rails validation errors */
.fieldWithErrors {
padding: 2px;
background-color: red;
display: table;
}
/* Rules for rails validation error boxes */
#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: 0px;
padding: 5px;
}
#errorExplanation ul li {
font-size: 12px;
list-style: square;
}
/* Rules for forms */
.fieldName {
text-align: right;
font-weight: bold;
}
.minorNote {
font-size: 0.8em;
}
input[type="text"], input[type="password"], textarea {
border: 1px solid black;
}
input[type="submit"] {
border: 1px solid black;
}
/* Rules for user images */
img.user_image {
max-width: 100px;
max-height: 100px;
@ -720,3 +660,32 @@ img.user_thumbnail {
max-height: 100px;
border: 1px solid black;
}
/* Rule for "nowrap" class that can be applied to anything to stop wrapping */
.nowrap {
white-space: nowrap;
}
/* Rules for geo microformats */
abbr.geo {
border-bottom: none;
}
/* Rules for RSS buttons */
.rsssmall {
position: relative;
top: 4px;
}
/* Rules for doing distinct colour of alternate table rows */
.table0 {
background: #f6f6f6;
}
.table1 {
background: #fff;
}

View file

@ -0,0 +1,20 @@
/* Styles specific to large screens */
/* Rules for greeting bar in the top right corner */
#small-greeting {
display: none;
}
/* Rules for the main content area */
#content {
left: 192px;
top: 35px;
}
/* Rules for OpenLayers maps */
.olControlPanZoom {
display: none;
}

View file

@ -1,148 +0,0 @@
/* styles specific to a small-format screen, such as iPhone, Android, etc... */
body {
font-size: 12px;
}
h1 {
font-size: 14px;
}
#logo {
width: 100px;
min-width: 100px;
padding: 10px;
margin: 10px;
margin-top: 10px;
height: 70px;
background: #fff;
border: 1px solid #ccd;
}
#logo h1 {
font-size: 11px;
text-align: center;
margin: 0px;
}
#logo h2 {
font-size: 8px;
margin: 0px;
}
#logo-img {
display: none;
}
#tabnav
{
height: 14px;
margin: 0px;
padding-left: 10px;
padding-top: 5px;
margin-top: 18px;
background: url('../images/tab_bottom.gif') repeat-x bottom;
font-size: 10px;
line-height: 10px;
}
#tabnav li
{
margin: 0px;
padding: 0px;
display: inline;
list-style-type: none;
}
#tabnav a, #tabnav a:link, #tabnav a:visited
{
float: left;
background: #f3f3f3;
font-size: 10px;
line-height: 10px;
font-weight: bold;
padding: 1px 5px;
margin-right: 1px;
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;
}
#left {
display: none;
min-width: 100px;
top: 20px;
}
#intro {
display: none;
}
.left_menu {
width: 100px;
min-width: 100px;
}
.optionalbox {
width: 100px;
min-width: 100px;
}
.donate {
width: 100px;
min-width: 100px;
}
#content {
/* left: 142px; */
left: 10px;
top: 47px;
}
#greeting {
position: absolute;
top: 0px;
right: 0px;
height: 14px;
font-size: 12px;
line-height: 12px;
white-space: nowrap;
background: none;
}
#full-greeting {
display: none;
}
#small-greeting {
display: inline;
}
#signupForm input[type="text"], #signupForm input[type="password"] {
width: 100%;
}
#signupForm input#user_email {
max-width: 30em;
}
#signupForm input#user_email_confirmation {
max-width: 30em;
}
#signupForm input#user_display_name {
max-width: 20em;
}
#signupForm input#user_pass_crypt {
max-width: 20em;
}
#signupForm input#user_pass_crypt_confirmation {
max-width: 20em;
}
#loginForm input#user_email {
width: 100%;
max-width: 18em;
}
#loginForm input#user_password {
width: 100%;
max-width: 18em;
}
.olControlPanZoomBar {
display: none;
}

View file

@ -1,9 +0,0 @@
/* styles specific to a large-format screen */
#logo-img-sml {
display: none;
}
.olControlPanZoom {
display: none;
}

View file

@ -0,0 +1,111 @@
/* Styles specific to a small screen, such as iPhone, Android, etc... */
/* Default rules for the body of every page */
body {
font-size: 12px;
}
h1 {
font-size: 14px;
}
/* Rules for the whole left sidebar, including the logo */
#left {
display: none;
}
/* Rules for tabbed navigation bar */
#tabnav
{
height: 14px;
margin: 0px;
padding-left: 10px;
padding-top: 5px;
margin-top: 18px;
background: url('../images/tab_bottom.gif') repeat-x bottom;
font-size: 10px;
line-height: 10px;
}
#tabnav a, #tabnav a:link, #tabnav a:visited
{
font-size: 10px;
line-height: 10px;
padding: 1px 5px;
margin-right: 1px;
}
/* Rules for greeting bar in the top right corner */
#greeting {
position: absolute;
top: 0px;
right: 0px;
height: 14px;
font-size: 12px;
line-height: 12px;
white-space: nowrap;
background: none;
}
#full-greeting {
display: none;
}
#small-greeting {
display: inline;
}
/* Rules for OpenLayers maps */
.olControlPanZoomBar {
display: none;
}
/* Rules for the main content area */
#content {
left: 10px;
top: 47px;
}
/* Rules for the signup form */
#signupForm input[type="text"], #signupForm input[type="password"] {
width: 100%;
}
#signupForm input#user_email {
max-width: 30em;
}
#signupForm input#user_email_confirmation {
max-width: 30em;
}
#signupForm input#user_display_name {
max-width: 20em;
}
#signupForm input#user_pass_crypt {
max-width: 20em;
}
#signupForm input#user_pass_crypt_confirmation {
max-width: 20em;
}
/* Rules for the login form */
#loginForm input#user_email {
width: 100%;
max-width: 18em;
}
#loginForm input#user_password {
width: 100%;
max-width: 18em;
}