diff --git a/.gitignore b/.gitignore
index 91b6ef85..7f8b9b0f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
# git config --global core.excludesfile ~/.gitignore_global
#assety stuff
+public/css
public/assets
public/metamaps_mobile
public/api/index.html
diff --git a/README-frontend.md b/README-frontend.md
index 5d086600..368d2673 100644
--- a/README-frontend.md
+++ b/README-frontend.md
@@ -1,19 +1,11 @@
-To setup javascript dev, first run
- npm install
+Make sure you have `nodemon` and `node-sass` installed
+`$ npm install -g nodemon node-sass`
-to set up your testing environment. Then use
- npm run test
+Run both of the following at the same time, in two terminals
-to see the results of testing the current javascript files.
-
-To build the javascript files, run
-
- npm run build
-
-If you are actively developing and would like any changes to trigger a rebuild, you can use
-
- npm run build:watch
-
-instead.
+```
+$ nodemon server.js
+$ node-sass -w sass/application.scss public/css/application.css
+```
\ No newline at end of file
diff --git a/public/stylesheets/Fonts/din-reg.eot b/public/fonts/din-reg.eot
similarity index 100%
rename from public/stylesheets/Fonts/din-reg.eot
rename to public/fonts/din-reg.eot
diff --git a/public/stylesheets/Fonts/din-reg.svg b/public/fonts/din-reg.svg
similarity index 100%
rename from public/stylesheets/Fonts/din-reg.svg
rename to public/fonts/din-reg.svg
diff --git a/public/stylesheets/Fonts/din-reg.ttf b/public/fonts/din-reg.ttf
similarity index 100%
rename from public/stylesheets/Fonts/din-reg.ttf
rename to public/fonts/din-reg.ttf
diff --git a/public/stylesheets/Fonts/din-reg.woff b/public/fonts/din-reg.woff
similarity index 100%
rename from public/stylesheets/Fonts/din-reg.woff
rename to public/fonts/din-reg.woff
diff --git a/public/stylesheets/Fonts/din.eot b/public/fonts/din.eot
similarity index 100%
rename from public/stylesheets/Fonts/din.eot
rename to public/fonts/din.eot
diff --git a/public/stylesheets/Fonts/din.svg b/public/fonts/din.svg
similarity index 100%
rename from public/stylesheets/Fonts/din.svg
rename to public/fonts/din.svg
diff --git a/public/stylesheets/Fonts/din.ttf b/public/fonts/din.ttf
similarity index 100%
rename from public/stylesheets/Fonts/din.ttf
rename to public/fonts/din.ttf
diff --git a/public/stylesheets/Fonts/din.woff b/public/fonts/din.woff
similarity index 100%
rename from public/stylesheets/Fonts/din.woff
rename to public/fonts/din.woff
diff --git a/public/index.html b/public/index.html
index 1d2d3199..851d5781 100644
--- a/public/index.html
+++ b/public/index.html
@@ -15,9 +15,9 @@
-
Document
+ Metamaps
-
+
diff --git a/public/stylesheets/jquery.mCustomScrollbar.css.erb b/public/stylesheets/jquery.mCustomScrollbar.css.erb
deleted file mode 100644
index f9266519..00000000
--- a/public/stylesheets/jquery.mCustomScrollbar.css.erb
+++ /dev/null
@@ -1,473 +0,0 @@
-/* basic scrollbar styling */
-/* vertical scrollbar */
-.mCSB_container{
- width:auto;
- margin-right:30px;
- overflow:hidden;
-}
-.mCSB_container.mCS_no_scrollbar{
- margin-right:0;
-}
-.mCS_disabled>.mCustomScrollBox>.mCSB_container.mCS_no_scrollbar,
-.mCS_destroyed>.mCustomScrollBox>.mCSB_container.mCS_no_scrollbar{
- margin-right:30px;
-}
-.mCustomScrollBox>.mCSB_scrollTools{
- width:16px;
- height:100%;
- top:0;
- right:0;
-}
-.mCSB_scrollTools .mCSB_draggerContainer{
- position:absolute;
- top:0;
- left:0;
- bottom:0;
- right:0;
- height:auto;
-}
-.mCSB_scrollTools a+.mCSB_draggerContainer{
- margin:20px 0;
-}
-.mCSB_scrollTools .mCSB_draggerRail{
- width:2px;
- height:100%;
- margin:0 auto;
- -webkit-border-radius:10px;
- -moz-border-radius:10px;
- border-radius:10px;
-}
-.mCSB_scrollTools .mCSB_dragger{
- cursor:pointer;
- width:100%;
- height:30px;
-}
-.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
- width:4px;
- height:100%;
- margin:0 auto;
- -webkit-border-radius:10px;
- -moz-border-radius:10px;
- border-radius:10px;
- text-align:center;
-}
-.mCSB_scrollTools .mCSB_buttonUp,
-.mCSB_scrollTools .mCSB_buttonDown{
- display:block;
- position:relative;
- height:20px;
- overflow:hidden;
- margin:0 auto;
- cursor:pointer;
-}
-.mCSB_scrollTools .mCSB_buttonDown{
- top:100%;
- margin-top:-40px;
-}
-/* horizontal scrollbar */
-.mCSB_horizontal>.mCSB_container{
- height:auto;
- margin-right:0;
- margin-bottom:30px;
- overflow:hidden;
-}
-.mCSB_horizontal>.mCSB_container.mCS_no_scrollbar{
- margin-bottom:0;
-}
-.mCS_disabled>.mCSB_horizontal>.mCSB_container.mCS_no_scrollbar,
-.mCS_destroyed>.mCSB_horizontal>.mCSB_container.mCS_no_scrollbar{
- margin-right:0;
- margin-bottom:30px;
-}
-.mCSB_horizontal.mCustomScrollBox>.mCSB_scrollTools{
- width:100%;
- height:16px;
- top:auto;
- right:auto;
- bottom:0;
- left:0;
- overflow:hidden;
-}
-.mCSB_horizontal>.mCSB_scrollTools a+.mCSB_draggerContainer{
- margin:0 20px;
-}
-.mCSB_horizontal>.mCSB_scrollTools .mCSB_draggerRail{
- width:100%;
- height:2px;
- margin:7px 0;
- -webkit-border-radius:10px;
- -moz-border-radius:10px;
- border-radius:10px;
-}
-.mCSB_horizontal>.mCSB_scrollTools .mCSB_dragger{
- width:30px;
- height:100%;
-}
-.mCSB_horizontal>.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
- width:100%;
- height:4px;
- margin:6px auto;
- -webkit-border-radius:10px;
- -moz-border-radius:10px;
- border-radius:10px;
-}
-.mCSB_horizontal>.mCSB_scrollTools .mCSB_buttonLeft,
-.mCSB_horizontal>.mCSB_scrollTools .mCSB_buttonRight{
- display:block;
- position:relative;
- width:20px;
- height:100%;
- overflow:hidden;
- margin:0 auto;
- cursor:pointer;
- float:left;
-}
-.mCSB_horizontal>.mCSB_scrollTools .mCSB_buttonRight{
- margin-left:-40px;
- float:right;
-}
-.mCustomScrollBox{
- -ms-touch-action:none; /*MSPointer events - direct all pointer events to js*/
-}
-
-/* default scrollbar colors and backgrounds (default theme) */
-.mCustomScrollBox>.mCSB_scrollTools{
- opacity:0.75;
- filter:"alpha(opacity=75)"; -ms-filter:"alpha(opacity=75)"; /* old ie */
-}
-.mCustomScrollBox:hover>.mCSB_scrollTools{
- opacity:1;
- filter:"alpha(opacity=100)"; -ms-filter:"alpha(opacity=100)"; /* old ie */
-}
-.mCSB_scrollTools .mCSB_draggerRail{
- background:#000; /* rgba fallback */
- background:rgba(0,0,0,0.4);
- filter:"alpha(opacity=40)"; -ms-filter:"alpha(opacity=40)"; /* old ie */
-}
-.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
- background:#fff; /* rgba fallback */
- background:rgba(255,255,255,0.75);
- filter:"alpha(opacity=75)"; -ms-filter:"alpha(opacity=75)"; /* old ie */
-}
-.mCSB_scrollTools .mCSB_dragger:hover .mCSB_dragger_bar{
- background:rgba(255,255,255,0.85);
- filter:"alpha(opacity=85)"; -ms-filter:"alpha(opacity=85)"; /* old ie */
-}
-.mCSB_scrollTools .mCSB_dragger:active .mCSB_dragger_bar,
-.mCSB_scrollTools .mCSB_dragger.mCSB_dragger_onDrag .mCSB_dragger_bar{
- background:rgba(255,255,255,0.9);
- filter:"alpha(opacity=90)"; -ms-filter:"alpha(opacity=90)"; /* old ie */
-}
-.mCSB_scrollTools .mCSB_buttonUp,
-.mCSB_scrollTools .mCSB_buttonDown,
-.mCSB_scrollTools .mCSB_buttonLeft,
-.mCSB_scrollTools .mCSB_buttonRight{
- background-repeat:no-repeat;
- opacity:0.4;
- filter:"alpha(opacity=40)"; -ms-filter:"alpha(opacity=40)"; /* old ie */
-}
-.mCSB_scrollTools .mCSB_buttonUp{
- background-position:0 0;
- /*
- sprites locations are 0 0/-16px 0/-32px 0/-48px 0 (light) and -80px 0/-96px 0/-112px 0/-128px 0 (dark)
- */
-}
-.mCSB_scrollTools .mCSB_buttonDown{
- background-position:0 -20px;
- /*
- sprites locations are 0 -20px/-16px -20px/-32px -20px/-48px -20px (light) and -80px -20px/-96px -20px/-112px -20px/-128px -20px (dark)
- */
-}
-.mCSB_scrollTools .mCSB_buttonLeft{
- background-position:0 -40px;
- /*
- sprites locations are 0 -40px/-20px -40px/-40px -40px/-60px -40px (light) and -80px -40px/-100px -40px/-120px -40px/-140px -40px (dark)
- */
-}
-.mCSB_scrollTools .mCSB_buttonRight{
- background-position:0 -56px;
- /*
- sprites locations are 0 -56px/-20px -56px/-40px -56px/-60px -56px (light) and -80px -56px/-100px -56px/-120px -56px/-140px -56px (dark)
- */
-}
-.mCSB_scrollTools .mCSB_buttonUp:hover,
-.mCSB_scrollTools .mCSB_buttonDown:hover,
-.mCSB_scrollTools .mCSB_buttonLeft:hover,
-.mCSB_scrollTools .mCSB_buttonRight:hover{
- opacity:0.75;
- filter:"alpha(opacity=75)"; -ms-filter:"alpha(opacity=75)"; /* old ie */
-}
-.mCSB_scrollTools .mCSB_buttonUp:active,
-.mCSB_scrollTools .mCSB_buttonDown:active,
-.mCSB_scrollTools .mCSB_buttonLeft:active,
-.mCSB_scrollTools .mCSB_buttonRight:active{
- opacity:0.9;
- filter:"alpha(opacity=90)"; -ms-filter:"alpha(opacity=90)"; /* old ie */
-}
-
-/*scrollbar themes*/
-/*dark (dark colored scrollbar)*/
-.mCS-dark>.mCSB_scrollTools .mCSB_draggerRail{
- background:#000; /* rgba fallback */
- background:rgba(0,0,0,0.15);
-}
-.mCS-dark>.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
- background:#000; /* rgba fallback */
- background:rgba(0,0,0,0.75);
-}
-.mCS-dark>.mCSB_scrollTools .mCSB_dragger:hover .mCSB_dragger_bar{
- background:rgba(0,0,0,0.85);
-}
-.mCS-dark>.mCSB_scrollTools .mCSB_dragger:active .mCSB_dragger_bar,
-.mCS-dark>.mCSB_scrollTools .mCSB_dragger.mCSB_dragger_onDrag .mCSB_dragger_bar{
- background:rgba(0,0,0,0.9);
-}
-.mCS-dark>.mCSB_scrollTools .mCSB_buttonUp{
- background-position:-80px 0;
-}
-.mCS-dark>.mCSB_scrollTools .mCSB_buttonDown{
- background-position:-80px -20px;
-}
-.mCS-dark>.mCSB_scrollTools .mCSB_buttonLeft{
- background-position:-80px -40px;
-}
-.mCS-dark>.mCSB_scrollTools .mCSB_buttonRight{
- background-position:-80px -56px;
-}
-/*light-2*/
-.mCS-light-2>.mCSB_scrollTools .mCSB_draggerRail{
- width:4px;
- background:#fff; /* rgba fallback */
- background:rgba(255,255,255,0.1);
- -webkit-border-radius:1px;
- -moz-border-radius:1px;
- border-radius:1px;
-}
-.mCS-light-2>.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
- width:4px;
- background:#fff; /* rgba fallback */
- background:rgba(255,255,255,0.75);
- -webkit-border-radius:1px;
- -moz-border-radius:1px;
- border-radius:1px;
-}
-.mCS-light-2.mCSB_horizontal>.mCSB_scrollTools .mCSB_draggerRail{
- width:100%;
- height:4px;
- margin:6px 0;
-}
-.mCS-light-2.mCSB_horizontal>.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
- width:100%;
- height:4px;
- margin:6px auto;
-}
-.mCS-light-2>.mCSB_scrollTools .mCSB_dragger:hover .mCSB_dragger_bar{
- background:rgba(255,255,255,0.85);
-}
-.mCS-light-2>.mCSB_scrollTools .mCSB_dragger:active .mCSB_dragger_bar,
-.mCS-light-2>.mCSB_scrollTools .mCSB_dragger.mCSB_dragger_onDrag .mCSB_dragger_bar{
- background:rgba(255,255,255,0.9);
-}
-.mCS-light-2>.mCSB_scrollTools .mCSB_buttonUp{
- background-position:-32px 0;
-}
-.mCS-light-2>.mCSB_scrollTools .mCSB_buttonDown{
- background-position:-32px -20px;
-}
-.mCS-light-2>.mCSB_scrollTools .mCSB_buttonLeft{
- background-position:-40px -40px;
-}
-.mCS-light-2>.mCSB_scrollTools .mCSB_buttonRight{
- background-position:-40px -56px;
-}
-/*dark-2*/
-.mCS-dark-2>.mCSB_scrollTools .mCSB_draggerRail{
- width:4px;
- background:#000; /* rgba fallback */
- background:rgba(0,0,0,0.1);
- -webkit-border-radius:1px;
- -moz-border-radius:1px;
- border-radius:1px;
-}
-.mCS-dark-2>.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
- width:4px;
- background:#000; /* rgba fallback */
- background:rgba(0,0,0,0.75);
- -webkit-border-radius:1px;
- -moz-border-radius:1px;
- border-radius:1px;
-}
-.mCS-dark-2.mCSB_horizontal>.mCSB_scrollTools .mCSB_draggerRail{
- width:100%;
- height:4px;
- margin:6px 0;
-}
-.mCS-dark-2.mCSB_horizontal>.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
- width:100%;
- height:4px;
- margin:6px auto;
-}
-.mCS-dark-2>.mCSB_scrollTools .mCSB_dragger:hover .mCSB_dragger_bar{
- background:rgba(0,0,0,0.85);
-}
-.mCS-dark-2>.mCSB_scrollTools .mCSB_dragger:active .mCSB_dragger_bar,
-.mCS-dark-2>.mCSB_scrollTools .mCSB_dragger.mCSB_dragger_onDrag .mCSB_dragger_bar{
- background:rgba(0,0,0,0.9);
-}
-.mCS-dark-2>.mCSB_scrollTools .mCSB_buttonUp{
- background-position:-112px 0;
-}
-.mCS-dark-2>.mCSB_scrollTools .mCSB_buttonDown{
- background-position:-112px -20px;
-}
-.mCS-dark-2>.mCSB_scrollTools .mCSB_buttonLeft{
- background-position:-120px -40px;
-}
-.mCS-dark-2>.mCSB_scrollTools .mCSB_buttonRight{
- background-position:-120px -56px;
-}
-/*light-thick*/
-.mCS-light-thick>.mCSB_scrollTools .mCSB_draggerRail{
- width:4px;
- background:#fff; /* rgba fallback */
- background:rgba(255,255,255,0.1);
- -webkit-border-radius:2px;
- -moz-border-radius:2px;
- border-radius:2px;
-}
-.mCS-light-thick>.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
- width:6px;
- background:#fff; /* rgba fallback */
- background:rgba(255,255,255,0.75);
- -webkit-border-radius:2px;
- -moz-border-radius:2px;
- border-radius:2px;
-}
-.mCS-light-thick.mCSB_horizontal>.mCSB_scrollTools .mCSB_draggerRail{
- width:100%;
- height:4px;
- margin:6px 0;
-}
-.mCS-light-thick.mCSB_horizontal>.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
- width:100%;
- height:6px;
- margin:5px auto;
-}
-.mCS-light-thick>.mCSB_scrollTools .mCSB_dragger:hover .mCSB_dragger_bar{
- background:rgba(255,255,255,0.85);
-}
-.mCS-light-thick>.mCSB_scrollTools .mCSB_dragger:active .mCSB_dragger_bar,
-.mCS-light-thick>.mCSB_scrollTools .mCSB_dragger.mCSB_dragger_onDrag .mCSB_dragger_bar{
- background:rgba(255,255,255,0.9);
-}
-.mCS-light-thick>.mCSB_scrollTools .mCSB_buttonUp{
- background-position:-16px 0;
-}
-.mCS-light-thick>.mCSB_scrollTools .mCSB_buttonDown{
- background-position:-16px -20px;
-}
-.mCS-light-thick>.mCSB_scrollTools .mCSB_buttonLeft{
- background-position:-20px -40px;
-}
-.mCS-light-thick>.mCSB_scrollTools .mCSB_buttonRight{
- background-position:-20px -56px;
-}
-/*dark-thick*/
-.mCS-dark-thick>.mCSB_scrollTools .mCSB_draggerRail{
- width:4px;
- background:#000; /* rgba fallback */
- background:rgba(0,0,0,0.1);
- -webkit-border-radius:2px;
- -moz-border-radius:2px;
- border-radius:2px;
-}
-.mCS-dark-thick>.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
- width:6px;
- background:#000; /* rgba fallback */
- background:rgba(0,0,0,0.75);
- -webkit-border-radius:2px;
- -moz-border-radius:2px;
- border-radius:2px;
-}
-.mCS-dark-thick.mCSB_horizontal>.mCSB_scrollTools .mCSB_draggerRail{
- width:100%;
- height:4px;
- margin:6px 0;
-}
-.mCS-dark-thick.mCSB_horizontal>.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
- width:100%;
- height:6px;
- margin:5px auto;
-}
-.mCS-dark-thick>.mCSB_scrollTools .mCSB_dragger:hover .mCSB_dragger_bar{
- background:rgba(0,0,0,0.85);
-}
-.mCS-dark-thick>.mCSB_scrollTools .mCSB_dragger:active .mCSB_dragger_bar,
-.mCS-dark-thick>.mCSB_scrollTools .mCSB_dragger.mCSB_dragger_onDrag .mCSB_dragger_bar{
- background:rgba(0,0,0,0.9);
-}
-.mCS-dark-thick>.mCSB_scrollTools .mCSB_buttonUp{
- background-position:-96px 0;
-}
-.mCS-dark-thick>.mCSB_scrollTools .mCSB_buttonDown{
- background-position:-96px -20px;
-}
-.mCS-dark-thick>.mCSB_scrollTools .mCSB_buttonLeft{
- background-position:-100px -40px;
-}
-.mCS-dark-thick>.mCSB_scrollTools .mCSB_buttonRight{
- background-position:-100px -56px;
-}
-/*light-thin*/
-.mCS-light-thin>.mCSB_scrollTools .mCSB_draggerRail{
- background:#fff; /* rgba fallback */
- background:rgba(255,255,255,0.1);
-}
-.mCS-light-thin>.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
- width:2px;
-}
-.mCS-light-thin.mCSB_horizontal>.mCSB_scrollTools .mCSB_draggerRail{
- width:100%;
-}
-.mCS-light-thin.mCSB_horizontal>.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
- width:100%;
- height:2px;
- margin:7px auto;
-}
-/*dark-thin*/
-.mCS-dark-thin>.mCSB_scrollTools .mCSB_draggerRail{
- background:#000; /* rgba fallback */
- background:rgba(0,0,0,0.15);
-}
-.mCS-dark-thin>.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
- width:2px;
- background:#000; /* rgba fallback */
- background:rgba(0,0,0,0.75);
-}
-.mCS-dark-thin.mCSB_horizontal>.mCSB_scrollTools .mCSB_draggerRail{
- width:100%;
-}
-.mCS-dark-thin.mCSB_horizontal>.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar{
- width:100%;
- height:2px;
- margin:7px auto;
-}
-.mCS-dark-thin>.mCSB_scrollTools .mCSB_dragger:hover .mCSB_dragger_bar{
- background:rgba(0,0,0,0.85);
-}
-.mCS-dark-thin>.mCSB_scrollTools .mCSB_dragger:active .mCSB_dragger_bar,
-.mCS-dark-thin>.mCSB_scrollTools .mCSB_dragger.mCSB_dragger_onDrag .mCSB_dragger_bar{
- background:rgba(0,0,0,0.9);
-}
-.mCS-dark-thin>.mCSB_scrollTools .mCSB_buttonUp{
- background-position:-80px 0;
-}
-.mCS-dark-thin>.mCSB_scrollTools .mCSB_buttonDown{
- background-position:-80px -20px;
-}
-.mCS-dark-thin>.mCSB_scrollTools .mCSB_buttonLeft{
- background-position:-80px -40px;
-}
-.mCS-dark-thin>.mCSB_scrollTools .mCSB_buttonRight{
- background-position:-80px -56px;
-}
diff --git a/public/stylesheets/admin.scss.erb b/sass/admin.scss
similarity index 100%
rename from public/stylesheets/admin.scss.erb
rename to sass/admin.scss
diff --git a/public/stylesheets/application.scss.erb b/sass/application.scss
similarity index 94%
rename from public/stylesheets/application.scss.erb
rename to sass/application.scss
index 753124d2..f2c0059a 100644
--- a/public/stylesheets/application.scss.erb
+++ b/sass/application.scss
@@ -1,16 +1,16 @@
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the top of the
- * compiled file, but it's generally better to create a new file per style scope.
- *
- *= require_self
- *= require_tree .
-*/
+@import 'admin';
+@import 'apps';
+@import 'base';
+@import 'clean';
+@import 'emoji-mart-0.3.5';
+@import 'feedback';
+@import 'jquery-ui';
+@import 'junto';
+@import 'mapcard';
+@import 'mobile';
+@import 'notifications';
+@import 'request_access';
+@import 'search';
/* clear styles */
@@ -78,7 +78,7 @@ html {
}
body {
- background: #d8d9da url(<%= asset_path('shattered_@2X.png') %>);
+ background: #d8d9da url('/images/shattered_@2X.png');
font-family: 'din-medium', helvetica, sans-serif;
color: #424242;
-moz-osx-font-smoothing: grayscale;
@@ -315,7 +315,7 @@ button.button.btn-no:hover {
display: none;
width: 40px;
height: 40px;
- background-image: url(<%= asset_data_uri('photo.png') %>);
+ background-image: url('/images/photo.png');
position: absolute;
top: 22px;
left: 22px;
@@ -428,7 +428,7 @@ button.button.btn-no:hover {
}
.accountName:hover .nameEdit:after {
- background: url(<%= asset_data_uri('edit.png') %>) no-repeat;
+ background: url('/images/edit.png') no-repeat;
content:" ";
position:absolute;
width:25px;
@@ -564,7 +564,7 @@ body:not(.action-conversation) .new_topic {
display: block;
height: 16px;
width: 16px;
- background-image: url(<%= asset_data_uri('metacodesettings_sprite.png') %>);
+ background-image: url('/images/metacodesettings_sprite.png');
position: absolute;
z-index: 2;
top: 20px;
@@ -578,7 +578,7 @@ body:not(.action-conversation) .new_topic {
display: block;
height: 16px;
width: 16px;
- background-image: url(<%= asset_data_uri('pincarousel_sprite.png') %>);
+ background-image: url('/images/pincarousel_sprite.png');
position: absolute;
z-index: 2;
top: 20px;
@@ -772,7 +772,7 @@ label {
.accountInnerArrow {
width:16px;
height:16px;
- background-image: url(<%= asset_data_uri('arrowdown_sprite.png') %>);
+ background-image: url('/images/arrowdown_sprite.png');
background-repeat: no-repeat;
position:absolute;
top: 8px;
@@ -837,7 +837,7 @@ label {
position:absolute;
pointer-events:none;
background-repeat:no-repeat;
- background-image: url(<%= asset_path('user_sprite.png') %>);
+ background-image: url('/images/user_sprite.png');
}
.accountSettings .accountIcon {
background-position: 0 0;
@@ -870,7 +870,7 @@ li.accountInvite span {
padding: 9px 0 9px 62px;
}
.accountImage {
- background-image: url(<%= asset_data_uri 'user.png' %>);
+ background-image: url('/images/user.png');
background-size: 84px 84px;
background-repeat: no-repeat;
height:84px;
@@ -1200,7 +1200,7 @@ h3.filterBox {
position: absolute;
top: 0;
left: 4px;
- background-image: url(<%= asset_data_uri('context_sprite.png') %>);
+ background-image: url('/images/context_sprite.png');
background-repeat: no-repeat;
width: 24px;
height: 24px;
@@ -1216,7 +1216,7 @@ h3.filterBox {
}
.rightclickmenu .rc-center .rc-icon {
- background-image: url(<%= asset_data_uri('context_topicview_sprite.png') %>);
+ background-image: url('/images/context_topicview_sprite.png');
}
.rightclickmenu .rc-popout .rc-icon {
background-position: 0 -72px;
@@ -1229,7 +1229,7 @@ h3.filterBox {
}
.rightclickmenu .rc-siblings .rc-icon {
background-position: 0 -24px;
- background-image: url(<%= asset_data_uri('context_topicview_sprite.png') %>);
+ background-image: url('/images/context_topicview_sprite.png');
}
.rightclickmenu .expandLi {
position: absolute;
@@ -1237,7 +1237,7 @@ h3.filterBox {
right: 8px;
width: 16px;
height: 16px;
- background-image: url(<%= asset_data_uri('arrowright_sprite.png') %>);
+ background-image: url('/images/arrowright_sprite.png');
background-repeat: no-repeat;
background-position: 0 -32px;
}
@@ -1272,7 +1272,7 @@ h3.filterBox {
position: absolute;
top: 0;
left: 4px;
- background-image: url(<%= asset_data_uri('permissions32_sprite.png') %>);
+ background-image: url('/images/permissions32_sprite.png');
background-size: 72px 48px;
background-repeat: no-repeat;
width: 24px;
@@ -1318,7 +1318,7 @@ h3.filterBox {
right: 4px;
width: 16px;
height: 16px;
- background-image: url(<%= asset_data_uri('arrowright_sprite.png') %>);
+ background-image: url('/images/arrowright_sprite.png');
background-repeat: no-repeat;
background-position: 0 -32px;
}
@@ -1398,7 +1398,7 @@ h3.filterBox {
top: 8px;
right: 8px;
background-repeat: no-repeat;
- background-image: url(<%= asset_data_uri('arrowright_sprite.png') %>);
+ background-image: url('/images/arrowright_sprite.png');
background-position: 0 -32px;
}
#new_topic .tt-suggestion:hover .expandTopicMetadata,
@@ -1424,7 +1424,7 @@ h3.filterBox {
width: 32px;
height: 32px;
background-repeat: no-repeat;
- background-image: url(<%= asset_data_uri('permissions32_sprite.png') %>);
+ background-image: url('/images/permissions32_sprite.png');
position: absolute;
bottom: 4px;
right: 4px;
@@ -1444,7 +1444,7 @@ h3.filterBox {
#new_topic .topicNumMaps {
height: 14px;
padding: 1px 0 1px 32px;
- background-image: url(<%= asset_data_uri('metamap16.png') %>);
+ background-image: url('/images/metamap16.png');
background-repeat: no-repeat;
background-position: 8px 0;
position: absolute;
@@ -1453,7 +1453,7 @@ h3.filterBox {
#new_topic .topicNumSynapses {
height: 14px;
padding: 1px 0 1px 32px;
- background-image: url(<%= asset_data_uri('synapse16.png') %>);
+ background-image: url('/images/synapse16.png');
background-repeat: no-repeat;
background-position: 8px 0;
position: absolute;
@@ -1543,7 +1543,7 @@ h3.filterBox {
width: 32px;
height: 32px;
background-repeat: no-repeat;
- background-image: url(<%= asset_data_uri('permissions32_sprite.png') %>);
+ background-image: url('/images/permissions32_sprite.png');
}
/* map info box */
@@ -1644,7 +1644,7 @@ h3.filterBox {
resize: none;
}
.mapInfoBox.canEdit #mapInfoName:hover {
- background-image: url(<%= asset_data_uri('edit.png') %>);
+ background-image: url('/images/edit.png');
background-repeat: no-repeat;
background-position: bottom right;
cursor: text;
@@ -1820,7 +1820,7 @@ span.removeCollaborator {
right: 8px;
height: 16px;
width: 16px;
- background-image: url(<%= asset_data_uri('removecollab_sprite.png') %>);
+ background-image: url('/images/removecollab_sprite.png');
cursor: pointer;
}
@@ -1831,7 +1831,7 @@ span.removeCollaborator:hover {
span.addCollab {
width: 16px;
height: 16px;
- background-image: url(<%= asset_data_uri('addcollab_sprite.png') %>);
+ background-image: url('/images/addcollab_sprite.png');
display: inline-block;
vertical-align: middle;
margin: 0 12px 0 10px;
@@ -1889,11 +1889,11 @@ input.collaboratorSearchField {
}
.mapTopics {
- background-image: url(<%= asset_data_uri('topic32.png') %>);
+ background-image: url('/images/topic32.png');
background-position: 13px center;
}
.mapSynapses {
- background-image: url(<%= asset_data_uri('synapse32padded.png') %>);
+ background-image: url('/images/synapse32padded.png');
background-position: 13px center;
}
.mapInfoBox .mapPermission {
@@ -1903,7 +1903,7 @@ input.collaboratorSearchField {
padding: 0;
margin: 8px 30px 8px 10px;
position: relative;
- background-image: url(<%= asset_data_uri('permissions32_sprite.png') %>);
+ background-image: url('/images/permissions32_sprite.png');
}
.mapInfoBox .mapPermission.commons {
background-position: 0 0;
@@ -1931,7 +1931,7 @@ input.collaboratorSearchField {
width: 32px;
height: 32px;
background-repeat: no-repeat;
- background-image: url(<%= asset_data_uri('permissions32_sprite.png') %>);
+ background-image: url('/images/permissions32_sprite.png');
}
.mapInfoBox .mapPermission .permissionSelect .commons {
background-position: 0 0;
@@ -1978,7 +1978,7 @@ input.collaboratorSearchField {
width: 340px;
}
.mapInfoBox.canEdit .mapInfoDesc:hover {
- background-image: url(<%= asset_data_uri('edit.png') %>);
+ background-image: url('/images/edit.png');
background-position: top right;
background-repeat: no-repeat;
cursor: text;
@@ -2024,7 +2024,7 @@ input.collaboratorSearchField {
.mapInfoShareIcon {
width: 24px;
height: 24px;
- background-image: url(<%= asset_data_uri('share_sprite_mapinfo.png') %>);
+ background-image: url('/images/share_sprite_mapinfo.png');
background-repeat: no-repeat;
margin: 4px auto 0;
background-position: 0 -24px;
@@ -2045,7 +2045,7 @@ and it won't be important on password protected instances */
width: 16px;
height: 16px;
margin: 8px auto 0;
- background-image: url(<%= asset_data_uri('remove_mapinfo_sprite.png') %>);
+ background-image: url('/images/remove_mapinfo_sprite.png');
background-repeat: no-repeat;
background-position: -16px 0;
}
@@ -2062,7 +2062,7 @@ and it won't be important on password protected instances */
.mapInfoButtonsWrapper .mapInfoThumbnail {
display: block;
- background-image: url(<%= asset_path('screenshot_sprite.png') %>);
+ background-image: url('/images/screenshot_sprite.png');
width: 32px;
height: 32px;
@@ -2143,7 +2143,7 @@ and it won't be important on password protected instances */
border: solid 2px #000;
}
#lightbox_overlay #lightbox_main a#lightbox_close {
- background-image: url(<%= asset_data_uri('xlightbox.png') %>);
+ background-image: url('/images/xlightbox.png');
cursor: pointer;
height: 32px;
outline-style: none;
@@ -2251,7 +2251,7 @@ and it won't be important on password protected instances */
.icon_twitter .lightboxAboutIcon,
.icon_source_code .lightboxAboutIcon,
.icon_terms .lightboxAboutIcon {
- background-image: url(<%= asset_data_uri('about_sprite.png') %>);
+ background-image: url('/images/about_sprite.png');
background-repeat: no-repeat;
background-position: 0 0;
}
@@ -2532,15 +2532,15 @@ and it won't be important on password protected instances */
opacity: 0.7;
}
#chromeIcon {
- background: url(<%= asset_data_uri 'browser_icons.png' %>) no-repeat;
+ background: url('/images/browser_icons.png') no-repeat;
}
#fireFoxIcon {
- background: url(<%= asset_data_uri 'browser_icons.png' %>) no-repeat -105px 0;
+ background: url('/images/browser_icons.png') no-repeat -105px 0;
}
#safariIcon {
- background: url(<%= asset_data_uri 'browser_icons.png' %>) no-repeat -220px 0;
+ background: url('/images/browser_icons.png') no-repeat -220px 0;
}
#chromeIcon:hover{
@@ -2677,7 +2677,7 @@ and it won't be important on password protected instances */
position: relative;
}
.new_map .mapPermIcon {
- background-image: url(<%= asset_data_uri('permissions64sprite.png') %>);
+ background-image: url('/images/permissions64sprite.png');
background-repeat: no-repeat;
width:64px;
height:64px;
@@ -2792,7 +2792,7 @@ and it won't be important on password protected instances */
}
#zoomIn {
- background: #424242 url(<%= asset_data_uri('zoom_sprite.png') %>) no-repeat;
+ background: #424242 url('/images/zoom_sprite.png') no-repeat;
width: 22px;
height: 22px;
display: inline-block;
@@ -2804,7 +2804,7 @@ and it won't be important on password protected instances */
}
#zoomOut {
- background: #424242 url(<%= asset_data_uri('zoom_sprite.png') %>) no-repeat;
+ background: #424242 url('/images/zoom_sprite.png') no-repeat;
width: 22px;
height: 22px;
display: inline-block;
@@ -2816,7 +2816,7 @@ and it won't be important on password protected instances */
}
#centerMap {
- background: #424242 url(<%= asset_data_uri('extents_sprite.png') %>) no-repeat;
+ background: #424242 url('/images/extents_sprite.png') no-repeat;
width: 22px;
height: 22px;
display: inline-block;
@@ -2993,7 +2993,7 @@ and it won't be important on password protected instances */
.compassArrow {
display: none;
background-repeat: no-repeat;
- background-image: url(<%= asset_data_uri('compass_arrow.png') %>);
+ background-image: url('/images/compass_arrow.png');
width: 48px;
height: 32px;
position: absolute;
diff --git a/public/stylesheets/apps.css.erb b/sass/apps.css
similarity index 100%
rename from public/stylesheets/apps.css.erb
rename to sass/apps.css
diff --git a/public/stylesheets/base.scss.erb b/sass/base.scss
similarity index 93%
rename from public/stylesheets/base.scss.erb
rename to sass/base.scss
index b4b7bb0c..b8963415 100644
--- a/public/stylesheets/base.scss.erb
+++ b/sass/base.scss
@@ -91,7 +91,7 @@ $mid-gray-opacity: rgba(66, 66, 66, 0.6);
padding: 0 16px;
}
.canEdit #titleActivator:hover {
- background-image: url(<%= asset_data_uri('edit.png') %>);
+ background-image: url('/images/edit.png');
background-repeat: no-repeat;
background-position: bottom right;
cursor: text;
@@ -185,7 +185,7 @@ $mid-gray-opacity: rgba(66, 66, 66, 0.6);
padding-right: 26px;
}
.canEdit .CardOnGraph .riek_desc:not(.riek-editing):hover {
- background-image: url(<%= asset_data_uri('edit.png') %>);
+ background-image: url('/images/edit.png');
background-position: top right;
background-repeat: no-repeat;
cursor: text;
@@ -290,7 +290,7 @@ $mid-gray-opacity: rgba(66, 66, 66, 0.6);
right: 0;
width: 32px;
height: 32px;
- background-image: url(<%= asset_data_uri('map32_sprite.png') %>);
+ background-image: url('/images/map32_sprite.png');
background-repeat: no-repeat;
background-position: 0 0;
cursor: pointer;
@@ -369,7 +369,7 @@ $mid-gray-opacity: rgba(66, 66, 66, 0.6);
right: 0;
width: 32px;
height: 32px;
- background-image: url(<%= asset_data_uri('synapse32_sprite.png') %>);
+ background-image: url('/images/synapse32_sprite.png');
background-repeat: no-repeat;
background-position: 0 0;
opacity: 0.6;
@@ -423,7 +423,7 @@ $mid-gray-opacity: rgba(66, 66, 66, 0.6);
min-width: 32px;
margin-top: 8px;
margin-left: 8px;
- background-image: url(<%= asset_data_uri('permissions32_sprite.png') %>);
+ background-image: url('/images/permissions32_sprite.png');
background-position: 0 0;
}
.mapPerm.co {
@@ -454,7 +454,7 @@ $mid-gray-opacity: rgba(66, 66, 66, 0.6);
height: 32px;
background-repeat: no-repeat;
background-position: 0 0;
- background-image: url(<%= asset_data_uri('permissions32_sprite.png') %>);
+ background-image: url('/images/permissions32_sprite.png');
}
.mapPerm .permissionSelect .commons {
background-position: 0 0;
@@ -498,7 +498,7 @@ $mid-gray-opacity: rgba(66, 66, 66, 0.6);
left: 4px;
width: 16px;
height: 16px;
- background-image: url(<%= asset_data_uri('arrowright_sprite.png') %>);
+ background-image: url('/images/arrowright_sprite.png');
background-repeat: no-repeat;
background-position: 0 -32px;
display: inline-block;
@@ -571,7 +571,7 @@ background-color: #E0E0E0;
right: 8px;
width: 16px;
height: 16px;
- background-image: url(<%= asset_data_uri('arrowright_sprite.png') %>);
+ background-image: url('/images/arrowright_sprite.png');
background-repeat: no-repeat;
background-position: 0 -32px;
}
@@ -673,10 +673,10 @@ background-color: #E0E0E0;
left: 12px;
}
#linkIcon {
- background-image: url(<%= asset_data_uri('link_sprite.png') %>);
+ background-image: url('/images/link_sprite.png');
}
#uploadIcon {
- background-image: url(<%= asset_data_uri('upload_sprite.png') %>);
+ background-image: url('/images/upload_sprite.png');
}
#addlink:hover #linkIcon, #addupload:hover #uploadIcon {
background-position: 0 -24px;
@@ -715,7 +715,7 @@ font-family: 'din-regular', helvetica, sans-serif;
height: 24px;
background-repeat: no-repeat;
background-position: 0 0;
- background-image: url(<%= asset_data_uri('link_sprite.png') %>);
+ background-image: url('/images/link_sprite.png');
pointer-events: none;
z-index: 1;
}
@@ -728,7 +728,7 @@ font-family: 'din-regular', helvetica, sans-serif;
height: 32px;
cursor: pointer;
float:none;
- background-image: url(<%= asset_data_uri('remove.png') %>);
+ background-image: url('/images/remove.png');
background-repeat: no-repeat;
background-position: center center;
}
@@ -764,7 +764,7 @@ font-family: 'din-regular', helvetica, sans-serif;
}
#linkremove {
- background-image: url(<%= asset_data_uri 'remove.png' %>);
+ background-image: url('/images/remove.png');
background-repeat: no-repeat;
background-position: center center;
width: 24px;
@@ -805,7 +805,7 @@ font-family: 'din-regular', helvetica, sans-serif;
}
#editSynUpperBar {
- background: #FFFFFF url(<%= asset_data_uri('synapse32.png') %>) no-repeat 8px center;
+ background: #FFFFFF url('/images/synapse32.png') no-repeat 8px center;
min-height: 48px;
height: 48px;
border-bottom: 1px solid #222222;
@@ -838,7 +838,7 @@ font-family: 'din-regular', helvetica, sans-serif;
}
.canEdit span.titleWrapper:hover {
- background-image: url(<%= asset_data_uri('edit.png') %>);
+ background-image: url('/images/edit.png');
background-repeat: no-repeat;
background-position: 95% 95%;
cursor: text;
@@ -865,7 +865,7 @@ font-family: 'din-regular', helvetica, sans-serif;
height: 24px;
top: 12px;
right: 8px;
- background-image: url(<%= asset_data_uri('arrowdown_sprite.png') %>);
+ background-image: url('/images/arrowdown_sprite.png');
background-repeat: no-repeat;
background-position: 4px -12px;
}
@@ -947,11 +947,11 @@ font-family: 'din-regular', helvetica, sans-serif;
background-repeat: no-repeat;
}
#edit_synapse_right {
- background-image: url(<%= asset_data_uri('synapsedirectionright_sprite.png') %>);
+ background-image: url('/images/synapsedirectionright_sprite.png');
right: 16px;
}
#edit_synapse_left {
- background-image: url(<%= asset_data_uri('synapsedirectionleft_sprite.png') %>);
+ background-image: url('/images/synapsedirectionleft_sprite.png');
right: 56px;
}
#edit_synapse_left.checked, #edit_synapse_right.checked {
@@ -1017,7 +1017,7 @@ font-family: 'din-regular', helvetica, sans-serif;
}
.mapperMetadata {
- background: url(<%= asset_data_uri('profile_card_sprite.png') %>) no-repeat center 0;
+ background: url('/images/profile_card_sprite.png') no-repeat center 0;
height: 64px;
width: 160px;
margin: 16px auto 0;
diff --git a/public/stylesheets/clean.css.erb b/sass/clean.css
similarity index 89%
rename from public/stylesheets/clean.css.erb
rename to sass/clean.css
index 445a4950..24c602e5 100644
--- a/public/stylesheets/clean.css.erb
+++ b/sass/clean.css
@@ -1,20 +1,20 @@
@font-face {
font-family: 'din-medium';
- src: url(<%= asset_path 'Fonts/din.eot' %>);
- src: url(<%= asset_path 'Fonts/din.eot?#iefix' %>) format('embedded-opentype'),
- url(<%= asset_path 'Fonts/din.woff' %>) format('woff'),
- url(<%= asset_path 'Fonts/din.ttf' %>) format('truetype'),
- url(<%= asset_path 'Fonts/din.svg#din-medium' %>) format('svg');
+ src: url('/fonts/din.eot');
+ src: url('/fonts/din.eot?#iefix') format('embedded-opentype'),
+ url('/fonts/din.woff') format('woff'),
+ url('/fonts/din.ttf') format('truetype'),
+ url('/fonts/din.svg#din-medium') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'din-regular';
- src: url(<%= asset_path 'Fonts/din-reg.eot' %>);
- src: url(<%= asset_path 'Fonts/din-reg.eot?#iefix' %>) format('embedded-opentype'),
- url(<%= asset_path 'Fonts/din-reg.woff' %>) format('woff'),
- url(<%= asset_path 'Fonts/din-reg.ttf' %>) format('truetype'),
- url(<%= asset_path 'Fonts/din-reg.svg#din-reg' %>) format('svg');
+ src: url('/fonts/din-reg.eot');
+ src: url('/fonts/din-reg.eot?#iefix') format('embedded-opentype'),
+ url('/fonts/din-reg.woff') format('woff'),
+ url('/fonts/din-reg.ttf') format('truetype'),
+ url('/fonts/din-reg.svg#din-reg') format('svg');
font-weight: normal;
font-style: normal;
}
@@ -181,7 +181,7 @@
.upperRightIcon {
width: 32px;
height: 32px;
- background-image: url(<%= asset_path('topright_sprite.png') %>);
+ background-image: url('/images/topright_sprite.png');
background-repeat: no-repeat;
cursor: pointer;
}
@@ -335,7 +335,7 @@
}
.fullWidthWrapper.withPartners {
- background: url(<%= asset_path('homepage_bg_fade.png') %>) no-repeat center -300px;
+ background: url('/images/homepage_bg_fade.png') no-repeat center -300px;
}
.homeWrapper.homePartners {
padding: 64px 0 280px;
@@ -367,7 +367,7 @@
cursor: pointer;
}
.openCheatsheet {
- background-image: url(<%= asset_path('help_sprite.png') %>);
+ background-image: url('/images/help_sprite.png');
background-repeat:no-repeat;
}
.openCheatsheet:hover {
@@ -375,7 +375,7 @@
}
.mapInfoIcon {
position: relative;
- background-image: url(<%= asset_path('mapinfo_sprite.png') %>);
+ background-image: url('/images/mapinfo_sprite.png');
background-repeat:no-repeat;
}
.mapInfoIcon:hover {
@@ -383,7 +383,7 @@
}
.starMap {
- background-image: url(<%= asset_path('starmap_sprite.png') %>);
+ background-image: url('/images/starmap_sprite.png');
background-position: 0 0;
background-repeat: no-repeat;
width: 32px;
@@ -427,7 +427,7 @@
.zoomExtents {
margin-bottom:5px;
border-radius: 2px;
- background-image: url(<%= asset_path('extents_sprite.png') %>);
+ background-image: url('/images/extents_sprite.png');
}
.zoomExtents:hover {
@@ -614,7 +614,7 @@
}
.zoomIn {
- background-image: url(<%= asset_path('zoom_sprite.png') %>);
+ background-image: url('/images/zoom_sprite.png');
background-position: 0 /…0;
border-top-left-radius: 2px;
border-top-right-radius: 2px;
@@ -623,7 +623,7 @@
background-position: -32px 0;
}
.zoomOut {
- background-image: url(<%= asset_path('zoom_sprite.png') %>);
+ background-image: url('/images/zoom_sprite.png');
background-position:0 -32px;
border-bottom-left-radius: 2px;
border-bottom-right-radius: 2px;
@@ -745,31 +745,31 @@
}
.navBarCenter .authedApps .navBarIcon {
- background-image: url(<%= asset_path('user_sprite.png') %>);
+ background-image: url('/images/user_sprite.png');
background-position: 0 -32px;
}
.navBarCenter .myMaps .navBarIcon {
- background-image: url(<%= asset_path 'exploremaps_sprite.png' %>);
+ background-image: url('/images/exploremaps_sprite.png');
background-position: -32px 0;
}
.navBarCenter .sharedMaps .navBarIcon {
- background-image: url(<%= asset_path 'exploremaps_sprite.png' %>);
+ background-image: url('/images/exploremaps_sprite.png');
background-position: -128px 0;
}
.navBarCenter .activeMaps .navBarIcon {
- background-image: url(<%= asset_path 'exploremaps_sprite.png' %>);
+ background-image: url('/images/exploremaps_sprite.png');
background-position: 0 0;
}
.navBarCenter .featuredMaps .navBarIcon {
- background-image: url(<%= asset_path 'exploremaps_sprite.png' %>);
+ background-image: url('/images/exploremaps_sprite.png');
background-position: -96px 0;
}
.navBarCenter .starredMaps .navBarIcon {
- background-image: url(<%= asset_path 'exploremaps_sprite.png' %>);
+ background-image: url('/images/exploremaps_sprite.png');
background-position: -96px 0;
}
.navBarCenter .notificationsLink .navBarIcon {
- background-image: url(<%= asset_path 'topright_sprite.png' %>);
+ background-image: url('/images/topright_sprite.png');
background-position: -128px 0;
}
.authedApps:hover .navBarIcon, .authedApps.active .navBarIcon {
@@ -843,7 +843,7 @@
/* feedback */
body a#barometer_tab {
-background-image: url(<%= asset_path 'feedback_sprite.png' %>);
+background-image: url('/images/feedback_sprite.png');
background-position: 0 0;
background-color: transparent;
height: 110px;
diff --git a/public/stylesheets/emoji-mart-0.3.5.css b/sass/emoji-mart-0.3.5.css
similarity index 100%
rename from public/stylesheets/emoji-mart-0.3.5.css
rename to sass/emoji-mart-0.3.5.css
diff --git a/public/stylesheets/feedback.css.erb b/sass/feedback.css
similarity index 83%
rename from public/stylesheets/feedback.css.erb
rename to sass/feedback.css
index ff5ef545..4d93333c 100644
--- a/public/stylesheets/feedback.css.erb
+++ b/sass/feedback.css
@@ -4,7 +4,7 @@
.feedback-icon {
position: fixed;
- background-image: url(<%= asset_data_uri 'feedback_sprite.png' %>);
+ background-image: url('/images/feedback_sprite.png');
background-repeat: no-repeat;
color:#FFFFFF;
cursor:pointer;
diff --git a/public/stylesheets/jquery-ui.css.erb b/sass/jquery-ui.css
similarity index 89%
rename from public/stylesheets/jquery-ui.css.erb
rename to sass/jquery-ui.css
index 0033d8af..b9a0aa0c 100644
--- a/public/stylesheets/jquery-ui.css.erb
+++ b/sass/jquery-ui.css
@@ -243,25 +243,25 @@ body .ui-tooltip { border-width: 2px; }
.ui-widget { font-family: Verdana,Arial,sans-serif/*{ffDefault}*/; font-size: 1.1em/*{fsDefault}*/; }
.ui-widget .ui-widget { font-size: 1em; }
.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif/*{ffDefault}*/; font-size: 1em; }
-.ui-widget-content { border: 1px solid #aaaaaa/*{borderColorContent}*/; background: #ffffff/*{bgColorContent}*/ url(<%= asset_data_uri('ui-bg_flat_75_ffffff_40x100.png') %>)/*{bgImgUrlContent}*/ 50%/*{bgContentXPos}*/ 50%/*{bgContentYPos}*/ repeat-x/*{bgContentRepeat}*/; color: #222222/*{fcContent}*/; }
+.ui-widget-content { border: 1px solid #aaaaaa/*{borderColorContent}*/; background: #ffffff/*{bgColorContent}*/ url('/images/ui-bg_flat_75_ffffff_40x100.png')/*{bgImgUrlContent}*/ 50%/*{bgContentXPos}*/ 50%/*{bgContentYPos}*/ repeat-x/*{bgContentRepeat}*/; color: #222222/*{fcContent}*/; }
.ui-widget-content a { color: #222222/*{fcContent}*/; }
-.ui-widget-header { border: 1px solid #aaaaaa/*{borderColorHeader}*/; background: #cccccc/*{bgColorHeader}*/ url(<%= asset_data_uri('images/ui-bg_highlight-soft_75_cccccc_1x100.png') %>)/*{bgImgUrlHeader}*/ 50%/*{bgHeaderXPos}*/ 50%/*{bgHeaderYPos}*/ repeat-x/*{bgHeaderRepeat}*/; color: #222222/*{fcHeader}*/; font-weight: bold; }
+.ui-widget-header { border: 1px solid #aaaaaa/*{borderColorHeader}*/; background: #cccccc/*{bgColorHeader}*/ url('/images/images/ui-bg_highlight-soft_75_cccccc_1x100.png')/*{bgImgUrlHeader}*/ 50%/*{bgHeaderXPos}*/ 50%/*{bgHeaderYPos}*/ repeat-x/*{bgHeaderRepeat}*/; color: #222222/*{fcHeader}*/; font-weight: bold; }
.ui-widget-header a { color: #222222/*{fcHeader}*/; }
/* Interaction states
----------------------------------*/
-.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #d3d3d3/*{borderColorDefault}*/; background: #e6e6e6/*{bgColorDefault}*/ url(<%= asset_data_uri('images/ui-bg_glass_75_e6e6e6_1x400.png') %>)/*{bgImgUrlDefault}*/ 50%/*{bgDefaultXPos}*/ 50%/*{bgDefaultYPos}*/ repeat-x/*{bgDefaultRepeat}*/; font-weight: normal/*{fwDefault}*/; color: #555555/*{fcDefault}*/; }
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #d3d3d3/*{borderColorDefault}*/; background: #e6e6e6/*{bgColorDefault}*/ url('/images/images/ui-bg_glass_75_e6e6e6_1x400.png')/*{bgImgUrlDefault}*/ 50%/*{bgDefaultXPos}*/ 50%/*{bgDefaultYPos}*/ repeat-x/*{bgDefaultRepeat}*/; font-weight: normal/*{fwDefault}*/; color: #555555/*{fcDefault}*/; }
.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #555555/*{fcDefault}*/; text-decoration: none; }
-.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 0px solid #999999/*{borderColorHover}*/; background: #dadada/*{bgColorHover}*/ url(<%= asset_data_uri('images/ui-bg_glass_75_dadada_1x400.png') %>)/*{bgImgUrlHover}*/ 50%/*{bgHoverXPos}*/ 50%/*{bgHoverYPos}*/ repeat-x/*{bgHoverRepeat}*/; font-weight: normal/*{fwDefault}*/; color: #212121/*{fcHover}*/; }
+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 0px solid #999999/*{borderColorHover}*/; background: #dadada/*{bgColorHover}*/ url('/images/images/ui-bg_glass_75_dadada_1x400.png')/*{bgImgUrlHover}*/ 50%/*{bgHoverXPos}*/ 50%/*{bgHoverYPos}*/ repeat-x/*{bgHoverRepeat}*/; font-weight: normal/*{fwDefault}*/; color: #212121/*{fcHover}*/; }
.ui-state-hover a, .ui-state-hover a:hover, .ui-state-hover a:link, .ui-state-hover a:visited { color: #212121/*{fcHover}*/; text-decoration: none; }
-.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #aaaaaa/*{borderColorActive}*/; background: #ffffff/*{bgColorActive}*/ url(<%= asset_data_uri('images/ui-bg_glass_65_ffffff_1x400.png') %>)/*{bgImgUrlActive}*/ 50%/*{bgActiveXPos}*/ 50%/*{bgActiveYPos}*/ repeat-x/*{bgActiveRepeat}*/; font-weight: normal/*{fwDefault}*/; color: #212121/*{fcActive}*/; }
+.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #aaaaaa/*{borderColorActive}*/; background: #ffffff/*{bgColorActive}*/ url('/images/images/ui-bg_glass_65_ffffff_1x400.png')/*{bgImgUrlActive}*/ 50%/*{bgActiveXPos}*/ 50%/*{bgActiveYPos}*/ repeat-x/*{bgActiveRepeat}*/; font-weight: normal/*{fwDefault}*/; color: #212121/*{fcActive}*/; }
.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #212121/*{fcActive}*/; text-decoration: none; }
/* Interaction Cues
----------------------------------*/
-.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight {border: 1px solid #fcefa1/*{borderColorHighlight}*/; background: #fbf9ee/*{bgColorHighlight}*/ url(<%= asset_data_uri('images/ui-bg_glass_55_fbf9ee_1x400.png') %>)/*{bgImgUrlHighlight}*/ 50%/*{bgHighlightXPos}*/ 50%/*{bgHighlightYPos}*/ repeat-x/*{bgHighlightRepeat}*/; color: #363636/*{fcHighlight}*/; }
+.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight {border: 1px solid #fcefa1/*{borderColorHighlight}*/; background: #fbf9ee/*{bgColorHighlight}*/ url('/images/images/ui-bg_glass_55_fbf9ee_1x400.png')/*{bgImgUrlHighlight}*/ 50%/*{bgHighlightXPos}*/ 50%/*{bgHighlightYPos}*/ repeat-x/*{bgHighlightRepeat}*/; color: #363636/*{fcHighlight}*/; }
.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636/*{fcHighlight}*/; }
-.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a/*{borderColorError}*/; background: #fef1ec/*{bgColorError}*/ url(<%= asset_data_uri('images/ui-bg_glass_95_fef1ec_1x400.png') %>)/*{bgImgUrlError}*/ 50%/*{bgErrorXPos}*/ 50%/*{bgErrorYPos}*/ repeat-x/*{bgErrorRepeat}*/; color: #cd0a0a/*{fcError}*/; }
+.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a/*{borderColorError}*/; background: #fef1ec/*{bgColorError}*/ url('/images/images/ui-bg_glass_95_fef1ec_1x400.png')/*{bgImgUrlError}*/ 50%/*{bgErrorXPos}*/ 50%/*{bgErrorYPos}*/ repeat-x/*{bgErrorRepeat}*/; color: #cd0a0a/*{fcError}*/; }
.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #cd0a0a/*{fcError}*/; }
.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #cd0a0a/*{fcError}*/; }
.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
@@ -273,14 +273,14 @@ body .ui-tooltip { border-width: 2px; }
----------------------------------*/
/* states and images */
-.ui-icon { width: 16px; height: 16px; background-image: url(<%= asset_data_uri('images/ui-icons_222222_256x240.png') %>)/*{iconsContent}*/; }
-.ui-widget-content .ui-icon {background-image: url(<%= asset_data_uri('images/ui-icons_222222_256x240.png') %>)/*{iconsContent}*/; }
-.ui-widget-header .ui-icon {background-image: url(<%= asset_data_uri('images/ui-icons_222222_256x240.png') %>)/*{iconsHeader}*/; }
-.ui-state-default .ui-icon { background-image: url(<%= asset_data_uri('images/ui-icons_888888_256x240.png') %>)/*{iconsDefault}*/; }
-.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(<%= asset_data_uri('images/ui-icons_454545_256x240.png') %>)/*{iconsHover}*/; }
-.ui-state-active .ui-icon {background-image: url(<%= asset_data_uri('images/ui-icons_454545_256x240.png') %>)/*{iconsActive}*/; }
-.ui-state-highlight .ui-icon {background-image: url(<%= asset_data_uri('images/ui-icons_2e83ff_256x240.png') %>)/*{iconsHighlight}*/; }
-.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(<%= asset_data_uri('images/ui-icons_cd0a0a_256x240.png') %>)/*{iconsError}*/; }
+.ui-icon { width: 16px; height: 16px; background-image: url('/images/images/ui-icons_222222_256x240.png')/*{iconsContent}*/; }
+.ui-widget-content .ui-icon {background-image: url('/images/images/ui-icons_222222_256x240.png')/*{iconsContent}*/; }
+.ui-widget-header .ui-icon {background-image: url('/images/images/ui-icons_222222_256x240.png')/*{iconsHeader}*/; }
+.ui-state-default .ui-icon { background-image: url('/images/images/ui-icons_888888_256x240.png')/*{iconsDefault}*/; }
+.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url('/images/images/ui-icons_454545_256x240.png')/*{iconsHover}*/; }
+.ui-state-active .ui-icon {background-image: url('/images/images/ui-icons_454545_256x240.png')/*{iconsActive}*/; }
+.ui-state-highlight .ui-icon {background-image: url('/images/images/ui-icons_2e83ff_256x240.png')/*{iconsHighlight}*/; }
+.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url('/images/images/ui-icons_cd0a0a_256x240.png')/*{iconsError}*/; }
/* positioning */
.ui-icon-carat-1-n { background-position: 0 0; }
@@ -470,5 +470,5 @@ body .ui-tooltip { border-width: 2px; }
.ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { -moz-border-radius-bottomright: 4px/*{cornerRadius}*/; -webkit-border-bottom-right-radius: 4px/*{cornerRadius}*/; -khtml-border-bottom-right-radius: 4px/*{cornerRadius}*/; border-bottom-right-radius: 4px/*{cornerRadius}*/; }
/* Overlays */
-.ui-widget-overlay { background: #aaaaaa/*{bgColorOverlay}*/ url(<%= asset_data_uri('images/ui-bg_flat_0_aaaaaa_40x100.png') %>)/*{bgImgUrlOverlay}*/ 50%/*{bgOverlayXPos}*/ 50%/*{bgOverlayYPos}*/ repeat-x/*{bgOverlayRepeat}*/; opacity: .3;filter:Alpha(Opacity=30)/*{opacityOverlay}*/; }
-.ui-widget-shadow { margin: -8px/*{offsetTopShadow}*/ 0 0 -8px/*{offsetLeftShadow}*/; padding: 8px/*{thicknessShadow}*/; background: #aaaaaa/*{bgColorShadow}*/ url(images/<%= asset_data_uri('ui-bg_flat_0_aaaaaa_40x100.png') %>)/*{bgImgUrlShadow}*/ 50%/*{bgShadowXPos}*/ 50%/*{bgShadowYPos}*/ repeat-x/*{bgShadowRepeat}*/; opacity: .3;filter:Alpha(Opacity=30)/*{opacityShadow}*/; -moz-border-radius: 8px/*{cornerRadiusShadow}*/; -khtml-border-radius: 8px/*{cornerRadiusShadow}*/; -webkit-border-radius: 8px/*{cornerRadiusShadow}*/; border-radius: 8px/*{cornerRadiusShadow}*/; }
+.ui-widget-overlay { background: #aaaaaa/*{bgColorOverlay}*/ url('/images/images/ui-bg_flat_0_aaaaaa_40x100.png')/*{bgImgUrlOverlay}*/ 50%/*{bgOverlayXPos}*/ 50%/*{bgOverlayYPos}*/ repeat-x/*{bgOverlayRepeat}*/; opacity: .3;filter:Alpha(Opacity=30)/*{opacityOverlay}*/; }
+.ui-widget-shadow { margin: -8px/*{offsetTopShadow}*/ 0 0 -8px/*{offsetLeftShadow}*/; padding: 8px/*{thicknessShadow}*/; background: #aaaaaa/*{bgColorShadow}*/ url(images/'/images/ui-bg_flat_0_aaaaaa_40x100.png')/*{bgImgUrlShadow}*/ 50%/*{bgShadowXPos}*/ 50%/*{bgShadowYPos}*/ repeat-x/*{bgShadowRepeat}*/; opacity: .3;filter:Alpha(Opacity=30)/*{opacityShadow}*/; -moz-border-radius: 8px/*{cornerRadiusShadow}*/; -khtml-border-radius: 8px/*{cornerRadiusShadow}*/; -webkit-border-radius: 8px/*{cornerRadiusShadow}*/; border-radius: 8px/*{cornerRadiusShadow}*/; }
diff --git a/public/stylesheets/junto.scss.erb b/sass/junto.scss
similarity index 90%
rename from public/stylesheets/junto.scss.erb
rename to sass/junto.scss
index f9311851..dd75b475 100644
--- a/public/stylesheets/junto.scss.erb
+++ b/sass/junto.scss
@@ -68,7 +68,7 @@
top: 85%;
right: 0px;
cursor: pointer;
- background: url(<%= asset_path 'audio_sprite.png' %>) no-repeat;
+ background: url('/images/audio_sprite.png') no-repeat;
}
.video-audio:hover {
background-position-x: -24px;
@@ -83,7 +83,7 @@
top: 85%;
left: 0px;
cursor: pointer;
- background: url(<%= asset_path 'camera_sprite.png' %>) no-repeat;
+ background: url('/images/camera_sprite.png') no-repeat;
}
.video-video:hover {
background-position-x: -24px;
@@ -119,11 +119,11 @@
left: -36px;
width: 36px;
height: 49px;
- background: url(<%= asset_path 'junto.png' %>) no-repeat 2px 9px, url(<%= asset_path 'tray_tab.png' %>) no-repeat;
+ background: url('/images/junto.png') no-repeat 2px 9px, url('/images/tray_tab.png') no-repeat;
cursor: pointer;
&.active {
- background: url(<%= asset_path 'junto_spinner_dark.gif' %>) no-repeat 2px 8px, url(<%= asset_path 'tray_tab.png' %>) no-repeat !important;
+ background: url('/images/junto_spinner_dark.gif') no-repeat 2px 8px, url('/images/tray_tab.png') no-repeat !important;
}
.chat-unread {
background: #DAB539;
@@ -158,7 +158,7 @@
margin-right: 8px;
margin-top: -8px;
float: right;
- background: url(<%= asset_path 'cursor_sprite.png' %>) no-repeat;
+ background: url('/images/cursor_sprite.png') no-repeat;
}
.cursor-toggle:hover {
background-position-x: -32px;
@@ -172,7 +172,7 @@
margin-right: 10px;
margin-top: -8px;
float: right;
- background: url(<%= asset_path 'video_sprite.png' %>) no-repeat;
+ background: url('/images/video_sprite.png') no-repeat;
}
.video-toggle:hover {
background-position-x: -32px;
@@ -234,11 +234,11 @@
.chat-participant-invite-join
{
float: right;
- background: #4FC059 url(<%= asset_path 'invitepeer16.png' %>) no-repeat center center;
+ background: #4FC059 url('/images/invitepeer16.png') no-repeat center center;
}
.chat-participant-invite-call.pending,
.chat-participant-invite-join.pending {
- background: #dab539 url(<%= asset_path 'ellipsis.gif' %>) no-repeat center center;
+ background: #dab539 url('/images/ellipsis.gif') no-repeat center center;
}
.chat-participant-participating {
float: right;
@@ -269,7 +269,7 @@
margin-right: 10px;
margin-top: -2px;
float: right;
- background: url(<%= asset_path 'sound_sprite.png' %>) no-repeat;
+ background: url('/images/sound_sprite.png') no-repeat;
}
.sound-toggle:hover {
background-position-x: -24px;
diff --git a/public/stylesheets/mapcard.scss.erb b/sass/mapcard.scss
similarity index 94%
rename from public/stylesheets/mapcard.scss.erb
rename to sass/mapcard.scss
index e13c3c6c..3a413223 100644
--- a/public/stylesheets/mapcard.scss.erb
+++ b/sass/mapcard.scss
@@ -34,7 +34,7 @@
display: block;
width: 72px;
height: 72px;
- background-image: url("<%= asset_data_uri('newmap_sprite.png') %>");
+ background-image: url('/images/newmap_sprite.png');
background-repeat: no-repeat;
background-position: 0 0;
position: absolute;
@@ -121,10 +121,10 @@
}
}
.mapHasMapper {
- background: url('<%= asset_path('junto.png') %>') no-repeat 4px 0;
+ background: url('/images/junto.png') no-repeat 4px 0;
}
.mapHasConversation {
- background: url('<%= asset_path('junto.gif') %>') no-repeat 4px 0;
+ background: url('/images/junto.gif') no-repeat 4px 0;
}
.dropdownMenu {
@@ -265,7 +265,7 @@
text-align: center;
div {
- background: url('<%= asset_path('metadata.png') %>') no-repeat;
+ background: url('/images/metadata.png') no-repeat;
width: 32px;
height: 32px;
margin: 0 auto;
diff --git a/public/stylesheets/mobile.scss.erb b/sass/mobile.scss
similarity index 95%
rename from public/stylesheets/mobile.scss.erb
rename to sass/mobile.scss
index 02aefeb4..9107b9be 100644
--- a/public/stylesheets/mobile.scss.erb
+++ b/sass/mobile.scss
@@ -190,10 +190,10 @@
}
}
.mobileHasMapper {
- background: url('<%= asset_path('junto.png') %>') no-repeat 12px 0;
+ background: url('/images/junto.png') no-repeat 12px 0;
}
.mobileHasConversation {
- background: url('<%= asset_path('junto.gif') %>') no-repeat 12px 0;
+ background: url('/images/junto.gif') no-repeat 12px 0;
}
.mobileMetadata {
margin: 0 auto;
@@ -225,7 +225,7 @@
height: 50px;
border-right: 1px solid #DDD;
position: absolute;
- background: #EEE url('<%= asset_path('menu-alt-256.png') %>') no-repeat center center;
+ background: #EEE url('/images/menu-alt-256.png') no-repeat center center;
background-size: 30px;
}
diff --git a/public/stylesheets/notifications.scss.erb b/sass/notifications.scss
similarity index 100%
rename from public/stylesheets/notifications.scss.erb
rename to sass/notifications.scss
diff --git a/public/stylesheets/request_access.scss.erb b/sass/request_access.scss
similarity index 95%
rename from public/stylesheets/request_access.scss.erb
rename to sass/request_access.scss
index 98f1a380..e67dbe47 100644
--- a/public/stylesheets/request_access.scss.erb
+++ b/sass/request_access.scss
@@ -14,7 +14,7 @@
}
.eyeball {
- background: url('<%= asset_path('view-only.png') %>') no-repeat 4px 0;
+ background: url('/images/view-only.png') no-repeat 4px 0;
padding-left: 40px;
border-right: #747474;
padding-right: 10px;
diff --git a/public/stylesheets/search.scss.erb b/sass/search.scss
similarity index 94%
rename from public/stylesheets/search.scss.erb
rename to sass/search.scss
index 4f43ecfa..8df2785b 100644
--- a/public/stylesheets/search.scss.erb
+++ b/sass/search.scss
@@ -19,7 +19,7 @@
border-top-right-radius: 2px;
border-bottom-right-radius: 2px;
height: 32px;
- background: #4fb5c0 url(<%= asset_data_uri('search.png') %>) no-repeat center center;
+ background: #4fb5c0 url('/images/search.png') no-repeat center center;
background-size: 32px 32px;
cursor: pointer;
}
@@ -172,7 +172,7 @@
.maximizeResults {
width: 32px;
height: 32px;
- background-image: url(<%= asset_data_uri('arrowpermswhite_sprite.png') %>);
+ background-image: url('/images/arrowpermswhite_sprite.png');
background-repeat: no-repeat;
cursor: pointer;
position: absolute;
@@ -329,7 +329,7 @@
display:none;
width: 24px;
height: 24px;
- background: url(<%= asset_data_uri('addtopic_sprite.png') %>);
+ background: url('/images/addtopic_sprite.png');
background-repeat: no-repeat;
background-size: 48px 24px;
top: 12px;
@@ -344,7 +344,7 @@
.topicCount {
width: 24px;
height: 24px;
- background: url(<%= asset_data_uri('topic16.png') %>);
+ background: url('/images/topic16.png');
background-repeat: no-repeat;
background-position: 0 center;
top: 0;
@@ -357,7 +357,7 @@
.mapCount {
width: 24px;
height: 24px;
- background: url(<%= asset_data_uri('metamap16.png') %>);
+ background: url('/images/metamap16.png');
background-repeat: no-repeat;
background-position: 0 center;
left: 0;
@@ -369,7 +369,7 @@
.synapseCount {
width: 24px;
height: 24px;
- background: url(<%= asset_data_uri('synapse16.png') %>);
+ background: url('/images/synapse16.png');
background-repeat: no-repeat;
background-position: 0 center;
top: 24px;
@@ -478,7 +478,7 @@
.mapPermission {
width: 24px;
height: 24px;
- background-image: url(<%= asset_data_uri('permissions32_sprite.png') %>);
+ background-image: url('/images/permissions32_sprite.png');
background-repeat: no-repeat;
background-size: 72px 48px !important;
top: 24px;