From 4187dbd8034516e120d70074a62be00050a21b04 Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Sat, 22 Oct 2016 03:58:19 -0400 Subject: [PATCH] fix it up (#804) --- app/assets/images/import.png | Bin 325 -> 0 bytes app/assets/images/topright_sprite.png | Bin 7333 -> 1646 bytes app/assets/stylesheets/clean.css.erb | 37 ++++++++++++++-------- app/views/layouts/_upperelements.html.erb | 12 ++++--- 4 files changed, 31 insertions(+), 18 deletions(-) delete mode 100644 app/assets/images/import.png diff --git a/app/assets/images/import.png b/app/assets/images/import.png deleted file mode 100644 index 29b5b89653aba363907399e286a688f8e6e4a6b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 325 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7a$D;Kb?2i11Zh|kH}&M z25w;xW@MN(M*=9wUgGKN%Km_hT|n4so6)K)pwJ~x7srr@!*8z{dN~IQv_5>V!f&!s zz-5AnnA5Zb)uz3#4VF%QAa^D#Cc;Zw`(XBGCQYG>6OOy?xg0AoqyE_$nLIDetYaQe zGZ?CwRVF@J!Q~+I!odI2q$k_jSk!m86--Ro7H+)X^6^DXGExe7Sm>w`Lw?7g6#k=Z; z>K&z%MSt~{+L&wSG1LnwymkNbo^e~xNw@E8^1M*9!1DsbD&`u-)%q$=PA~~9 Q0s4-?)78&qol`;+02Cy7jsO4v diff --git a/app/assets/images/topright_sprite.png b/app/assets/images/topright_sprite.png index 36feb89578f61bc8011c64f506bfa564370827c6..163dd6f7330b3323bf0e6d498a0c270a28cafc5c 100644 GIT binary patch literal 1646 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 - background-position: 0 0; - background-repeat: no-repeat; - width: 32px; -} + .starMap { background-image: url(<%= asset_path('starmap_sprite.png') %>); background-position: 0 0; @@ -464,7 +469,7 @@ } .zoomExtents:hover .tooltips, .zoomIn:hover .tooltips, .zoomOut:hover .tooltips, .takeScreenshot:hover .tooltips, .sidebarFilterIcon:hover .tooltipsUnder, .sidebarForkIcon:hover .tooltipsUnder, .addMap:hover .tooltipsUnder, .authenticated .sidebarAccountIcon:hover .tooltipsUnder, - .mapInfoIcon:hover .tooltipsAbove, .openCheatsheet:hover .tooltipsAbove, .chat-button:hover .tooltips, importDialog:hover .tooltipsAbove, .starMap:hover .tooltipsAbove, .openMetacodeSwitcher:hover .tooltipsAbove, .pinCarousel:not(.isPinned):hover .tooltipsAbove.helpPin, .pinCarousel.isPinned:hover .tooltipsAbove.helpUnpin { + .mapInfoIcon:hover .tooltipsAbove, .openCheatsheet:hover .tooltipsAbove, .chat-button:hover .tooltips, .importDialog:hover .tooltipsUnder, .starMap:hover .tooltipsAbove, .openMetacodeSwitcher:hover .tooltipsAbove, .pinCarousel:not(.isPinned):hover .tooltipsAbove.helpPin, .pinCarousel.isPinned:hover .tooltipsAbove.helpUnpin { display: block; } @@ -520,6 +525,10 @@ font-style: normal; } +.importDialog .tooltipsUnder { + left: -22px; +} + .sidebarFilterIcon .tooltipsUnder { margin-left: -4px; } @@ -600,7 +609,7 @@ border-bottom: 5px solid transparent; } -.sidebarFilterIcon div:after, .sidebarForkIcon div:after, .addMap div:after, .sidebarAccountIcon .tooltipsUnder:after { +.importDialog div:after, .sidebarFilterIcon div:after, .sidebarForkIcon div:after, .addMap div:after, .sidebarAccountIcon .tooltipsUnder:after { content: ''; position: absolute; right: 40%; diff --git a/app/views/layouts/_upperelements.html.erb b/app/views/layouts/_upperelements.html.erb index 1d26ced9..63de15fd 100644 --- a/app/views/layouts/_upperelements.html.erb +++ b/app/views/layouts/_upperelements.html.erb @@ -16,7 +16,7 @@ <% request = current_user && @map && @allrequests.find{|a| a.user == current_user} - className = (@map and not policy(@map).update?) ? 'isViewOnly ' : '' + className = (@map and not policy(@map).update?) ? 'isViewOnly ' : '' if @map className += 'sendRequest' if not request className += 'sentRequest' if request and not request.answered @@ -36,9 +36,13 @@
-
-
Import data
-
+ <% if current_user %> +
+
+ Import Data +
+
+ <% end %>