diff --git a/Gemfile~ b/Gemfile~ deleted file mode 100644 index 7b0b3fa7..00000000 --- a/Gemfile~ +++ /dev/null @@ -1,47 +0,0 @@ -source 'https://rubygems.org' - -gem 'rails', '3.2.17' - -# Bundle edge Rails instead: -# gem 'rails', :git => 'git://github.com/rails/rails.git' - -gem 'devise' -gem 'redis' -gem 'pg' -gem 'cancan' -gem 'formula' -gem 'formtastic' -gem 'json' -gem 'rails3-jquery-autocomplete' -gem 'best_in_place' -gem 'therubyracer' #optional -gem 'rb-readline' - -# Gems used only for assets and not required -# in production environments by default. -group :assets do - gem 'sass-rails' - gem 'coffee-rails', '~> 3.2.1' - - # See https://github.com/sstephenson/execjs#readme for more supported runtimes - # gem 'therubyracer' - - gem 'uglifier', '>= 1.0.3' -end - -gem 'jquery-rails', '2.1.2' - -# To use ActiveModel has_secure_password -# gem 'bcrypt-ruby', '~> 3.0.0' - -# To use Jbuilder templates for JSON - gem 'jbuilder', '0.8.2' - -# Use unicorn as the web server -# gem 'unicorn' - -# Deploy with Capistrano -# gem 'capistrano' - -# To use debugger -# gem 'ruby-debug19', :require => 'ruby-debug' diff --git a/app/assets/stylesheets/application.css~ b/app/assets/stylesheets/application.css~ deleted file mode 100644 index dd32e08c..00000000 --- a/app/assets/stylesheets/application.css~ +++ /dev/null @@ -1,2381 +0,0 @@ -/* - * 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 ../../../vendor/assets/stylesheets - *= require_tree . - *= require base - *= require ForceDirected - *= require jquery.mCustomScrollbar - *= require jquery-ui - *= require animate -*/ - -@font-face { - font-family: 'LatoLight'; - src: url('/assets/Fonts/Lato-Lig-webfont.eot'); - src: url('/assets/Fonts/Lato-Lig-webfont.eot?#iefix') format('embedded-opentype'), - url('/assets/Fonts/Lato-Lig-webfont.woff') format('woff'), - url('/assets/Fonts/Lato-Lig-webfont.ttf') format('truetype'), - url('/assets/Fonts/Lato-Lig-webfont.svg#LatoLight') format('svg'); - font-weight: normal; - font-style: normal; - -} - -@font-face { - font-family: 'LatoRegular'; - src: url('/assets/Fonts/Lato-Reg-webfont.eot'); - src: url('/assets/Fonts/Lato-Reg-webfont.eot?#iefix') format('embedded-opentype'), - url('/assets/Fonts/Lato-Reg-webfont.woff') format('woff'), - url('/assets/Fonts/Lato-Reg-webfont.ttf') format('truetype'), - url('/assets/Fonts/Lato-Reg-webfont.svg#LatoRegular') format('svg'); - font-weight: normal; - font-style: normal; - -} - -@font-face { - font-family: 'LatoItalic'; - src: url('/assets/Fonts/Lato-RegIta-webfont.eot'); - src: url('/assets/Fonts/Lato-RegIta-webfont.eot?#iefix') format('embedded-opentype'), - url('/assets/Fonts/Lato-RegIta-webfont.woff') format('woff'), - url('/assets/Fonts/Lato-RegIta-webfont.ttf') format('truetype'), - url('/assets/Fonts/Lato-RegIta-webfont.svg#LatoItalic') format('svg'); - font-weight: normal; - font-style: normal; - -} - -@font-face { - font-family: 'LatoBold'; - src: url('/assets/Fonts/Lato-Bol-webfont.eot'); - src: url('/assets/Fonts/Lato-Bol-webfont.eot?#iefix') format('embedded-opentype'), - url('/assets/Fonts/Lato-Bol-webfont.woff') format('woff'), - url('/assets/Fonts/Lato-Bol-webfont.ttf') format('truetype'), - url('/assets/Fonts/Lato-Bol-webfont.svg#LatoBold') format('svg'); - font-weight: normal; - font-style: normal; - -} - -/* clear styles */ -html, body, div, h1, h2, h3, h4, h5, h6, -ul, ol, dl, li, dt, dd, p, blockquote, -pre, form, fieldset, table, th, td, legend { - margin: 0; - padding: 0; - } - -img { - border:0; - padding:0; - margin:0; - display:block; - text-indent:-9999px; -} - -html, -body, -.main, -.wrapper, -#container { - height: 100%; - overflow:hidden; -} - -/* scrollbar override */ -.maps > div > div.mCS_no_scrollbar { - padding-right: 0px !important; -} -.mCSB_container { - margin-right: 15px !important; -} - -/* forgot password fix */ -.forgotPassword input[type="submit"] { - padding: 0 5px; - width: auto; -} - -html { -} - -body { - background: url(background2-for-repeating.jpg); - - font-family: 'LatoLight', helvetica, sans-serif; - color:#FFF; -} - -body.mapBody { - -} - -h1,h2,h3,h4,h5,h6 { - font-weight:normal; -} - -h1 { - display:block; - text-align:left; - font-family: "vinyl",sans-serif; -} - -h2 { - display:block; - text-align:center; - font-family: "katarine-web",sans-serif; - background: url('black_bg.png'); - font-size:24px; - line-height:35px; -} - -a { - color:#69a3a4; - text-decoration:none; -} - -button.button, a.button, input[type="submit"] { -border: none; --webkit-box-shadow: 0 1px 2px rgba(0,0,0,.2); -box-shadow: 0 1px 2px rgba(0,0,0,.2); -border: none; -border-bottom-left-radius: 0; -border-top-left-radius: 0; -height: 30px; -outline: none; -padding: 0 0; -width: 60px; --webkit-box-shadow: none; -box-shadow: none; -background: #AEA9FD; -vertical-align: top; -color: black; -margin: 0px; -cursor: pointer; -display: inline-block; -font-weight: bold; -line-height: 29px; -min-width: 54px; -text-align: center; -text-decoration: none; --webkit-border-radius: 2px; -border-radius: 2px; --webkit-user-select: none; -} - -button.button:hover, a.button:hover, input[type="submit"]:hover { - background: #B6B2FD; -} - -/* - * Utility - */ - -.clearfloat { - clear:both; -} - -.leaveSpace { - display:block; - height:50px; -} - -.hidden { - display: none; -} - -/* - * Layout stuffs - */ - -#barometer_tab { - display:none; -} - -#saveMapLayout { - display:none; -} - -#error_explanation { - background: #612127; - padding: 30px; - color: #FFF; -} -#error_explanation h2 { - display:none; -} - -#error_explanation ul { - list-style:none; -} - -.profile { - height:100%; - margin-bottom:50px; -} - -.centeredProfile { - margin:0 auto; - display: block; - width: 830px; -} - -.requestInvite { - display:block; - margin:-720px auto 0; -} - -.new_session, -.new_user { - display: block; - width: 350px; - position:absolute; - left:50%; - top:0; - margin:200px 0 0 -195px; - background: url('bg.png'); - padding: 20px; - border-radius: 5px; - color: #000; - border:1px solid #000; - box-shadow: 6px 6px 8px rgba(0,0,0,0.4); -} - -.edit_user{ - display: block; - width: 200px; - position:absolute; - left:70%; - top:25%; - margin:50px 0 0 -420px; - padding: 20px; - border-radius: 15px; - color: #000; - border:2px solid #000; -} - - -#closenewtopic, -#closenewsynapse { - position:absolute; - top: 3px; - right:3px; -} - -.anypage .new_topic { - /* start it off screen while it initializes the spinner, then it will be hidden with jquery */ - top:-1000px; - left:-1000px; - display: block; - position: absolute; - width:300px; - margin:-40px 0 0 -50px; -} -.anypage .new_synapse { - display: none; - position: absolute; -} - -#new_topic .twitter-typeahead { - position:absolute !important; - top:40px; - left:50px; - z-index:9999; - width:202px; - height: 37px; - font-family: ':atp'; -} - -.anypage #topic_name, .anypage .tt-hint { - width:190px; -background: rgba(0,0,0,0.8); -height: 25px; -margin: 0; -padding: 5px 5px; -border: 1px solid black; -outline: none; -font-size: 25px; -line-height: 35px; -color: rgba(255,255,255,0.7); -font-family: 'LatoLight'; -} - -#metacodeImg { - height:120px; -} - -#metacodeImgTitle { - color:#FFF; - float:left; - width:120px; - text-align:center; - margin-left:90px; - font-family: 'LatoRegular'; -} - -/* synapse autocomplete */ - -.new_topic #topic_name, .new_topic .tt-hint { -width: 190px; -background: rgba(0,0,0,0.8); -height: 25px; -margin: 0; -padding: 5px 5px; -border: 1px solid black; -outline: none; -font-size: 18px; -line-height: 35px; -color: white; -font-family: 'LatoRegular'; -} - -.new_synapse #synapse_desc, .new_synapse .tt-hint { -width: 200px; -background: rgba(0,0,0,0.8); -height: 18px; -margin: 0; -padding: 5px 5px; -border: 1px solid black; -outline: none; -font-size: 16px; -line-height: 20px; -color: rgba(255,255,255,0.7); -font-family: 'LatoRegular'; -} - -label, select, input, textarea { - display:block; -} - -label { - margin-top:10px; - margin-bottom:4px; -} - -input[type="submit"] { - margin-top:5px; -} - -#user_remember_me { - margin-top:11px; -} -#user_remember_me, label[for="user_remember_me"] { - float:left; -} - -.contentarea p, -.contentarea ul, -.contentarea ol, -.contentarea table { - font-size:14px; - line-height:1.55em; - padding:0.5em 0 -} - -.contentarea ul li { - padding:0.2em 0; -} - -.contentarea ol li { - padding:0.2em 0; -} - -.contentarea ul { - margin:0 0 0 1em; -} - -.contentarea ol { - margin:0 0 0 1.3em; -} - -.main { - /*overflow:hidden; */ -} - -#infovis-canvas { - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; -} - -/* --- top options --*/ - -.notice.metamaps, .alert.metamaps { -position: absolute; -margin: 5px 0 0 45px; -background: #0F1519; -padding: 10px 10px 9px 10px; -border-radius: 5px; -z-index: 1; -} - -.headertop { - display:block; - position:fixed; - top:20px; - z-index:10; - border-radius:5px; - margin: 10px 0px 10px 10px; - background:#111614; - padding:5px 10px; - box-shadow: 6px 6px 8px rgba(0,0,0,0.4); -} - -.headertop .tab { - background: url(tab.png) no-repeat 0 0; - position:absolute; - top:-11px; - right:-2px; - display:block; - width:45px; - height:15px; - cursor:move; -} - -.headertop button, .headertop input { - height: 30px; - background: none; - color: #717474; - font-family: 'LatoLight'; - font-size: 17px; - border: none; - border-right:1px solid #717474; - cursor: pointer; - margin:3px 0; - clear:both; - float:right; -} - -.headertop button:hover, .headertop input:hover { - border-right: 1px solid #6d7310; - color: #6d7310; -} - -.wrapper { - display:block; - height:100%; - margin:0 0; -} - - -/* bottom right corner stuffs */ - -.wrapper div.index { - position: fixed; - bottom: 5px; - right: 0px; - z-index: 9999; - width: auto; - padding: 1px 10px 0px 10px; - font-family: "vinyl",sans-serif; - font-style:italic; - height: 35px; - font-size: 30px; - line-height: 38px; - border-right:none; - border-bottom-left-radius:5px; - border-top-left-radius:5px; - background: #0F1519; -} -.wrapper div.index .openCheatsheet { - position:absolute; - top:0; - left:-41px; - background: #0F1519 url('MMCCicon_help.png') no-repeat center center; - background-size: 27px 27px; - border-radius:5px; - height:36px; - width:36px; - cursor:pointer; -} -.wrapper div.index .openCheatsheet:hover { - -} -.wrapper div.index span { - float:left; -} -.wrapper div.index span.mapName { - text-transform:uppercase; - margin-right:9px; -} -.wrapper div.index span.mapInfo { - width: 24px; - height: 24px; - line-height: 24px; - text-align: center; - margin-top: 5px; - font-size: 27px; - background: url('MMCCicon_info.png') no-repeat center center; - background-size:24px 24px; -} - -.wrapper h1.index { - position: fixed; - bottom: 5px; - right: 0; - z-index: 9999; - width: auto; - padding: 1px 10px 0px 20px; - text-transform:uppercase; - font-style:italic; - height: 35px; - font-size: 30px; - line-height: 38px; - border-right:none; - border-bottom-left-radius:5px; - border-top-left-radius:5px; - background: #0F1519; -} - -/* account */ - -.sidebarAccount { -position:absolute; -top:5px; -right:0; -z-index:200; -width: 35px; -height:35px; -} - -.sidebarAccountIcon { -position:absolute; -width: 35px; -height: 35px; -background: #0F1519 url('MMCCicon_mapper.png') no-repeat center center; -background-size: 24px 24px; -cursor:pointer; -} -.sidebarAccountBox { - position:absolute; - display:none; - height:auto; - background: #000; - top: 35px; - right:0; - padding: 10px; - border: 1px solid black; - min-width:120px; - font-family: 'LatoLight', helvetica, sans-serif; -} -.sidebarAccountBox.loggedin { - width:auto; -} -.sidebarAccountBox.loggedout { - width:200px; -} - -.sidebarAccountBox h3 { - font-family: 'vinyl', helvetica, sans-serif; - text-transform:uppercase; - font-style:italic; -} -.sidebarAccountBox ul { - list-style:none; -} -.sidebarAccountBox li.accountIcon { -padding: 0; -background-size: 18px 18px; -background-repeat: no-repeat; -background-position: 0px 6px; -font-size: 18px; -line-height: 20px; -} -li.accountIcon:hover { -background-position: 4px 6px; -} -li.accountMaps { - background-image: url('MMCCicon_map.png'); -} -li.accountSettings { - background-image: url('MMCCicon_settings.png'); -} -li.accountInvite{ - background-image: url('MMCCicon_invite.png'); -} -li.accountLogout { - background-image: url('MMCCicon_logout.png'); -} -li.accountIcon a { - display:block; - padding: 6px 0 6px 25px; -} - -li.accountInvite span { - display: block; - padding: 6px 0 6px 25px; -} - -.sidebarAccountBox a { - color:white; -} - -.sidebarAccountBox input[type="email"], .sidebarAccountBox input[type="password"] { -width: 200px; -height: 32px; -font-size: 15px; -direction: ltr; --webkit-appearance: none; -appearance: none; -display: inline-block; -margin: 0; -padding: 0 8px; -background: #fff; -border: 1px solid #d9d9d9; -border-top: 1px solid #c0c0c0; --webkit-box-sizing: border-box; --moz-box-sizing: border-box; -box-sizing: border-box; --webkit-border-radius: 1px; --moz-border-radius: 1px; -border-radius: 1px; -font: -webkit-small-control; -color: initial; -letter-spacing: normal; -word-spacing: normal; -text-transform: none; -text-indent: 0px; -text-shadow: none; -display: inline-block; -text-align: start; -} - -.sidebarAccountBox input[type="email"]:hover, .sidebarAccountBox input[type="password"]:hover { - border: 1px solid #b9b9b9; - border-top: 1px solid #a0a0a0; - -webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,0.1); - -moz-box-shadow: inset 0 1px 2px rgba(0,0,0,0.1); - box-shadow: inset 0 1px 2px rgba(0,0,0,0.1); -} - -.sidebarAccountBox .links a { - display:block; - margin-top:5px; -} - -/* Save To New Map */ - -.sidebarFork { -position:absolute; -top:5px; -right:71px; -z-index:200; -width: 35px; -height:35px; -border-right:1px solid black; -} - -.sidebarForkIcon { -position:absolute; -width: 35px; -height: 35px; -background: #0F1519 url('MMCCicon_save_new_map.png') no-repeat center center; -background-size: 28px 28px; -cursor:pointer; -} -.sidebarForkIcon:hover { - background-color: black; -} -.sidebarForkBox { - position:absolute; - display:none; - height:auto; - width:182px; - background: #000; - top: 35px; - right:-36px; - padding: 10px; - border: 1px solid black; - font-family: 'LatoLight', helvetica, sans-serif; -} - -.sidebarFork .hoverForTip:hover .tip { - display:block; -} - -.sidebarFork .tip { -display: none; -position: absolute; -background: black; -text-align: center; -top: 36px; -right: 0; -color: white; -border-radius: 4px; -font-size: 15px !important; -font-family: 'LatoRegular'; -line-height: 17px; -padding: 3px 5px 2px; -z-index: 100; -} - -/* end Save To New Map */ - -/* Save Layout */ - -.sidebarSave{ -position:absolute; -top:5px; -right:107px; -z-index:200; -width: 35px; -height:35px; -border-right:1px solid black; -} - -.sidebarSaveIcon { -position:absolute; -width: 35px; -height: 35px; -background: #0F1519 url('MMCCicon_save_layout.png') no-repeat center center; -background-size: 22px 22px; -cursor:pointer; -} -.sidebarSaveIcon:hover { - background-color: black; -} -.sidebarSaveBox { - position:absolute; - display:none; - height:auto; - width:182px; - background: #000; - top: 35px; - right:-36px; - padding: 10px; - border: 1px solid black; - font-family: 'LatoLight', helvetica, sans-serif; -} - -.sidebarSave .hoverForTip:hover .tip { - display:block; -} - -.sidebarSave .tip { -display: none; -position: absolute; -background: black; -text-align: center; -top: 36px; -right: 0; -color: white; -border-radius: 4px; -font-size: 15px !important; -font-family: 'LatoRegular'; -line-height: 17px; -padding: 3px 5px 2px; -z-index: 100; -} - -/* Filter */ - -.sidebarFilter { -position:absolute; -top:5px; -right:35px; -z-index:200; -width: 35px; -height:35px; -border-right:1px solid black; -} -.sidebarFilter.loggedout { - right:35px; -} - -.sidebarFilterIcon { -position:absolute; -width: 35px; -height: 35px; -background: #0F1519 url('MMCCicon_filter2.png') no-repeat center center; -background-size: 28px 28px; -cursor:pointer; -} -.sidebarFilterIcon:hover { - background-color: black; -} - -/* we set a few of these params off screen to begin with, so that when we initialize the scroll bar it works, but then - we hide the element and position it correctly */ -.sidebarFilterBox { - position:fixed; - top: -1000px; - right:-1000px; - display:block; - /* - position:absolute; - top: 35px; - right:-72px; - display:none; - */ - height:auto; - width:260px; - background: #000; - padding: 10px; - border: 1px solid black; - font-family: 'LatoLight', helvetica, sans-serif; - text-align:center; -} - -h3.filterByMetacode { -margin-bottom: 10px; -text-align: left; -float:left; -} -.sidebarFilterBox span { -float: left; -background: #15bad4; -padding: 1px 4px; -border-radius: 2px; -margin-left: 5px; -cursor: pointer; -} - -.sidebarFilterBox #filter_by_metacode { - height:270px; - overflow:hidden; -} -.sidebarFilterBox ul { - list-style:none; -} -.sidebarFilterBox li { - float:left; - width:61px; - height:70px; - cursor:pointer; -} -.sidebarFilterBox li:hover { -background-color: rgba(255,255,255,0.1); -} -.sidebarFilterBox li img { - width:45px; - height:45px; - margin:0 auto; -} -.sidebarFilterBox li p { - font-size:11px; - line-height:11px; - font-family:arial, sans-serif; -} - -.sidebarFilterBox li.toggledOff { - opacity: 0.4; -} - -/* end filter by metacode */ - -/* collaborate */ - -.sidebarCollaborate { -position:absolute; -top:5px; -right:143px; -z-index:200; -width: 35px; -height:35px; -border-right:1px solid black; -} - -.sidebarCollaborateIcon { -position:absolute; -width: 35px; -height: 35px; -background: #0F1519 url('MMCCicon_realtime_junto.png') no-repeat 0px 1px; -background-size: 36px 36px; -cursor:pointer; -} -.sidebarCollaborateIcon:hover, .sidebarCollaborateIcon.blue:hover{ -background-color: black; -} -.sidebarCollaborateIcon.blue { -background: #0F1519 url('MMCCicon_realtime_blue.png') no-repeat center center; -background-size: 26px 25px; -} -.sidebarCollaborateBox { - position:absolute; - display:none; - height:auto; - width:auto; - background: #000; - top: 36px; - right:0; - padding: 10px; - border: 1px solid black; - min-width:120px; - font-family: 'LatoLight', helvetica, sans-serif; -} - -.sidebarCollaborate .hoverForTip:hover .tip { - display:block; -} - -.sidebarCollaborate .tip { -display: none; -position: absolute; -background: black; -text-align: center; -top: 36px; -right: 0; -color: white; -border-radius: 4px; -font-size: 15px !important; -font-family: 'LatoRegular'; -line-height: 17px; -padding: 3px 5px 2px; -z-index: 100; -} - -/* end collaborate */ - -/* search */ - -.sidebarSearch { -position:absolute; -top:5px; -left:0; -height: 35px; -z-index:200; -} - -.sidebarSearchIcon { -float:left; -width: 35px; -height: 35px; -background: #0F1519 url('search_icon_32x32.png') no-repeat center center; -background-size: 25px 25px; -cursor:pointer; -} - -.sidebarSearch .twitter-typeahead { - float:left; -} - -.sidebarSearchField, .sidebarSearch .tt-hint { - height:25px; - padding:5px 0; - width:0px; - margin: 0; - border: 0; - outline: none; - font-size: 18px; - line-height:35px; - background:#0F1519; - color: rgba(255,255,255,0.6); - font-family: 'LatoRegular'; -} - -.sidebarSearch .tt-dropdown-menu { -left:-35px !important; -background: #0F1519; -min-width: 440px; -} - -.sidebarSearch .tt-dropdown-menu h3 { - font-family:'vinyl',helvetica,sans-serif; - text-transform:uppercase; - font-style:italic; - font-size:20px; - line-height:20px; - margin: 10px 0 3px 10px; - float:left; -} -.sidebarSearch .tt-dropdown-menu .limitToMe { - float:left; - width: 15px; - height: 15px; - margin-top: 11px; - margin-left: 15px; -} -.sidebarSearch .tt-dropdown-menu .limitToMeLabel { - float:left; - margin-top: 11px; -} -.sidebarSearch .tt-dropdown-menu .minimizeResults { - float:right; - width:35px; - height:35px; - background: url('/assets/MMCCicon_minimize_arrow.png') no-repeat center center; - background-size: 25px 25px; - cursor:pointer; -} -.sidebarSearch .tt-dropdown-menu .maximizeResults { - float:right; - width:35px; - height:35px; - background: url('/assets/MMCCicon_maximize_arrow.png') no-repeat center center; - background-size: 25px 25px; - cursor:pointer; -} - - -.sidebarSearch .tt-suggestions { - font-family:'LatoLight', helvetica, sans-serif; - overflow:visible; -} - - -.sidebarSearch .tt-suggestion { - background: #2A343C; -} - -.sidebarSearch .tt-is-under-cursor { - background:#0E161D; -} - -.sidebarSearch .tt-dataset-maps .tt-is-under-cursor .resultmap, .sidebarSearch .tt-dataset-topics .tt-is-under-cursor .resulttopic { - min-height: 57px; -} - -.sidebarSearch .tt-suggestion .icon { - float:left; - width:36px; - height:36px; - margin-right:5px; -} -.sidebarSearch .topicMetacode { - float:left; - margin-right:5px; - max-width:70px; -} -.sidebarSearch .tt-dataset-topics .topicIcon { - width:36px; - height:36px; -} -.sidebarSearch .tt-dataset-topics .tt-is-under-cursor .topicIcon { - margin:0 auto; - padding-left:2px -} -.sidebarSearch .tt-dataset-topics .metacodeTip { - display:none; -} -.sidebarSearch .tt-dataset-topics .tt-is-under-cursor .metacodeTip { - display: block; - font-family: 'vinyl'; - text-transform: uppercase; - font-style: italic; - font-size: 13px; - margin: 0 5px 0 2px; - text-align: center; -} - - -.sidebarSearch .tt-dataset-mappers .tt-suggestion .icon { - width:28px; - height:28px; - padding:4px; -} - -.sidebarSearch .resultText { - width: 250px; - display: block; - float: left; -} - -.sidebarSearch .resultTitle { - font-weight:normal; - font-family: 'LatoRegular'; - font-size:18px; - line-height:22px; - width:100%; - padding-top:8px; -} -.sidebarSearch .resultDesc { - font-family: 'LatoItalic'; - font-size:14px; - line-height:16px; - width:100%; - padding: 3px 0 6px 0; -} - -.sidebarSearch .tip { - display:none; -} - -.sidebarSearch div.autoOptions { - width: 122px; - float: right; - position:relative; - display:none; -} -.sidebarSearch .tt-is-under-cursor .autoOptions { - display:block; -} -.sidebarSearch .tt-suggestion .resultnoresult .autoOptions { - display:none; -} - -.sidebarSearch .autoOptions button, .sidebarSearch .autoOptions a, .sidebarSearch .autoOptions div { - position: absolute; - padding: 0; - margin: 0; - border: none; - outline: none; -} - -.sidebarSearch button.addToMap { -width: 20px; -height: 20px; -background: url(/assets/MMCCicon_add.png) no-repeat center center; -background-size: 18px 18px; -top: 30px; -left: 84px; -cursor: pointer; -} - -.sidebarSearch a.goTo { -width: 20px; -height: 20px; -background: url(/assets/MMCCicon_pop-out.png) no-repeat center center; -background-size: 18px 18px; -top: 7px; -left: 84px; -} - -.sidebarSearch div.mapCount { -width: 20px; -height: 20px; -background: url(/assets/MMCCicon_map.png) no-repeat 0px center; -background-size: 14px 14px; -top: 7px; -left: 39px; -padding-left: 18px; -font-size: 12px; -line-height: 20px; -} - -.sidebarSearch div.topicCount { -width: 20px; -height: 20px; -background: url(/assets/MMCCicon_topic.png) no-repeat 0px center; -background-size: 14px 14px; -top: 7px; -left: 39px; -padding-left: 18px; -font-size: 12px; -line-height: 20px; -} - -.sidebarSearch div.synapseCount { -width: 20px; -height: 20px; -background: url(/assets/MMCCicon_synapse.png) no-repeat 0px center; -background-size: 15px 15px; -top: 30px; -left: 38px; -padding-left: 19px; -font-size: 12px; -line-height: 20px; -} - -.sidebarSearch div.topicOriginatorIcon { - width: 20px; - height: 20px; - background: url(/assets/MMCCicon_mapper.png) no-repeat center center; - background-size: 17px 17px; - top: 7px; - left: 13px; -} -.sidebarSearch .tip { - position: absolute; - background: white; - width: auto; - bottom: 0; - left: 23px; - color: black; - white-space: nowrap; - border-radius: 4px; - font-size:15px !important; - font-family:'LatoRegular'; - line-height:17px; - padding: 3px 5px 2px; - z-index:100; -} -.sidebarSearch .mapCount .tip,.sidebarSearch .synapseCount .tip, .sidebarSearch .topicCount .tip { - left:-3px; - bottom:24px; -} -.sidebarSearch .hoverForTip:hover .tip { - display:block; -} -.sidebarSearch .mapContributorsIcon .mapContributors { - left:0; - bottom:21px; - white-space:normal; - width:200px; -} - -.sidebarSearch div.mapContributorsIcon { -height: 20px; -background: url(/assets/MMCCicon_mapper.png) no-repeat 0px center; -background-size: 17px 17px; -top: 7px; -right: 85px; -padding-left: 19px; -font-size: 12px; -line-height: 20px; -padding-right: 5px; -} - -.sidebarSearch div.topicPermission, .sidebarSearch div.mapPermission { -width: 20px; -height: 20px; -background-size: 19px 19px !important; -top: 30px; -left: 13px; -} -.sidebarSearch div.topicPermission.commons, .sidebarSearch div.mapPermission.commons { - background: url(/assets/MMCCicon_commons.png) no-repeat center center; -} -.sidebarSearch div.topicPermission.public, .sidebarSearch div.mapPermission.public { - background: url(/assets/MMCCicon_public.png) no-repeat center center; -} -.sidebarSearch div.topicPermission.private, .sidebarSearch div.mapPermission.private { - background: url(/assets/MMCCicon_private.png) no-repeat center center; -} - -.sidebarSearch .tt-dataset-mappers a.goTo { - top:7px; -} -.sidebarSearch .tt-dataset-mappers div.mapCount { - top:8px; -} - -/* end search */ - -.nodemargin { - padding-top:120px; -} - -.divider { - margin: 20px 50px 20px 50px; - border-bottom:2px solid #FFF; -} - -.empty { - margin-left:50px; -} - -#menus { - margin:0 7px; -} - -#cards { - height:100%; - width:805px; - margin:0 auto; -} - -#cards p.empty { - margin-left:50px; -} - -/* right click menu */ - -.rightclickmenu { - position:absolute; - background:white; - z-index: 20; - border-radius: 2px; - color: black; -} - -.rightclickmenu ul { - padding: 2px; -} - -.rightclickmenu ul li { - list-style: none; -padding: 3px 10px 3px 30px; -font-family: arial, sans-serif; -font-size: 17px; -line-height: 17px; -background-repeat: no-repeat; -background-size: 20px 20px; -background-position: 5px 2px; -} -.rightclickmenu ul li:nth-child(odd){ - background-color: #FFF; -} -.rightclickmenu ul li:nth-child(even){ - background-color: #EEE; -} -.rightclickmenu ul li:hover { - background-color: #BBB; - background-position: 7px 2px; - cursor:pointer; -} -.rightclickmenu .rc-delete { - background-image: url(MMCCicon_delete_black.png); -} -.rightclickmenu .rc-remove { - background-image: url(MMCCicon_remove_from_map_black.png); -} -.rightclickmenu .rc-hide { - background-image: url(MMCCicon_hide.png); -} -.rightclickmenu .rc-center { - background-image: url(MMCCicon_center.png); -} -.rightclickmenu .rc-popout { - background-image: url(MMCCicon_pop-out_black.png); -} -.rightclickmenu .rc-permission { - background-image: url(MMCCicon_edit_permission_black.png); - position:relative; -} - -.rightclickmenu .rc-permission ul { - display:none; - background:white; - top: 0; - left:100%; - position:absolute; - border-bottom-left-radius: 2px; - border-bottom-right-radius: 2px; - border-top-right-radius: 2px; -} -.rightclickmenu .rc-permission:hover ul { - display:block; -} -.rightclickmenu .rc-permission .toCommons { - background-image: url(MMCCicon_commons.png); -} -.rightclickmenu .rc-permission .toPublic { - background-image: url(MMCCicon_public.png); -} -.rightclickmenu .rc-permission .toPrivate { - background-image: url(MMCCicon_private.png); -} - -.rightclickmenu p { - padding:7px; -} - -/* end right click menu */ - -/* topic autocomplete */ - -#new_topic .tt-suggestion.tt-is-under-cursor { -background: #0E161D; -} - -#new_topic .tt-suggestion { -padding: 5px; -font-family: 'LatoLight'; -background: #2A343C; -} - -#new_topic .autocompleteSection { - float:left; - -} - -#new_topic .topicTitle { - width:130px; - line-height:22px; -} -#new_topic .topicPermission { - width:20px; - height:20px; - background-repeat:no-repeat; - background-position:center center; - background-size:16px 16px; -} -#new_topic .topicPermission.commons { - background-image:url(MMCCicon_commons.png); -} -#new_topic .topicPermission.public { - background-image:url(MMCCicon_public.png); -} -#new_topic .topicPermission.private { - background-image:url(MMCCicon_private.png); -} -#new_topic .topicOriginatorIcon { - position:relative; - width:20px; - height:20px; - background-repeat:no-repeat; - background-position:center center; - background-size:16px 16px; - background-image:url(MMCCicon_mapper.png); -} -#new_topic .topicOriginatorIcon:hover .tip { - display:block; -} -#new_topic .tip { - display:none; - position: absolute; - background: white; - width: auto; - top: 0; - left: 23px; - color: black; - white-space: nowrap; - border-radius: 4px; - font-size:15px !important; - font-family:'LatoRegular'; - line-height:15px; - padding: 2px 5px 2px; - z-index:100; -} - -/* topic autocomplete */ - -#new_synapse .tt-dropdown-menu { - width: 212px; - background:#2A343C; -} - -#new_synapse .tt-dropdown-menu h3 { -font-family: 'vinyl',helvetica,sans-serif; -text-transform: uppercase; -font-style: italic; -font-size: 14pxpx; -line-height: 16px; -margin: 3px; -} - -#new_synapse .tt-suggestion.tt-is-under-cursor { - background: #0E161D; -} - -#new_synapse .tt-suggestion { - padding: 5px; - font-family: 'LatoLight'; -} - -#new_synapse .autocompleteSection { - float:left; -} - -#new_synapse .synapseDesc { - width:162px; - line-height:22px; -} -#new_synapse .synapsePermission { - width:20px; - height:20px; - background-repeat:no-repeat; - background-position:center center; - background-size:16px 16px; -} -#new_synapse .synapsePermission.commons { - background-image:url(MMCCicon_commons.png); -} -#new_synapse .synapsePermission.public { - background-image:url(MMCCicon_public.png); -} -#new_synapse .synapsePermission.private { - background-image:url(MMCCicon_private.png); -} -#new_synapse .synapseOriginatorIcon { - position:relative; - width:20px; - height:20px; - background-repeat:no-repeat; - background-position:center center; - background-size:16px 16px; - background-image:url(MMCCicon_mapper.png); -} -#new_synapse .synapseOriginatorIcon:hover .tip { - display:block; -} -#new_synapse .tip { - display:none; - position: absolute; - background: white; - width: auto; - top: 0; - left: 23px; - color: black; - white-space: nowrap; - border-radius: 4px; - font-size:15px !important; - font-family:'LatoRegular'; - line-height:15px; - padding: 2px 5px 2px; - z-index:100; -} - -#new_synapse .tt-suggestion .resultnoresult .synapsePermission, #new_synapse .tt-suggestion .resultnoresult .synapseOriginatorIcon { - display:none; -} - - -/* map info box */ - -.wrapper div.mapInfoBox { - display:none; - position:absolute; - bottom:40px; - right:3px; - background:#0F1519; - border-radius:5px; - width:320px; - height:auto; - padding:10px; - font-family:'LatoLight'; - font-size:15px; - line-height:17px; - font-style:normal; - text-align:center; -} - -.mapInfoName { - padding-bottom:10px; - margin-bottom:10px; - background: url(mapInfoLine.png) no-repeat bottom center; -} -.mapInfoName, .mapInfoStat { - font-size:25px; - line-height:27px; -} -.wrapper div.mapInfoName span, .wrapper div.mapInfoDesc span { - float:none !important; - padding-bottom: 10px; -} - -div.mapInfoStat { - padding-left: 29px; -} -.infoStatIcon { -float: left; -width: 25px; -padding: 6px 0px 7px 45px; -height: 27px; -background-repeat: no-repeat; -text-align: left; -font-size: 20px; -line-height: 27px; -} -.mapContributors { -background-image: url(MMCCicon_mapper.png); -background-position: 16px 6px; -background-size: 27px 27px; -position:relative; -} -.infoStatIcon .tip { -display: none; -position: absolute; -background: white; -min-width: 180px; -max-width:250px; -text-align:center; -color: black; -border-radius: 4px; -font-size: 15px !important; -font-family: 'LatoRegular'; -line-height: 17px; -padding: 3px 5px 2px; -z-index: 100; -} -.mapContributors .tip { - top: 38px; - left: 6px; -} -.mapInfoBox .mapPermission .tip { - top: 0; - right: 32px; -} -.mapInfoBox .hoverForTip:hover .tip { - display:block; -} - -.mapTopics { -background-image: url(MMCCicon_topic.png); -background-position: 16px 6px; -background-size: 27px 27px; -} -.mapSynapses { -background-image: url(MMCCicon_synapse.png); -background-position: 18px 6px; -background-size: 27px 27px; -} -.mapInfoBox .mapPermission { -background-position: 0 center; -background-size: 30px 30px; -width: 30px; -height: 30px; -padding: 0; -margin: 5px 30px 5px 10px; -position: relative; -} -.mapInfoBox .mapPermission.commons { - background-image:url(MMCCicon_commons.png); -} -.mapInfoBox .mapPermission.public { - background-image:url(MMCCicon_public.png); -} -.mapInfoBox .mapPermission.private { - background-image:url(MMCCicon_private.png); -} - -.yourMap .mapPermission:hover { - background-image: url(/assets/MMCCicon_maximize_arrow.png); - cursor:pointer; -} -.yourMap .mapPermission.minimize { - background-image: url(MMCCicon_minimize_arrow.png) !important; - cursor: pointer; -} -.mapInfoBox .mapPermission .permissionSelect { - list-style: none; - width: 30px; - height: 60px; - position: relative; - top: 30px; -} -.mapInfoBox .mapPermission .permissionSelect li { - width: 30px; - height: 30px; - background-repeat: no-repeat; - background-position: center center; - background-size: 30px 30px; -} -.mapInfoBox .mapPermission .permissionSelect .commons { - background-image: url(MMCCicon_commons.png); -} -.mapInfoBox .mapPermission .permissionSelect .public { - background-image: url(MMCCicon_public.png); -} -.mapInfoBox .mapPermission .permissionSelect .private { - background-image: url(MMCCicon_private.png); -} -.mapInfoBox .mapPermission .permissionSelect .commons:hover { - background-image: url(MMCCicon_commons_black.png); -} -.mapInfoBox .mapPermission .permissionSelect .public:hover { - background-image: url(MMCCicon_public_black.png); -} -.mapInfoBox .mapPermission .permissionSelect .private:hover { - background-image: url(MMCCicon_private_black.png); -} - -.mapInfoBox .mapInfoDesc { - font-style: italic; - color: #BBB; - padding-bottom:5px; - margin: 5px 0 8px; - background: url(mapInfoLine.png) no-repeat bottom center; -} - -.mapInfoBox .mapInfoMeta p { - margin:4px 0; - font-size:14px; - font-style: italic; - color:#BBB; -} - - - - -/* lightboxes */ - -#lightbox_overlay { - top: 0; - left: 0; - width: 100%; - height: 100%; - position: fixed; - z-index: 1000000; - display:none; -} - -#lightbox_main { - width: 550px; - height: auto; - margin: 0 auto; - z-index: 2; - position: relative; - top:50%; - background-color: transparent; - color:black; -} - -#lightbox_screen { - top: 0; - left: 0; - z-index: 1; - width: 100%; - position: absolute; - background-color: #000; - opacity: 0.42; - filter: alpha(opacity=42); - -moz-opacity: 0.42; -} - -#lightbox_overlay #lightbox_main #lightbox_header { -padding: 6px 5px 1px 0; -background-color: #333; -font-weight: bold; -height: 18px; -border: solid 2px #000; -} - -#lightbox_overlay #lightbox_main a#lightbox_close { - /*background-image: url(../images/barometer_close.png);*/ - cursor: pointer; - height: 42px; - outline-color: -moz-use-text-color; - outline-style: none; - outline-width: medium; - overflow: hidden; - position: absolute; - top: -23px; - right: -22px; - width: 42px; - z-index: 4; - border: none; -} - -#lightbox_content { - background: white url(metacode-watermark.png) 443px -30px no-repeat; - padding: 20px; - border-radius:5px; -} - -.lightboxContent h3 { - font-style: italic; - text-transform: uppercase; - font-family: 'vinyl'; - font-size: 30px; - line-height:35px; - color:black; -} -.lightboxContent h3.forCreateMap { - text-align:center; -} - -.lightboxContent { - display:none; -} - -.openLightbox { - cursor:pointer; -} - -#about > p { - color: #000; - font-size: 16px; - line-height: 24px; - margin:10px 0; -} - -#about ul { - list-style:none; -} -#about ul li { - display:inline-block; - padding:5px; -} -#about li a { - color:#097A51; -} - -/* invite */ - -#invite { - color:black; -} - -#invite p { - margin:10px 0; - line-height:24px; -} - -#invite .green { - text-align:center; - display:block; - color:#097A51; -} - -/* new map */ -.new_map { - color:black; -} - -.new_map .inputGroup { - margin: 15px 0 5px; -} - -.new_map label { - float:left; - width: 100px; - text-align: right; - margin-right: 15px; -} - -.new_map input[type="text"] { -width: 336px; -height: 32px; -font-size: 15px; -direction: ltr; --webkit-appearance: none; -appearance: none; -display: inline-block; -margin: 0; -padding: 0 8px; -background: #fff; -border: 1px solid #d9d9d9; -border-top: 1px solid #c0c0c0; --webkit-box-sizing: border-box; --moz-box-sizing: border-box; -box-sizing: border-box; --webkit-border-radius: 1px; --moz-border-radius: 1px; -border-radius: 1px; -font: -webkit-small-control; -color: initial; -letter-spacing: normal; -word-spacing: normal; -text-transform: none; -text-indent: 0px; -text-shadow: none; -display: inline-block; -text-align: start; -font-family:arial; -} -.new_map input[type="text"]:hover, .new_map textarea:hover { - border: 1px solid #b9b9b9; - border-top: 1px solid #a0a0a0; - -webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,0.1); - -moz-box-shadow: inset 0 1px 2px rgba(0,0,0,0.1); - box-shadow: inset 0 1px 2px rgba(0,0,0,0.1); -} - -.new_map textarea { - padding:8px; - border: 1px solid #d9d9d9; - border-top: 1px solid #c0c0c0; - resize:none; - font: -webkit-small-control; - letter-spacing: normal; - word-spacing: normal; - text-transform: none; - text-indent: 0px; - text-shadow: none; - text-align: start; - font-family:arial; - font-size:15px; - line-height:17px; - width:318px; -} - -.new_map .permIcon { - float:left; - width:92px; - height: 85px; - position:relative; -} -.new_map .mapPermIcon { - width:60px; - height:60px; - background-size: 48px 48px; - background-position: center center; - background-repeat: no-repeat; - margin:0 auto; - cursor:pointer; -} -.new_map .mapCommonsIcon { - background-image: url(MMCCicon_commons.png); -} -.new_map .mapPublicIcon { - background-image: url(MMCCicon_public.png); -} -.new_map .mapPrivateIcon { - background-image: url(MMCCicon_private.png); -} -.new_map .mapCommonsIcon.selected, .new_map .mapCommonsIcon:hover { - background-image: url(MMCCicon_commons_black.png); -} -.new_map .mapPublicIcon.selected, .new_map .mapPublicIcon:hover { - background-image: url(MMCCicon_public_black.png); -} -.new_map .mapPrivateIcon.selected, .new_map .mapPrivateIcon:hover { - background-image: url(MMCCicon_private_black.png); -} - -.new_map .permIcon h4 { - font-style:italic; - font-family: 'Vinyl'; - text-transform:uppercase; - font-size:18px; - line-height:20px; - color:black; - text-align:center; -} - -.new_map .tip { - display:none; - position: absolute; - background: black; - width: 150px; - top: 85px; - left: -29px; - color: white; - border-radius: 4px; - font-size:15px !important; - font-family:'LatoRegular'; - line-height:17px; - padding: 3px 5px 2px; - z-index:100; - text-align:center; -} -.new_map .hoverForTip:hover .tip { - display:block; -} - -.permText { - width: 360px; - margin: 0 auto; - text-align: center; -} - -.buttonWrapper { - margin: 10px 0 0 131px; - width: 254px; -} - -.onConsole .new_map button { - margin-right: 20px; -} - -.onConsole .new_map button, .onConsole .new_map input.add { - float: left; - margin-top: 5px; - height: 40px; - font-family: 'LatoItalic'; - font-size: 17px; - width: auto; - padding: 0 30px; - cursor:pointer; - font-weight:normal; -} -.onConsole .new_map button:hover, .onConsole .new_map input.add:hover { - -webkit-box-shadow: none; - box-shadow: none; -} - -/* Cheatsheet */ - -.cheatsheetColumn { - float:left; - width:245px; - line-height: 17px; -font-size: 12px; -font-family: arial; -} -.cheatsheetColumn.cOne { - margin-right:10px; -} - -#cheatsheet h4 { -text-decoration: underline; -font-size: 20px; -font-family: 'vinyl'; -margin-top: 15px; -font-style: italic; -} - -#cheatsheet .csItem { -margin: 5px 0; -} - -#cheatsheet .csTitle { -font-weight: bold; -} - - - - -/* FAQ */ - -#wrapper > div.FAQ { -width: 700px; -margin: 0 auto; -padding: 20px 0 20px 20px; -background: rgba(0,0,0,0.4); -color: white; -height: 100%; -overflow: hidden; -position: relative; -} - -.FAQ .question { -display: block; -background: rgba(0,0,0,0.4); -padding: 10px 45px 10px 10px; -font-weight: bold; -margin-bottom: 10px; -margin-right: 20px; -line-height:24px; -position:relative; -cursor:pointer; -} - -.FAQ .answer { -padding: 0 30px; -margin-bottom: 20px; -line-height: 24px; -margin-right: 20px; -} -.FAQ .answer.off { - display:none; -} - -.FAQ .switch { -position:absolute; -top:0; -right:0; -width: 35px; -height: 44px; -background-repeat: no-repeat; -background-position:center center; -background-image: url('/assets/MMCCicon_maximize_arrow.png'); -background-size: 25px 25px; -cursor: pointer; -} -.FAQ .minimizeAnswer { -background-image: url('/assets/MMCCicon_minimize_arrow.png') !important; -} - -/* request */ - -#wrapper .requestInvite { - width: 700px; - margin: 0 auto; - padding: 20px; - background: rgba(0,0,0,0.4); - color: white; - height: 100%; - overflow: hidden; -} - - -/* --- styling the logo button ---*/ - -.footer { - display: block; - position: fixed; - bottom: 5px; - height: 35px; - z-index: 15000; - border-bottom-right-radius:5px; - border-top-right-radius:5px; - background: #0F1519; -} - -.addMap { -position: absolute; -right: -49px; -top: 0px; -width: 44px; -height: 35px; -background: #0F1519 url('MMCCicon_add_map.png') no-repeat 3px -4px; -background-size: 40px 40px; -border-radius: 5px; -cursor:pointer; -} -.addMap:hover { - -} - -.logo { - z-index:12; - display:block; - width: 136px; -background: url(menu_icon_32.png) no-repeat -10px 8px; -padding: 5px 0px 1px 15px; -background-size: 22px 20px; -} - -#mainTitle { - padding: 0 5px; -} - -#mainTitle a { - color:#FFF; - font-family: "vinyl",sans-serif; - font-style: italic; - text-transform:uppercase; - font-weight: 400; - font-size:30px; - line-height:30px; -} - -.footer .menu { - display:none; - position:absolute; - border:none; - bottom:35px; - left:-1px; - height:123px; - z-index:12; - width:122px; - color: white; - white-space: nowrap; - text-align: center; - font-size: 16px; - overflow: hidden; - padding: 0 0 0 30px; - margin: 0; - background: #0F1519 url(beta_gen002.png) no-repeat 6px 12px; -} - -.footer ul li { - margin:0; - clear:both; - float:none; - list-style-type:none; - display:block; - padding:0; - text-align:center; - font-family:'vinyl'; - font-style:italic; - height:30px; - line-height:34px; - font-size:17px; - cursor:pointer; -} -.footer ul li:hover { - -} - -li.meta a, li.tutorial a, li.exploreMaps a { - display:block; -} - -li.meta, li.tutorial, li.exploreMaps { - border-top:1px solid white; -} - -.footer ul li a { - color: #FFF; -} - -.home_bg { - display:block; - height:100%; -} - - -/* home page */ - -div#preloaded-images { - position: absolute; - overflow: hidden; - left: -9999px; - top: -9999px; -} - -.home_content { - width: 830px; - margin:0 auto; -} - -span.blue { - color: #36bbe8; -} - -.home_desc { -font-family: 'LatoLight'; -font-size: 32px; -margin: 40px 20px 25px; -text-align:center; -} -.home_desc .welcomeTo { - text-transform: uppercase; - font-size: 50px; - font-family: 'Vinyl'; - font-style: italic; -} - -.home_content .request { - margin-right:17px !important; -} -.home_content .request, .home_content .learnmore { -margin: 5px auto; -background: white; -height: 40px; -font-family: 'Vinyl'; -font-size: 18px; -font-style: italic; -width: 135px; -padding: 0 15px; -cursor: pointer; -color:black; -line-height:44px; -font-weight: normal; -text-transform: uppercase; -} -.home_content .request:hover, .home_content .learnmore:hover { -background: white; --webkit-box-shadow: none; -box-shadow: none; -} - -.metamapsIs { - -} -.metamapsIs .swapWord { - display: block; -} - -#homeMapImage { - margin:5px auto; -} - -.featuredMaps { - margin: 15px 0; - font-size:20px; - line-height:20px; - text-align:center; -} - -#homeMap { - width:738px; - margin: 0 auto; - height:265px; - position:relative; - overflow:hidden; -} -#homeFigure { - height: 265px; - width:1290px; - margin:0; -} -#homeFigure figure { - float:left; - margin:10px !important; - overflow:hidden; -} - -#homeMap .mapPerm { -height: 40px; -background-repeat: no-repeat; -background-position: 7px center; -background-size: 27px 27px; -position: relative; -padding-left:40px; -line-height:40px; -} -#homeMap .mapPerm.co { -background-image: url(MMCCicon_commons.png); -} -#homeMap .mapPerm.pu { -background-image: url(MMCCicon_public.png); -} -#homeMap .mapPerm.pr { -background-image: url(MMCCicon_private.png); -} - -.mapContains { - position:absolute; - height:40px; - line-height:40px; - bottom:0; - width:100%; -} -.mapContains span { - display:inline-block; - text-align:left; - padding-left: 27px; -} - -.mapContains .topicCount { - background-image: url(MMCCicon_topic.png); - background-size: 20px 20px; - background-repeat: no-repeat; -background-position: 5px center; -line-height: 40px; -width:72px; -} -.mapContains .synapseCount { - background-image: url(MMCCicon_synapse_black.png); - background-size: 20px 20px; - background-repeat: no-repeat; -background-position: 5px center; -line-height: 40px; -width:95px; -} - - -#homeFigure figure .littleOverlay { -position: absolute; -top: 100%; -width: 100%; -z-index: 2; -background: rgba(255, 255, 255, 0); -transition: .6s; -border-radius:5px; -} - -#homeFigure figure:hover .littleOverlay { - /*top: 0; - background: rgba(255,255,255, 0.9); - bottom: 0; */ -} - - -#homeMap .map, #homeMap .mapCard { - height:226px; -} - -.socialIcons { - position:fixed; - bottom: 0px; - height: 37px; - right:0px; -} -.socialIcons a { - float:left; - height:30px; - width:30px; - margin: 0 7px 7px 0px; - background-repeat:no-repeat; - background-size:30px 30px; -} -.socialIcons .twitter { - background-image: url('MMSocial-51.png'); -} -.socialIcons .google { - background-image: url('MMSocial-52.png'); -} -.socialIcons .wordpress { - background-image: url('MMSocial-53.png'); -} - - -.contact { - text-align: center; - margin: 1em 0 1em 0; -} - -.contact a { - color: #36bbe8; -} - -#edit_synapse label, -#edit_synapse_left, -#edit_synapse_right { - display: inline-block; -} - -#edit_synapse label.left { - margin-right: 0.5em; -} - -.templates { - display:none; -} diff --git a/app/controllers/users_controller.rb~ b/app/controllers/users_controller.rb~ deleted file mode 100644 index 7e2ea491..00000000 --- a/app/controllers/users_controller.rb~ +++ /dev/null @@ -1,29 +0,0 @@ -class UsersController < ApplicationController - - before_filter :require_user, only: [:edit, :update] - - respond_to :html, :json - - # GET /user/edit - def edit - @user = current_user - - respond_with(@user) - end - - # PUT /user - def update - @user = current_user - @user.attributes = params[:user] - - #@m = params[:metacodes][:value] - #@user.settings.metacodes=@m.split(',') - - @user.save - - - respond_with(@user, location: session[:previous_url]) do |format| - end - end - -end diff --git a/app/views/users/edit.html.erb~ b/app/views/users/edit.html.erb~ deleted file mode 100644 index 0477ee56..00000000 --- a/app/views/users/edit.html.erb~ +++ /dev/null @@ -1,19 +0,0 @@ -<%# - # @file - # /users/:id/edit - # User edit form - #%> - -<% content_for :title, @user.name + "'s Settings | Metamaps" %> -<%= formula_form_for @user, url: user_url do |form| %> -