From ac40c0af484b1049895db2c5ac09e1acb829abf8 Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Fri, 14 Nov 2014 08:21:09 -0500 Subject: [PATCH] touched up tooltips --- .../icons/{Open Data => opendata_96px}/OD_API.png | Bin .../OD_Business Data.png | Bin .../OD_Cloud-hosted Data.png | Bin .../OD_Creative Commons Data.png | Bin .../OD_Data Analyst.png | Bin .../{Open Data => opendata_96px}/OD_Data Mining.png | Bin .../OD_Data Scientist.png | Bin .../icons/{Open Data => opendata_96px}/OD_Data.png | Bin .../{Open Data => opendata_96px}/OD_Database.png | Bin .../{Open Data => opendata_96px}/OD_Geolocation.png | Bin .../OD_Government Data.png | Bin .../{Open Data => opendata_96px}/OD_Hacker.png | Bin .../{Open Data => opendata_96px}/OD_Map Data.png | Bin .../{Open Data => opendata_96px}/OD_Mapper.png | Bin .../{Open Data => opendata_96px}/OD_Metadata.png | Bin .../{Open Data => opendata_96px}/OD_Open Data.png | Bin .../OD_Open Innovation.png | Bin .../{Open Data => opendata_96px}/OD_Startup.png | Bin .../{Open Data => opendata_96px}/OD_algorithm.png | Bin app/assets/stylesheets/clean.css | 6 +++++- app/views/layouts/_lowermapelements.html.erb | 2 +- app/views/layouts/_upperelements.html.erb | 4 ++-- 22 files changed, 8 insertions(+), 4 deletions(-) rename app/assets/images/icons/{Open Data => opendata_96px}/OD_API.png (100%) rename app/assets/images/icons/{Open Data => opendata_96px}/OD_Business Data.png (100%) rename app/assets/images/icons/{Open Data => opendata_96px}/OD_Cloud-hosted Data.png (100%) rename app/assets/images/icons/{Open Data => opendata_96px}/OD_Creative Commons Data.png (100%) rename app/assets/images/icons/{Open Data => opendata_96px}/OD_Data Analyst.png (100%) rename app/assets/images/icons/{Open Data => opendata_96px}/OD_Data Mining.png (100%) rename app/assets/images/icons/{Open Data => opendata_96px}/OD_Data Scientist.png (100%) rename app/assets/images/icons/{Open Data => opendata_96px}/OD_Data.png (100%) rename app/assets/images/icons/{Open Data => opendata_96px}/OD_Database.png (100%) rename app/assets/images/icons/{Open Data => opendata_96px}/OD_Geolocation.png (100%) rename app/assets/images/icons/{Open Data => opendata_96px}/OD_Government Data.png (100%) rename app/assets/images/icons/{Open Data => opendata_96px}/OD_Hacker.png (100%) rename app/assets/images/icons/{Open Data => opendata_96px}/OD_Map Data.png (100%) rename app/assets/images/icons/{Open Data => opendata_96px}/OD_Mapper.png (100%) rename app/assets/images/icons/{Open Data => opendata_96px}/OD_Metadata.png (100%) rename app/assets/images/icons/{Open Data => opendata_96px}/OD_Open Data.png (100%) rename app/assets/images/icons/{Open Data => opendata_96px}/OD_Open Innovation.png (100%) rename app/assets/images/icons/{Open Data => opendata_96px}/OD_Startup.png (100%) rename app/assets/images/icons/{Open Data => opendata_96px}/OD_algorithm.png (100%) diff --git a/app/assets/images/icons/Open Data/OD_API.png b/app/assets/images/icons/opendata_96px/OD_API.png similarity index 100% rename from app/assets/images/icons/Open Data/OD_API.png rename to app/assets/images/icons/opendata_96px/OD_API.png diff --git a/app/assets/images/icons/Open Data/OD_Business Data.png b/app/assets/images/icons/opendata_96px/OD_Business Data.png similarity index 100% rename from app/assets/images/icons/Open Data/OD_Business Data.png rename to app/assets/images/icons/opendata_96px/OD_Business Data.png diff --git a/app/assets/images/icons/Open Data/OD_Cloud-hosted Data.png b/app/assets/images/icons/opendata_96px/OD_Cloud-hosted Data.png similarity index 100% rename from app/assets/images/icons/Open Data/OD_Cloud-hosted Data.png rename to app/assets/images/icons/opendata_96px/OD_Cloud-hosted Data.png diff --git a/app/assets/images/icons/Open Data/OD_Creative Commons Data.png b/app/assets/images/icons/opendata_96px/OD_Creative Commons Data.png similarity index 100% rename from app/assets/images/icons/Open Data/OD_Creative Commons Data.png rename to app/assets/images/icons/opendata_96px/OD_Creative Commons Data.png diff --git a/app/assets/images/icons/Open Data/OD_Data Analyst.png b/app/assets/images/icons/opendata_96px/OD_Data Analyst.png similarity index 100% rename from app/assets/images/icons/Open Data/OD_Data Analyst.png rename to app/assets/images/icons/opendata_96px/OD_Data Analyst.png diff --git a/app/assets/images/icons/Open Data/OD_Data Mining.png b/app/assets/images/icons/opendata_96px/OD_Data Mining.png similarity index 100% rename from app/assets/images/icons/Open Data/OD_Data Mining.png rename to app/assets/images/icons/opendata_96px/OD_Data Mining.png diff --git a/app/assets/images/icons/Open Data/OD_Data Scientist.png b/app/assets/images/icons/opendata_96px/OD_Data Scientist.png similarity index 100% rename from app/assets/images/icons/Open Data/OD_Data Scientist.png rename to app/assets/images/icons/opendata_96px/OD_Data Scientist.png diff --git a/app/assets/images/icons/Open Data/OD_Data.png b/app/assets/images/icons/opendata_96px/OD_Data.png similarity index 100% rename from app/assets/images/icons/Open Data/OD_Data.png rename to app/assets/images/icons/opendata_96px/OD_Data.png diff --git a/app/assets/images/icons/Open Data/OD_Database.png b/app/assets/images/icons/opendata_96px/OD_Database.png similarity index 100% rename from app/assets/images/icons/Open Data/OD_Database.png rename to app/assets/images/icons/opendata_96px/OD_Database.png diff --git a/app/assets/images/icons/Open Data/OD_Geolocation.png b/app/assets/images/icons/opendata_96px/OD_Geolocation.png similarity index 100% rename from app/assets/images/icons/Open Data/OD_Geolocation.png rename to app/assets/images/icons/opendata_96px/OD_Geolocation.png diff --git a/app/assets/images/icons/Open Data/OD_Government Data.png b/app/assets/images/icons/opendata_96px/OD_Government Data.png similarity index 100% rename from app/assets/images/icons/Open Data/OD_Government Data.png rename to app/assets/images/icons/opendata_96px/OD_Government Data.png diff --git a/app/assets/images/icons/Open Data/OD_Hacker.png b/app/assets/images/icons/opendata_96px/OD_Hacker.png similarity index 100% rename from app/assets/images/icons/Open Data/OD_Hacker.png rename to app/assets/images/icons/opendata_96px/OD_Hacker.png diff --git a/app/assets/images/icons/Open Data/OD_Map Data.png b/app/assets/images/icons/opendata_96px/OD_Map Data.png similarity index 100% rename from app/assets/images/icons/Open Data/OD_Map Data.png rename to app/assets/images/icons/opendata_96px/OD_Map Data.png diff --git a/app/assets/images/icons/Open Data/OD_Mapper.png b/app/assets/images/icons/opendata_96px/OD_Mapper.png similarity index 100% rename from app/assets/images/icons/Open Data/OD_Mapper.png rename to app/assets/images/icons/opendata_96px/OD_Mapper.png diff --git a/app/assets/images/icons/Open Data/OD_Metadata.png b/app/assets/images/icons/opendata_96px/OD_Metadata.png similarity index 100% rename from app/assets/images/icons/Open Data/OD_Metadata.png rename to app/assets/images/icons/opendata_96px/OD_Metadata.png diff --git a/app/assets/images/icons/Open Data/OD_Open Data.png b/app/assets/images/icons/opendata_96px/OD_Open Data.png similarity index 100% rename from app/assets/images/icons/Open Data/OD_Open Data.png rename to app/assets/images/icons/opendata_96px/OD_Open Data.png diff --git a/app/assets/images/icons/Open Data/OD_Open Innovation.png b/app/assets/images/icons/opendata_96px/OD_Open Innovation.png similarity index 100% rename from app/assets/images/icons/Open Data/OD_Open Innovation.png rename to app/assets/images/icons/opendata_96px/OD_Open Innovation.png diff --git a/app/assets/images/icons/Open Data/OD_Startup.png b/app/assets/images/icons/opendata_96px/OD_Startup.png similarity index 100% rename from app/assets/images/icons/Open Data/OD_Startup.png rename to app/assets/images/icons/opendata_96px/OD_Startup.png diff --git a/app/assets/images/icons/Open Data/OD_algorithm.png b/app/assets/images/icons/opendata_96px/OD_algorithm.png similarity index 100% rename from app/assets/images/icons/Open Data/OD_algorithm.png rename to app/assets/images/icons/opendata_96px/OD_algorithm.png diff --git a/app/assets/stylesheets/clean.css b/app/assets/stylesheets/clean.css index 50177050..3461e768 100644 --- a/app/assets/stylesheets/clean.css +++ b/app/assets/stylesheets/clean.css @@ -704,6 +704,10 @@ .mapPage .infoAndHelp, .topicPage .infoAndHelp{ right: 70px; } +.mapPage .openCheatsheet .tooltipsAbove, .topicPage .openCheatsheat .tooltipsAbove { + left: 29px; +} + .infoAndHelp { position: fixed; bottom: 20px; @@ -878,7 +882,7 @@ } .openCheatsheet .tooltipsAbove { - left: 29px; + left: -4px; } .sidebarAccountIcon .tooltipsUnder { diff --git a/app/views/layouts/_lowermapelements.html.erb b/app/views/layouts/_lowermapelements.html.erb index 918b89c1..50e4296e 100644 --- a/app/views/layouts/_lowermapelements.html.erb +++ b/app/views/layouts/_lowermapelements.html.erb @@ -2,7 +2,7 @@
Capture Screenshot
Center View
Zoom In
-
Zoom In
+
Zoom Out
diff --git a/app/views/layouts/_upperelements.html.erb b/app/views/layouts/_upperelements.html.erb index 167641d4..3efa9cd4 100644 --- a/app/views/layouts/_upperelements.html.erb +++ b/app/views/layouts/_upperelements.html.erb @@ -52,7 +52,7 @@ <% if authenticated? %>
-
Save to new map
+
Save To New Map
<% end %> @@ -61,7 +61,7 @@ <% if authenticated? %> -
Create new map
+
Create New Map
<% end %>