glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix it up (#804)

Browse source
This commit is contained in:
Connor Turland 2016-10-22 03:58:19 -04:00 committed by GitHub
parent d549083cce
commit 4187dbd803
4 changed files with 31 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
app/assets/images/import.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 325 B

BIN
app/assets/images/topright_sprite.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.2 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

37
app/assets/stylesheets/clean.css.erb
View file

@ -192,24 +192,34 @@
background-repeat: no-repeat; background-repeat: no-repeat;
cursor: pointer; cursor: pointer;
} }
.mapPage .mapElement .importDialog {
display: none;
background-position: 0 0;
}
.mapPage.canEditMap .mapElement .importDialog {
display: block;
}
.sidebarFilterIcon { .sidebarFilterIcon {
background-position: -64px 0; background-position: -32px 0;
} }
.sidebarForkIcon { .sidebarForkIcon {
background-position: -96px 0; background-position: -64px 0;
} }
.addMap { .addMap {
background-position: -128px 0; background-position: -96px 0;
margin-right:10px; margin-right:10px;
} }
.importDialog:hover {
background-position: 0 -32px;
}
.sidebarFilterIcon:hover { .sidebarFilterIcon:hover {
background-position: -64px -32px; background-position: -32px -32px;
} }
.sidebarForkIcon:hover { .sidebarForkIcon:hover {
background-position: -96px -32px; background-position: -64px -32px;
} }
.addMap:hover { .addMap:hover {
background-position: -128px -32px; background-position: -96px -32px;
margin-right:10px; margin-right:10px;
} }
@ -382,12 +392,7 @@
.mapPage .mapInfoIcon { .mapPage .mapInfoIcon {
top: 0; top: 0;
} }
.importDialog {
background-image: url(<%= asset_path('import.png') %>);
background-position: 0 0;
background-repeat: no-repeat;
width: 32px;
}
.starMap { .starMap {
background-image: url(<%= asset_path('starmap_sprite.png') %>); background-image: url(<%= asset_path('starmap_sprite.png') %>);
background-position: 0 0; 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, .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; display: block;
} }
@ -520,6 +525,10 @@
font-style: normal; font-style: normal;
} }
.importDialog .tooltipsUnder {
left: -22px;
}
.sidebarFilterIcon .tooltipsUnder { .sidebarFilterIcon .tooltipsUnder {
margin-left: -4px; margin-left: -4px;
} }
@ -600,7 +609,7 @@
border-bottom: 5px solid transparent; 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: ''; content: '';
position: absolute; position: absolute;
right: 40%; right: 40%;

12
app/views/layouts/_upperelements.html.erb
View file

@ -16,7 +16,7 @@
</div> <!-- end sidebarSearch --> </div> <!-- end sidebarSearch -->
<% request = current_user && @map && @allrequests.find{|a| a.user == current_user} <% 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 if @map
className += 'sendRequest' if not request className += 'sendRequest' if not request
className += 'sentRequest' if request and not request.answered className += 'sentRequest' if request and not request.answered
@ -36,9 +36,13 @@
<div class="upperRightUI"> <div class="upperRightUI">
<div class="mapElement upperRightEl upperRightMapButtons"> <div class="mapElement upperRightEl upperRightMapButtons">
<div class="importDialog infoElement mapElement openLightbox" data-open="import-dialog-lightbox"> <% if current_user %>
<div class="tooltipsAbove">Import data</div> <div class="importDialog upperRightEl upperRightIcon mapElement openLightbox" data-open="import-dialog-lightbox">
</div> <div class="tooltipsUnder">
Import Data
</div>
</div>
<% end %>
<!-- filtering --> <!-- filtering -->
<div class="sidebarFilter upperRightEl"> <div class="sidebarFilter upperRightEl">