]> git.openstreetmap.org Git - rails.git/commitdiff
projects / rails.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 78e97ad)
Use full page width when editing with iD
authorJohn Firebaugh <john.firebaugh@gmail.com>
Wed, 31 Jul 2013 18:46:32 +0000 (11:46 -0700)
committerTom Hughes <tom@compton.nu>
Fri, 9 Aug 2013 23:38:46 +0000 (00:38 +0100)
app/assets/stylesheets/common.css.scss patch | blob | history
app/assets/stylesheets/small.css.scss patch | blob | history
app/controllers/site_controller.rb patch | blob | history
app/helpers/application_helper.rb patch | blob | history
app/views/layouts/site.html.erb patch | blob | history

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 93179f78dcbcde42340b6439cb83a3c7eaf13862..a73c8e86d86799d8a0088a5c053bde369aeba3b7 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -250,6 +250,10 @@ table {
 
 #small-title {
   display: none;
+
+  img {
+    vertical-align: text-bottom;
+  }
 }
 
 /* Rules for the introductory text displayed in the left sidebar to new users */
@@ -444,6 +448,7 @@ a.donate {
 .site-index #top-bar,
 .site-export #top-bar {
   position: fixed;
+  top: 0;
   left: 0;
   right: 0;
 }
@@ -1013,10 +1018,6 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   text-align: left;
 }
 
-.site-edit #content {
-  top: 30px;
-}
-
 #content.maximised {
   top: 0;
   left: 0;
@@ -2147,6 +2148,30 @@ a.button {
 /*
  * Rules for the iD editor
  */
+
+.site-edit-id {
+  #left,
+  #large-title {
+    display: none;
+  }
+
+  #small-title {
+    display: inline-block;
+    width: 185px;
+    height: 30px;
+    font-size: 14px;
+    margin: 0;
+    background-color: #eee;
+    border-bottom: 1px solid #ccc;
+    text-align: center;
+    padding-top: 7px;
+  }
+
+  #content {
+    left: 0;
+  }
+}
+
 .id-embed {
   width: 100%;
   height: 100%;
diff --git a/app/assets/stylesheets/small.css.scss b/app/assets/stylesheets/small.css.scss
index a6bf475c3661ae90da227e0e7d51d643693c5cd8..5e21ce1861eedfd6c60edd81fa20d2e3dd735e20 100644 (file)
--- a/app/assets/stylesheets/small.css.scss
+++ b/app/assets/stylesheets/small.css.scss
@@ -74,29 +74,12 @@ h2, h3, h4 {
 /* Rules for the site name - shown when left sidebar is hidden */
 
 #small-title {
-  font-size: 12px;
-  line-height: 14px;
-  height: 16px;
+  font-size: 10px;
   display: block;
   position: absolute;
   left: 5px;
   top: 5px;
-  padding: 2px;
-  width: 110px;
-  background-color: #fff;
-  z-index: 100;
-}
-
-#small-title img {
-  position: absolute;
-}
-
-#small-title h1 {
-  position: absolute;
-  font-size: 10px;
-  line-height: 18px;
   margin: 0;
-  left: 22px;
 }
 
 /* Rules for greeting bar in the top right corner */
diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 3b0a19cf91d70d2c516076ca4ab71074fe1dc886..b2212645c2761d764e03287a23b8dc6f79af0ec1 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -59,6 +59,8 @@ class SiteController < ApplicationController
       return
     end
 
+    @extra_body_class = "site-edit-#{editor}"
+
     if params[:node]
       bbox = Node.find(params[:node]).bbox.to_unscaled
       @lat = bbox.centre_lat
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 3a0ad084b5f15ac30808d7aeb14f5154e19442a6..160e25e3581aae47d488974dd49de6d95fe8f644 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -102,4 +102,8 @@ module ApplicationHelper
   def friendly_date(date)
     content_tag(:span, time_ago_in_words(date), :title => l(date, :format => :friendly))
   end
+
+  def body_class
+    [params[:controller], "#{params[:controller]}-#{params[:action]}", @extra_body_class].compact.join(" ")
+  end
 end
diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index 548dc35fbf9c43a1c7ee30f42b4d4b8b02045c2e..a0e894e462c315e834dd193ae01fea1a4b403f54 100644 (file)
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%= I18n.locale %>" lang="<%= I18n.locale %>" dir="<%= dir %>">
   <%= render :partial => "layouts/head" %>
-  <body class="<%= params[:controller] %> <%= params[:controller] %>-<%= params[:action] %>">
-    <div id="small-title">
-      <%= link_to(image_tag("osm_logo.png", :size => "16x16", :alt => t('layouts.logo.alt_text')), root_path) %>
-      <h1><%= t 'layouts.project_name.h1' %></h1>
-    </div>
-        <div id="left">
+  <body class="<%= body_class %>">
+    <h1 id="small-title">
+      <%= image_tag "osm_logo.png", :size => "16x16", :alt => t('layouts.logo.alt_text') %>
+      <%= t 'layouts.project_name.h1' %>
+    </h1>
+    <div id="left">
       <div id="logo">
         <%= link_to(image_tag("osm_logo.png",
           :size => "120x120",
The OpenStreetMap web site