Merge branch 'master' into openstreetbugs
Conflicts: Gemfile Gemfile.lock lib/migrate.rb
This commit is contained in:
Tom Hughes
commit
e660e60966
565 changed files with 10835 additions and 29494 deletions
Binary file not shown.
|
Before Width: | Height: | Size: 43 B |
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 917 B After Width: | Height: | Size: 917 B |
|
|
@ -24,7 +24,7 @@ function createMap(divName, options) {
|
|||
theme: "<%= asset_path 'theme/default/style.css' %>"
|
||||
});
|
||||
|
||||
var mapnik = new OpenLayers.Layer.OSM.Mapnik(i18n("javascripts.map.base.mapnik"), {
|
||||
var mapnik = new OpenLayers.Layer.OSM.Mapnik(i18n("javascripts.map.base.standard"), {
|
||||
attribution: "",
|
||||
keyid: "mapnik",
|
||||
displayOutsideMaxExtent: true,
|
||||
|
|
@ -33,15 +33,6 @@ function createMap(divName, options) {
|
|||
});
|
||||
map.addLayer(mapnik);
|
||||
|
||||
var osmarender = new OpenLayers.Layer.OSM.Osmarender(i18n("javascripts.map.base.osmarender"), {
|
||||
attribution: "",
|
||||
keyid: "osmarender",
|
||||
displayOutsideMaxExtent: true,
|
||||
wrapDateLine: true,
|
||||
layerCode: "O"
|
||||
});
|
||||
map.addLayer(osmarender);
|
||||
|
||||
var cyclemap = new OpenLayers.Layer.OSM.CycleMap(i18n("javascripts.map.base.cycle_map"), {
|
||||
attribution: "Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>",
|
||||
keyid: "cyclemap",
|
||||
|
|
@ -75,11 +66,9 @@ function createMap(divName, options) {
|
|||
});
|
||||
map.addLayer(mapquest);
|
||||
|
||||
var numZoomLevels = Math.max(mapnik.numZoomLevels, osmarender.numZoomLevels);
|
||||
|
||||
markers = new OpenLayers.Layer.Markers("Markers", {
|
||||
displayInLayerSwitcher: false,
|
||||
numZoomLevels: numZoomLevels,
|
||||
numZoomLevels: 20,
|
||||
maxExtent: new OpenLayers.Bounds(-20037508,-20037508,20037508,20037508),
|
||||
maxResolution: 156543,
|
||||
units: "m",
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ function enterMenuAnchor(event, anchor, menu, delay, align) {
|
|||
clearTimeout(menu.timer);
|
||||
|
||||
if (delay > 0) {
|
||||
menu.timer = setTimeout(function () { openMenu(anchor, menu, align) }, delay);
|
||||
menu.timer = setTimeout(function () { openMenu(anchor, menu, align); }, delay);
|
||||
} else {
|
||||
openMenu(event, menu, align);
|
||||
}
|
||||
|
|
@ -48,7 +48,7 @@ function enterMenuAnchor(event, anchor, menu, delay, align) {
|
|||
function leaveMenuAnchor(event, anchor, menu) {
|
||||
var to = event.relatedTarget;
|
||||
|
||||
if (!menu.is(to) && menu.has(to).length == 0) {
|
||||
if (!menu.is(to) && menu.has(to).length === 0) {
|
||||
menu.hide();
|
||||
}
|
||||
|
||||
|
|
@ -61,7 +61,7 @@ function leaveMenuAnchor(event, anchor, menu) {
|
|||
function leaveMenu(event, anchor, menu) {
|
||||
var to = event.relatedTarget;
|
||||
|
||||
if (!anchor.is(to) && menu.has(to).length == 0) {
|
||||
if (!anchor.is(to) && menu.has(to).length === 0) {
|
||||
menu.hide();
|
||||
}
|
||||
|
||||
|
|
@ -75,9 +75,9 @@ function createMenu(anchorid, menuid, delay, align) {
|
|||
var anchor = $("#" + anchorid);
|
||||
var menu = $("#" + menuid);
|
||||
|
||||
anchor.mouseup(function (event) { closeMenu(menu) });
|
||||
anchor.mouseover(function (event) { enterMenuAnchor(anchor, anchor, menu, delay, align) });
|
||||
anchor.mouseout(function (event) { leaveMenuAnchor(event, anchor, menu) });
|
||||
menu.mouseup(function (event) { closeMenu(menu) });
|
||||
menu.mouseout(function (event) { leaveMenu(event, anchor, menu) });
|
||||
anchor.mouseup(function (event) { closeMenu(menu); });
|
||||
anchor.mouseover(function (event) { enterMenuAnchor(anchor, anchor, menu, delay, align); });
|
||||
anchor.mouseout(function (event) { leaveMenuAnchor(event, anchor, menu); });
|
||||
menu.mouseup(function (event) { closeMenu(menu); });
|
||||
menu.mouseout(function (event) { leaveMenu(event, anchor, menu); });
|
||||
}
|
||||
|
|
|
|||
|
|
@ -45,12 +45,13 @@ function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,objtype,obj
|
|||
var minzoom = match[1];
|
||||
var name = link.id.replace(/anchor$/, "");
|
||||
|
||||
$(link).off("click.minzoom");
|
||||
|
||||
if (zoom >= minzoom) {
|
||||
$(link).off("click");
|
||||
$(link).attr("title", i18n("javascripts.site." + name + "_tooltip"));
|
||||
$(link).removeClass("disabled");
|
||||
} else {
|
||||
$(link).click(function () { alert(i18n("javascripts.site." + name + "_zoom_alert")); return false; });
|
||||
$(link).on("click.minzoom", function () { alert(i18n("javascripts.site." + name + "_zoom_alert")); return false; });
|
||||
$(link).attr("title", i18n("javascripts.site." + name + "_disabled_tooltip"));
|
||||
$(link).addClass("disabled");
|
||||
}
|
||||
|
|
@ -72,17 +73,17 @@ function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,objtype,obj
|
|||
|
||||
// This is a hack to omit the default mapnik layer from the shortlink.
|
||||
if (layers && layers != "M") {
|
||||
args["layers"] = layers;
|
||||
args.layers = layers;
|
||||
}
|
||||
else {
|
||||
delete args["layers"];
|
||||
delete args.layers;
|
||||
}
|
||||
|
||||
// Here we're assuming that all parameters but ?layers= and
|
||||
// ?{node,way,relation}= can be safely omitted from the shortlink
|
||||
// which encodes lat/lon/zoom. If new URL parameters are added to
|
||||
// the main slippy map this needs to be changed.
|
||||
if (args["layers"] || args[objtype]) {
|
||||
if (args.layers || args[objtype]) {
|
||||
this.href = setArgs(prefix + "/go/" + code, args);
|
||||
} else {
|
||||
this.href = prefix + "/go/" + code;
|
||||
|
|
@ -105,7 +106,7 @@ function shortlinkPrefix() {
|
|||
* Called to get the arguments from a URL as a hash.
|
||||
*/
|
||||
function getArgs(url) {
|
||||
var args = new Object();
|
||||
var args = {};
|
||||
var querystart = url.indexOf("?");
|
||||
|
||||
if (querystart >= 0) {
|
||||
|
|
@ -116,7 +117,7 @@ function getArgs(url) {
|
|||
if (match = queryitems[i].match(/^(.*)=(.*)$/)) {
|
||||
args[unescape(match[1])] = unescape(match[2]);
|
||||
} else {
|
||||
args[unescape(queryitems[i])] = null
|
||||
args[unescape(queryitems[i])] = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -128,10 +129,9 @@ function getArgs(url) {
|
|||
* Called to set the arguments on a URL from the given hash.
|
||||
*/
|
||||
function setArgs(url, args) {
|
||||
var queryitems = new Array();
|
||||
var queryitems = [];
|
||||
|
||||
for (arg in args)
|
||||
{
|
||||
for (arg in args) {
|
||||
if (args[arg] == null) {
|
||||
queryitems.push(escape(arg));
|
||||
} else {
|
||||
|
|
@ -167,7 +167,7 @@ function getStyle(el, property) {
|
|||
* rails and then later by javascript.
|
||||
*/
|
||||
function i18n(string, keys) {
|
||||
string = i18n_strings[string] || string
|
||||
string = i18n_strings[string] || string;
|
||||
|
||||
for (var key in keys) {
|
||||
var re_key = '\\[\\[' + key + '\\]\\]';
|
||||
|
|
|
|||
|
|
@ -3,8 +3,10 @@
|
|||
/* Default rules for the body of every page */
|
||||
|
||||
body {
|
||||
font-family: Arial,sans-serif;
|
||||
color: #000;
|
||||
font-family: 'Helvetica Neue',Arial,sans-serif;
|
||||
font-size: 14px;
|
||||
line-height: 20px;
|
||||
color: #222;
|
||||
background-color: #fff;
|
||||
margin: 0px;
|
||||
padding: 0px;
|
||||
|
|
@ -34,12 +36,22 @@ hr {
|
|||
height: 1px;
|
||||
}
|
||||
|
||||
/* Default rules for headings */
|
||||
|
||||
h2 {
|
||||
margin: 5px 0;
|
||||
font-size: 25px;
|
||||
line-height: 30px;
|
||||
}
|
||||
|
||||
/* Rules for the whole left sidebar, including the logo */
|
||||
|
||||
#left {
|
||||
position: absolute;
|
||||
top: 0px;
|
||||
min-width: 170px;
|
||||
width: 185px;
|
||||
font-size: 11px;
|
||||
line-height: 12px;
|
||||
}
|
||||
|
||||
/* Rules for the OpenStreetMap logo in the top left corner */
|
||||
|
|
@ -48,22 +60,20 @@ hr {
|
|||
width: 170px;
|
||||
min-width: 170px;
|
||||
padding: 5px;
|
||||
margin: 5px;
|
||||
height: 150px;
|
||||
background: #fff;
|
||||
border: 1px solid #ccd;
|
||||
border-radius: 5px;
|
||||
-moz-border-radius: 5px;
|
||||
text-align: center;
|
||||
margin: 25px 0 5px 0;
|
||||
}
|
||||
|
||||
#logo h1 {
|
||||
font-size: 14px;
|
||||
font-size: 18px;
|
||||
line-height: 20px;
|
||||
text-align: center;
|
||||
margin: 0px;
|
||||
}
|
||||
|
||||
#logo h2 {
|
||||
font-size: 10px;
|
||||
line-height: 15px;
|
||||
margin: 0px;
|
||||
}
|
||||
|
||||
|
|
@ -76,13 +86,7 @@ hr {
|
|||
/* Rules for the introductory text displayed in the left sidebar to new users */
|
||||
|
||||
#intro {
|
||||
width: 170px;
|
||||
padding: 5px;
|
||||
margin: 5px;
|
||||
border: 1px solid #ccc;
|
||||
font-size: 11px;
|
||||
border-radius: 5px;
|
||||
-moz-border-radius: 5px;
|
||||
border-top: 1px solid #ccc;
|
||||
}
|
||||
|
||||
#intro p {
|
||||
|
|
@ -119,7 +123,7 @@ hr {
|
|||
padding: 5px;
|
||||
border: 1px solid #ccc;
|
||||
background: #ea0;
|
||||
line-height: 1.2em;
|
||||
line-height: 20px;
|
||||
font-size: 14px;
|
||||
border-radius: 5px;
|
||||
-moz-border-radius: 5px;
|
||||
|
|
@ -128,21 +132,13 @@ hr {
|
|||
/* Rules for the menu displayed in the left sidebar */
|
||||
|
||||
.left_menu {
|
||||
width: 170px;
|
||||
min-width: 170px;
|
||||
margin: 5px;
|
||||
padding: 5px;
|
||||
border: 1px solid #ccc;
|
||||
background: #ddd;
|
||||
line-height: 1.2em;
|
||||
margin: 4px 0;
|
||||
border-top: 1px solid #ccc;
|
||||
border-bottom: 1px solid #ccc;
|
||||
line-height: 20px;
|
||||
font-size: 14px;
|
||||
font-weight: bold;
|
||||
border-radius: 5px;
|
||||
-moz-border-radius: 5px;
|
||||
}
|
||||
|
||||
.left_menu td {
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
.left_menu h1 {
|
||||
|
|
@ -182,22 +178,15 @@ hr {
|
|||
*/
|
||||
|
||||
.optionalbox {
|
||||
width: 170px;
|
||||
min-width: 170px;
|
||||
margin: 5px;
|
||||
padding: 5px;
|
||||
border: 1px solid #ccc;
|
||||
line-height: 1.2em;
|
||||
font-size: 12px;
|
||||
background: #eee;
|
||||
border-radius: 5px;
|
||||
-moz-border-radius: 5px;
|
||||
margin: 4px 0;
|
||||
border-top: 1px solid #ccc;
|
||||
}
|
||||
|
||||
.optionalbox h1 {
|
||||
font-size: 14px;
|
||||
font-weight: bold;
|
||||
line-height: 22px;
|
||||
line-height: 20px;
|
||||
margin: 0px;
|
||||
vertical-align: bottom;
|
||||
}
|
||||
|
|
@ -205,13 +194,13 @@ hr {
|
|||
/* Rules for the search box */
|
||||
|
||||
.whereami {
|
||||
line-height: 22px;
|
||||
line-height: 20px;
|
||||
vertical-align: bottom;
|
||||
}
|
||||
|
||||
.search_container {
|
||||
height: 16px;
|
||||
padding-bottom: 6px;
|
||||
height: 15px;
|
||||
padding-bottom: 5px;
|
||||
}
|
||||
|
||||
#search_field form {
|
||||
|
|
@ -231,21 +220,19 @@ hr {
|
|||
}
|
||||
|
||||
.search_help {
|
||||
font-size: 10px;
|
||||
line-height: 1em;
|
||||
margin-top: 3px;
|
||||
margin-top: 2px;
|
||||
margin-bottom: 0px;
|
||||
}
|
||||
|
||||
/* Rules for donation request box */
|
||||
|
||||
.donate {
|
||||
width: 170px;
|
||||
margin: 5px;
|
||||
width: 155px;
|
||||
margin: 10px 5px;
|
||||
padding: 5px;
|
||||
border: 1px solid #ccc;
|
||||
background: #cbeea7;
|
||||
line-height: 1.2em;
|
||||
line-height: 20px;
|
||||
text-align: center;
|
||||
font-size: 14px;
|
||||
border-radius: 5px;
|
||||
|
|
@ -261,66 +248,58 @@ hr {
|
|||
|
||||
/* Rules for tabbed navigation bar */
|
||||
|
||||
#tabnav
|
||||
{
|
||||
height: 20px;
|
||||
margin: 0px;
|
||||
padding-top: 5px;
|
||||
background: image-url('tab_bottom.gif') repeat-x bottom;
|
||||
#top-bar {
|
||||
border-bottom: 1px solid #ccc;
|
||||
height: 29px;
|
||||
}
|
||||
|
||||
#tabnav li
|
||||
{
|
||||
margin: 0px;
|
||||
#tabnav {
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
overflow:hidden;
|
||||
}
|
||||
|
||||
#tabnav li {
|
||||
margin: 0px;
|
||||
padding: 0px;
|
||||
display: inline;
|
||||
list-style-type: none;
|
||||
}
|
||||
|
||||
#tabnav a, #tabnav a:link, #tabnav a:visited
|
||||
{
|
||||
background: #f3f3f3;
|
||||
font-size: 13px;
|
||||
line-height: 14px;
|
||||
#tabnav a, #tabnav a:link, #tabnav a:visited {
|
||||
background: #fff;
|
||||
font-size: 14px;
|
||||
line-height: 19px;
|
||||
font-weight: bold;
|
||||
padding: 2px 10px;
|
||||
border: 1px solid #ccc;
|
||||
padding: 5px 10px;
|
||||
text-decoration: none;
|
||||
color: #333;
|
||||
border-top-right-radius: 5px;
|
||||
-moz-border-radius-topright: 5px;
|
||||
border-top-left-radius: 5px;
|
||||
-moz-border-radius-topleft: 5px;
|
||||
}
|
||||
|
||||
#tabnav a:link.active, #tabnav a:visited.active
|
||||
{
|
||||
border-bottom: 1px solid #fff;
|
||||
background: #fff;
|
||||
#tabnav a:link.active, #tabnav a:visited.active {
|
||||
border-bottom: 1px solid #aaa;
|
||||
background: #9ed485;
|
||||
color: #000;
|
||||
}
|
||||
|
||||
#tabnav a:link:hover, #tabnav a:visited:hover
|
||||
{
|
||||
background: #fff;
|
||||
#tabnav a:link:hover, #tabnav a:visited:hover {
|
||||
text-decoration:underline;
|
||||
}
|
||||
|
||||
#tabnav a:link.disabled, #tabnav a:visited.disabled,
|
||||
#tabnav a:link:hover.disabled, #tabnav a:visited:hover.disabled
|
||||
{
|
||||
background: #bbbbbb;
|
||||
color: white
|
||||
#tabnav a:link.disabled,
|
||||
#tabnav a:visited.disabled,
|
||||
#tabnav a:link:hover.disabled,
|
||||
#tabnav a:visited:hover.disabled {
|
||||
color: #888;
|
||||
}
|
||||
|
||||
/* Rules for greeting bar in the top right corner */
|
||||
|
||||
#greeting {
|
||||
height: 20px;
|
||||
height: 28px;
|
||||
margin: 0px;
|
||||
padding-top: 5px;
|
||||
font-size: 13px;
|
||||
line-height: 14px;
|
||||
background: image-url('tab_bottom.gif') repeat-x bottom;
|
||||
line-height: 28px;
|
||||
}
|
||||
|
||||
.greeting-bar-unread {
|
||||
|
|
@ -338,8 +317,7 @@ hr {
|
|||
/* Rules for OpenLayers maps */
|
||||
|
||||
#map {
|
||||
border: 1px solid black;
|
||||
margin: 0px;
|
||||
margin: 0px;
|
||||
padding: 0px;
|
||||
}
|
||||
|
||||
|
|
@ -353,10 +331,16 @@ hr {
|
|||
#permalink {
|
||||
z-index: 10000;
|
||||
position: absolute;
|
||||
bottom: 15px;
|
||||
right: 15px;
|
||||
bottom: 0px;
|
||||
right: 0px;
|
||||
padding: 5px;
|
||||
background:#fff;
|
||||
text-align: right;
|
||||
font-size: smaller;
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
#permalink a {
|
||||
padding: 5px;
|
||||
}
|
||||
|
||||
/* Rules for edit menu */
|
||||
|
|
@ -396,7 +380,6 @@ hr {
|
|||
#sidebar {
|
||||
display: none;
|
||||
position: absolute;
|
||||
border: 1px solid black;
|
||||
margin: 0px;
|
||||
padding: 0px;
|
||||
width: 30%;
|
||||
|
|
@ -408,7 +391,7 @@ hr {
|
|||
overflow: auto;
|
||||
position: absolute;
|
||||
font-size: 13px;
|
||||
line-height: 14px;
|
||||
line-height: 15px;
|
||||
top: 29px;
|
||||
bottom: 0px;
|
||||
left: 0px;
|
||||
|
|
@ -417,11 +400,10 @@ hr {
|
|||
|
||||
#sidebar .sidebar_title {
|
||||
margin: 0px;
|
||||
padding: 3px 6px;
|
||||
padding: 3px 6px 4px 6px;
|
||||
height: 29px;
|
||||
font-size: 14px;
|
||||
line-height: 15px;
|
||||
border-bottom: 1px solid black;
|
||||
background: #bbb;
|
||||
}
|
||||
|
||||
|
|
@ -454,14 +436,14 @@ hr {
|
|||
|
||||
.search_results_heading {
|
||||
margin: 0px;
|
||||
padding: 3px 6px;
|
||||
border: 1px solid #ccc;
|
||||
background: #ddd;
|
||||
padding: 2px 5px;
|
||||
border-bottom: 1px solid #ccc;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.search_results_entry {
|
||||
margin: 0px;
|
||||
padding: 2px 6px;
|
||||
padding: 2px 5px;
|
||||
}
|
||||
|
||||
.search_results_error {
|
||||
|
|
@ -488,9 +470,9 @@ hr {
|
|||
|
||||
.export_heading {
|
||||
margin: 0px;
|
||||
padding: 3px 6px;
|
||||
border: 1px solid #ccc;
|
||||
background: #ddd;
|
||||
padding: 2px 5px;
|
||||
border-bottom: 1px solid #ccc;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.export_bounds {
|
||||
|
|
@ -531,11 +513,17 @@ hr {
|
|||
/* Rules for the main content area */
|
||||
|
||||
#content {
|
||||
padding: 0px;
|
||||
padding: 10px;
|
||||
margin: 0px;
|
||||
position: absolute;
|
||||
bottom: 10px;
|
||||
line-height: 1.2em;
|
||||
position: absolute;
|
||||
bottom: 0px;
|
||||
}
|
||||
|
||||
#content.site_index,
|
||||
#content.site_edit,
|
||||
#content.site_export {
|
||||
border: 0px;
|
||||
padding: 0px;
|
||||
}
|
||||
|
||||
#slim_container {
|
||||
|
|
@ -744,6 +732,7 @@ td.browse_comments table td span.by {
|
|||
position: relative;
|
||||
width: 90%;
|
||||
height: 400px;
|
||||
border: 1px solid #ccc;
|
||||
display: none;
|
||||
}
|
||||
|
||||
|
|
@ -847,6 +836,7 @@ p#contributorGuidance {
|
|||
position: relative;
|
||||
width: 500px;
|
||||
height: 400px;
|
||||
border: 1px solid #ccc;
|
||||
}
|
||||
|
||||
#accountImage td {
|
||||
|
|
@ -875,6 +865,7 @@ p#contributorGuidance {
|
|||
position: relative;
|
||||
width: 400px;
|
||||
height: 400px;
|
||||
border: 1px solid #ccc;
|
||||
}
|
||||
|
||||
.user_view .user_map p#no_home_location {
|
||||
|
|
@ -993,18 +984,20 @@ p#contributorGuidance {
|
|||
.fieldName {
|
||||
vertical-align: top;
|
||||
font-weight: bold;
|
||||
font-size: 12px;
|
||||
line-height: 20px;
|
||||
}
|
||||
|
||||
.minorNote {
|
||||
font-size: 0.8em;
|
||||
}
|
||||
|
||||
input[type="text"], input[type="email"], input[type="url"], input[type="password"], textarea {
|
||||
border: 1px solid black;
|
||||
}
|
||||
|
||||
input[type="submit"] {
|
||||
border: 1px solid black;
|
||||
input[type="text"],
|
||||
input[type="email"],
|
||||
input[type="url"],
|
||||
input[type="password"],
|
||||
textarea {
|
||||
border: 1px solid #888;
|
||||
}
|
||||
|
||||
/* Rules for user images */
|
||||
|
|
@ -1042,11 +1035,11 @@ abbr.geo {
|
|||
|
||||
/* Rules for doing distinct colour of alternate table rows */
|
||||
|
||||
.table0 {
|
||||
.table0 {
|
||||
background: #f6f6f6;
|
||||
}
|
||||
|
||||
.table1 {
|
||||
.table1 {
|
||||
background: #fff;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
/* Rules for the main content area */
|
||||
|
||||
#content {
|
||||
top: 35px;
|
||||
top: 30px;
|
||||
}
|
||||
|
||||
/* Rules for OpenLayers maps */
|
||||
|
|
|
|||
|
|
@ -68,15 +68,15 @@ html body {
|
|||
|
||||
/* Rules for tabbed navigation bar */
|
||||
|
||||
#tabnav
|
||||
{
|
||||
padding-left: 215px;
|
||||
#top-bar {
|
||||
margin-left: 185px;
|
||||
}
|
||||
|
||||
#tabnav a, #tabnav a:link, #tabnav a:visited
|
||||
{
|
||||
#tabnav a,
|
||||
#tabnav a:link,
|
||||
#tabnav a:visited {
|
||||
float: left;
|
||||
margin-right: 4px;
|
||||
margin-right: 1px;
|
||||
}
|
||||
|
||||
/* Rules for greeting bar in the top right corner */
|
||||
|
|
@ -92,6 +92,12 @@ html body {
|
|||
left: 15px
|
||||
}
|
||||
|
||||
/* Rules for OpenLayers maps */
|
||||
|
||||
#map {
|
||||
border-left: 1px solid #ccc;
|
||||
}
|
||||
|
||||
/* Rules for attribution text under the main map shown on printouts */
|
||||
|
||||
.attribution_license {
|
||||
|
|
@ -106,7 +112,7 @@ html body {
|
|||
|
||||
#sidebar {
|
||||
left: 0px;
|
||||
margin-right: 3px;
|
||||
border-left: 1px solid #ccc;
|
||||
}
|
||||
|
||||
#sidebar #sidebar_title {
|
||||
|
|
@ -120,8 +126,9 @@ html body {
|
|||
/* Rules for the main content area */
|
||||
|
||||
#content {
|
||||
left: 192px;
|
||||
right: 10px;
|
||||
border-left: 1px solid #ccc;
|
||||
left: 185px;
|
||||
right: 0px;
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
|
|
@ -187,12 +194,6 @@ html body {
|
|||
float: right;
|
||||
}
|
||||
|
||||
/* Rules for the login page */
|
||||
|
||||
#login_wrapper input[type=submit] {
|
||||
float: right;
|
||||
}
|
||||
|
||||
/* Rules for the account confirmation page */
|
||||
|
||||
form#termsForm div#buttons {
|
||||
|
|
@ -230,7 +231,7 @@ form#termsForm input#agree {
|
|||
text-align: right;
|
||||
}
|
||||
|
||||
input.openid_url {
|
||||
input.openid_url {
|
||||
background: image-url('openid_input.png') repeat-y left white;
|
||||
padding-left: 16px;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -68,16 +68,15 @@ html body {
|
|||
|
||||
/* Rules for tabbed navigation bar */
|
||||
|
||||
|
||||
#tabnav
|
||||
{
|
||||
padding-right: 215px;
|
||||
#top-bar {
|
||||
margin-right: 185px
|
||||
}
|
||||
|
||||
#tabnav a, #tabnav a:link, #tabnav a:visited
|
||||
{
|
||||
#tabnav a,
|
||||
#tabnav a:link,
|
||||
#tabnav a:visited {
|
||||
float: right;
|
||||
margin-left: 4px;
|
||||
margin-left: 1px;
|
||||
}
|
||||
|
||||
/* Rules for greeting bar in the top right corner */
|
||||
|
|
@ -93,6 +92,12 @@ html body {
|
|||
right: 15px
|
||||
}
|
||||
|
||||
/* Rules for OpenLayers maps */
|
||||
|
||||
#map {
|
||||
border-right: 1px solid #ccc;
|
||||
}
|
||||
|
||||
/* Rules for attribution text under the main map shown on printouts */
|
||||
|
||||
.attribution_license {
|
||||
|
|
@ -107,7 +112,7 @@ html body {
|
|||
|
||||
#sidebar {
|
||||
right: 0px;
|
||||
margin-left: 3px;
|
||||
border-right: 1px solid #ccc;
|
||||
}
|
||||
|
||||
#sidebar #sidebar_title {
|
||||
|
|
@ -121,8 +126,9 @@ html body {
|
|||
/* Rules for the main content area */
|
||||
|
||||
#content {
|
||||
right: 192px;
|
||||
left: 10px;
|
||||
border-right: 1px solid #ccc;
|
||||
right: 185px;
|
||||
left: 0px;
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
|
|
@ -188,12 +194,6 @@ html body {
|
|||
float: left;
|
||||
}
|
||||
|
||||
/* Rules for the login page */
|
||||
|
||||
#login_wrapper input[type=submit] {
|
||||
float: left;
|
||||
}
|
||||
|
||||
/* Rules for the account confirmation page */
|
||||
|
||||
form#termsForm div#buttons {
|
||||
|
|
@ -231,7 +231,7 @@ form#termsForm input#agree {
|
|||
text-align: left;
|
||||
}
|
||||
|
||||
input.openid_url {
|
||||
input.openid_url {
|
||||
background: image-url('openid_input.png') repeat-y right white;
|
||||
padding-right: 16px;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,24 +17,23 @@ h1 {
|
|||
}
|
||||
|
||||
/* Rules for tabbed navigation bar */
|
||||
#top-bar {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
#tabnav
|
||||
{
|
||||
#tabnav {
|
||||
height: 14px;
|
||||
margin: 0px;
|
||||
padding-left: 3px;
|
||||
padding-top: 5px;
|
||||
margin-top: 18px;
|
||||
background: image-url('tab_bottom.gif') repeat-x bottom;
|
||||
font-size: 10px;
|
||||
line-height: 10px;
|
||||
}
|
||||
|
||||
#tabnav a, #tabnav a:link, #tabnav a:visited
|
||||
{
|
||||
#tabnav a, #tabnav a:link, #tabnav a:visited {
|
||||
font-size: 10px;
|
||||
line-height: 10px;
|
||||
padding: 1px 5px;
|
||||
padding: 2px 5px;
|
||||
margin-right: 1px;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue