diff --git a/app/assets/application-bkup.css b/app/assets/application-bkup.css new file mode 100644 index 00000000..ca3caae3 --- /dev/null +++ b/app/assets/application-bkup.css @@ -0,0 +1,1778 @@ +/* + * 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 . + *= require base + *= require jquery.mCustomScrollbar + *= require jquery-ui +*/ + +/* 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 { + height: 100%; +} +.wrapper.homePage { + /*background: url('mm-homepage-bg-image.png') no-repeat center -249px;*/ +} +.wrapper.mapPage { + overflow: hidden; +} +/* scrollbar override */ + +.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: #d8d9da url(shattered_@2X.png); + font-family: 'din-medium', helvetica, sans-serif; + color: #424242; +} + + +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: #424242; + 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; +}*/ + +#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, +.edit_user, +.forgotPassword { + display: block; + width: 250px; + background-color: #E0E0E0; + padding: 20px; + border-radius: 5px; + color: black; + box-shadow: 6px 6px 8px rgba(0, 0, 0, 0.4); +} +.centerGreyForm input[type="text"], +.centerGreyForm input[type="email"], +.centerGreyForm input[type="password"] { + width: 250px; + 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; +} +.centerGreyForm input[type="text"]:hover, +.centerGreyForm input[type="email"]:hover, +.centerGreyForm 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); +} +#closenewtopic, +#closenewsynapse { + position: absolute; + top: 3px; + right: 3px; +} +.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; +} +.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'; +} +.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: 25px; + line-height: 35px; + color: rgba(255, 255, 255, 0.7); + font-family: 'LatoLight'; +} +.openMetacodeSwitcher { + display: block; + height: 20px; + width: 20px; + background-image: url('MMCCicon_metacode_set_change.png'); + background-size: contain; + position: absolute; + z-index: 2; + top: 20px; + left: 30px; +} +#metacodeImg { + height: 120px; +} +#metacodeImgTitle { + float: left; + width: 120px; + text-align: center; + margin-left: 90px; + font-family: 'LatoRegular'; +} +/* synapse autocomplete */ + +.new_topic #topic_name { + color: white; +} +.new_topic .tt-hint { + color: grey; +} +.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; + font-family: 'LatoRegular'; +} +.new_synapse #synapse_desc { + color: rgba(255, 255, 255, 0.7); +} +.new_synapse .tt-hint { + color: rgba(255, 255, 255, 0.4); +} +.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; + 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 --*/ + +.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; +} + +/* account */ + +.sidebarAccount { + width: 32px; + height: 32px; +} +.unauthenticated .sidebarAccount { + width: 84px; + box-shadow: 0px 1px 1.5px rgba(0,0,0,0.12), 0 1px 1px rgba(0,0,0,0.24); + border-radius: 2px; +} +.sidebarAccountIcon { + cursor: pointer; +} +.authenticated .sidebarAccountIcon { + height: 32px; + width: 32px; +} +.unauthenticated .sidebarAccountIcon { + width: 66px; + height: 14px; + padding: 9px; + border-radius: 2px; + background-color: #E0E0E0; + color: #424242; + text-transform: uppercase; + text-align: center; + font-size: 14px; + line-height: 14px; +} +.sidebarAccountIcon img { + border-radius: 17px; +} +.sidebarAccountBox { + display: none; + height: auto; + padding: 10px; + min-width: 120px; +} +.authenticated .sidebarAccountBox { + width: auto; +} +.unauthenticated .sidebarAccountBox { + 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('usersettings.png'); +} +li.accountAdmin { + background-image: url('MMCCicon_admin.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 { + +} +.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 { + width: 32px; + height: 32px; +} +.sidebarForkIcon { + position: absolute; + width: 32px; + height: 32px; + background: url('fork.png') no-repeat center center; + background-size: 32px 32px; + cursor: pointer; +} +.sidebarForkIcon:hover {} + +.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 */ + +/* Filter */ + +.sidebarFilter { + width: 32px; + height: 32px; +} + +.sidebarFilterIcon { + position: absolute; + width: 32px; + height: 32px; + background: url('filter.png') no-repeat center center; + background-size: 32px 32px; + cursor: pointer; +} +.sidebarFilterIcon:hover { + +} + +.sidebarFilterBox { + display:none; + height: 400px; + width: 320px; + padding: 10px; + text-align: center; + overflow-y: auto; +} +h3.filterBox { + text-align: left; + float: left; +} +.sidebarFilterBox span { + float: right; + background: #15bad4; + padding: 1px 4px; + border-radius: 2px; + margin-left: 5px; + cursor: pointer; +} +.sidebarFilterBox ul { + list-style: none; +} +.sidebarFilterBox li { + float: left; + width: 61px; + height: 70px; + cursor: pointer; +} +.sidebarFilterBox li:hover { + background: #000; +} +.sidebarFilterBox li img { + background-color: rgba(255, 255, 255, 0.1); + 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; +} +.sidebarFilterBox h3 { + text-align: left; + text-transform: uppercase; + font-weight: bold; +} +#filter_by_metacode { + border-bottom: 1px solid black; + margin: 5px; +} +#filter_by_mapper { + margin: 5px auto; +} +#filter_by_synapse { + margin: 5px auto; + border-bottom: 1px solid black; +} +/* end filter by metacode */ + +/* collaborate */ + +.sidebarCollaborate { + width: 32px; + height: 32px; +} +.sidebarCollaborateIcon { + position: absolute; + width: 32px; + height: 32px; + background-image: url('junto32.png'); + background-size: 32px 32px; + background-position: center center; + background-repeat: no-repeat; + cursor: pointer; +} +.sidebarCollaborateIcon.blue { + background-image: url('junto32.png'); +} +.sidebarCollaborateBox { + display: none; + height: auto; + width: auto; + padding: 10px; + min-width: 180px; +} +h3.realtimeBoxTitle { + margin-bottom: 10px; + text-align: left; + float: left; + font-family: 'Lato', helvetica, sans-serif; +} +.sidebarCollaborateBox .realtimeOnOff { + float: left; + padding: 4px; + border-radius: 2px; + margin-left: 12px; + cursor: pointer; + width: 31px; + text-align: center; +} +.sidebarCollaborateBox .rtOff { + background: white; + color: black; +} +.sidebarCollaborateBox .rtOff:hover { + padding: 3px; + border: 1px solid #15bad4; +} +.sidebarCollaborateBox .rtOn { + background: #15bad4; + color: white; +} +.realtimeMapperList .rtMapper { + list-style-type: none; + white-space: nowrap; + padding: 2px 5px 2px 30px; + display: block; + background-size: 26px 26px; + background-repeat: no-repeat; + background-position: 4px center; + margin-bottom: 5px; +} +.realtimeMapperList .littleRtOff { + background-image: url('junto24.png'); +} +.realtimeMapperList .littleRtOn { + background-image: url('junto24.png'); +} +/* end collaborate */ + +.nodemargin { + padding-top: 120px; +} +.divider { + margin: 20px 50px 20px 50px; + border-bottom: 2px solid #FFF; +} +.empty { + margin-left: 50px; +} +#menus { + margin: 0 7px; +} +/* 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-metacode { + background-image: url(blank.png); + position: relative; +} +.rc-metacode li img { +float: left; +} +.rightclickmenu .rc-permission ul, .rightclickmenu .rc-metacode 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, .rightclickmenu .rc-metacode: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, +#new_topic .tt-suggestion.tt-is-under-mouse-cursor { + background: #0E161D; +} +#new_topic .tt-suggestion { + padding: 5px; + font-family: 'LatoLight'; + background: rgba(42, 52, 60, 0.9); + ; +} +#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; +} +/* synapse 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, +#new_synapse .tt-suggestion.tt-is-under-mouse-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-color: #424242; + color: #F5F5F5; + border-radius: 2px; + width: 360px; + height: 300px; + padding: 0; + font-style: normal; + text-align: center; + box-shadow: 0 3px 3px rgba(0,0,0,0.23), 0px 3px 3px rgba(0,0,0,0.16); +} +.mapInfoName { + font-size: 18px; + line-height: 20px; + height: 20px; + padding: 26px 0; +} +.mapInfoStat { + background-color: #E0E0E0; + font-size: 18px; + line-height: 20px; + height: 48px; + padding: 0; + color: #424242; +} +.wrapper div.mapInfoName span, +.wrapper div.mapInfoDesc span { + float: none !important; + padding-bottom: 10px; +} +.infoStatIcon { + float: left; + width: 25px; + padding: 14px 0px 14px 45px; + height: 20px; + background-repeat: no-repeat; + text-align: left; +} +.mapContributors { + background-image: url(MMCCicon_mapper.png); + background-position: 13px center; + 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; + 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(topic32.png); + background-position: 13px center; +} +.mapSynapses { + background-image: url(synapse32tmcard.png); + background-position: 13px center; +} +.mapInfoBox .mapPermission { + background-position: 0 center; + width: 32px; + height: 32px; + padding: 0; + margin: 8px 30px 8px 10px; + position: relative; +} +.mapInfoBox .mapPermission.commons { + background-image: url(CO32.png); +} +.mapInfoBox .mapPermission.public { + background-image: url(PU32.png); +} +.mapInfoBox .mapPermission.private { + background-image: url(PR32.png); +} +.yourMap .mapPermission:hover { + background-image: url(arrowexpand.png); + cursor: pointer; +} +.yourMap .mapPermission.minimize { + background-image: url(arrowcollapse.png) !important; + cursor: pointer; +} +.mapInfoBox .mapPermission .permissionSelect { + list-style: none; + width: 32px; + height: 64px; + position: relative; + top: 32px; +} +.mapInfoBox .mapPermission .permissionSelect li { + width: 32px; + height: 32px; + background-repeat: no-repeat; + background-position: center center; +} +.mapInfoBox .mapPermission .permissionSelect .commons { + background-image: url(CO32.png); +} +.mapInfoBox .mapPermission .permissionSelect .public { + background-image: url(PU32.png); +} +.mapInfoBox .mapPermission .permissionSelect .private { + background-image: url(PR32.png); +} +.mapInfoBox .mapPermission .permissionSelect .commons:hover { + background-image: url(CO32b.png); +} +.mapInfoBox .mapPermission .permissionSelect .public:hover { + background-image: url(PU32b.png); +} +.mapInfoBox .mapPermission .permissionSelect .private:hover { + background-image: url(PR32b).png); +} +.mapInfoBox .mapInfoDesc { + font-family: helvetica, sans-serif; + color: #E0E0E0; + margin: 8px; + height: 106px; + font-size: 14px; + line-height: 16px; +} +.mapInfoBox .mapInfoMeta { + height: 35px; + border-top: 1px solid #F5F5F5; + padding: 6px 0 7px; +} +.mapInfoBox .mapInfoMeta p { + margin: 4px 0; + font-size: 12px; + color: #F5F5F5; +} +/* 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.0; + filter: alpha(opacity=0); + -moz-opacity: 0.0; +} +#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; +} +/* jquery ui tabs */ + +.ui-tabs-hide { + display: none !important; +} +.ui-tabs-vertical { + width: 55em; +} +.ui-tabs-vertical .ui-tabs-nav { + float: left; + width: 100px; + background: none; + border: none; + font-size: 15px; + padding: 0 !important; +} +.ui-tabs-vertical .ui-tabs-nav li { + clear: left; + width: 100%; + border-top: none !important; + border-left: none !important; + border-bottom: none !important; + background: none !important; + margin: 0 0 .2em 0 !important; + white-space: normal !important; +} +.ui-tabs-vertical .ui-tabs-nav li.ui-state-active, +.ui-tabs-vertical .ui-tabs-nav li.ui-state-hover { + border-right: 1px solid #000; +} +.ui-tabs-vertical .ui-tabs-nav li a { + display: block; + width: 92%; + padding: 4% !important; +} +.ui-tabs-vertical .ui-tabs-panel { + padding: 5px !important; + float: right; + width: 388px; +} +/* switch metacode set */ + +#metacodeSwitchTabs { + width: 100%; + font-family: LatoLight, Arial, Sans-Serif; + font-size: 17px; + line-height: 21px; + border: none; +} +#metacodeSwitchTabs .setTitle { + font-family: Lato, Arial, sans-serif; +} +#metacodeSwitchTabs .setDesc { + margin-bottom: 5px; +} +.customMetacodeList, +.metacodeSetList { + height: 301px; + overflow: hidden; + margin: 5px 0 15px 0; + border-bottom: 1px solid #BBB; +} +.customMetacodeList ul li { + cursor: pointer; +} +.customMetacodeList ul li, +.metacodeSetList ul li { + list-style-type: none; + display: block; + padding: 0px; + width: 92px; + height: 70px; + float: left; + text-align: center; +} +.customMetacodeList li.toggledOff { + opacity: 0.4; +} +.customMetacodeList ul img, +.metacodeSetList ul img { + width: 40px; + height: 40px; + margin: 0 auto; +} +.customMetacodeList ul p, +.metacodeSetList ul p { + display: block; + margin: 0; + background: none; + font-size: 14px; + line-height: 14px; + font-family: Lato; +} +#metacodeSwitchTabs button.button { + width: auto !important; + padding: 0 10px; + font-weight: normal; +} +/* about */ + +#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.cancel { + 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 */ + +#cheatSheet { + width: 100%; + height: 350px; + font-family: LatoLight, Arial, Sans-Serif; + font-size: 17px; + line-height: 21px; + border: none; +} +#cheatSheet .sectionTitle { + font-family: Lato, Arial, sans-serif; + font-weight: bold; +} +#cheatSheet .csItem { + margin: 5px 0; + font-size: 15px; + line-height: 18px; +} +#cheatSheet .csItem img { + display: inline-block; + margin: 0 2px; +} +#cheatSheet .csTitle { + font-family: Lato, Arial, sans-serif; +} +#cheatSheet .indented { + margin-left: 15px; +} +/* Admin Pages */ + +#wrapper > div.blackBox { + 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; +} +.blackBox .metacodeSetsDescription { + width: 314px; +} +.blackBox td.metacodeSetDesc { + width: 314px; + word-wrap: break-word; +} +.blackBox .metacodeSetImage { + width: 36px; + height: 36px; + float: left; +} +.blackBox tr { + display: table-row; +} +.blackBox tr:nth-child(odd) { + background: rgba(0, 0, 0, 0.2); +} +.blackBox tr:nth-child(even) { + background: rgba(0, 0, 0, 0.3); +} +.blackBox th, +.blackBox td { + padding: 10px; +} +.blackBox td.iconURL { + max-width: 415px; + word-wrap: break-word; +} +.blackBox .field { + margin: 15px 0 5px; +} +.blackBox label { + float: left; + width: 100px; + margin-right: 15px; +} +.blackBox 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; +} +.blackBox input[type="text"]:hover, +.blackBox 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); +} +.blackBox 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; +} +.blackBox .allMetacodes { + padding: 5px 0; +} +.blackBox a.button { + margin-right: 20px; + line-height: 40px; +} +.blackBox a.button, +.blackBox 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; +} +.blackBox a.button:hover, +.blackBox input.add:hover { + -webkit-box-shadow: none; + box-shadow: none; +} +/* 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; +} +.addMap { + display: block; + width: 32px; + height: 32px; + background: url('newmap.png') no-repeat center center; + background-size: 32px 32px; + cursor: pointer; + border-radius: 2px; + margin-right: 10px; +} + + +.home_bg { + display: block; + height: 100%; +} + + +#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/assets/base-bkup.css b/app/assets/base-bkup.css new file mode 100644 index 00000000..871a861e --- /dev/null +++ b/app/assets/base-bkup.css @@ -0,0 +1,639 @@ +#center-container { + position:relative; + height:100%; + width:100%; + /* background-color:#031924; */ + color:#444; +} + +.showcard { + position:absolute; + display:none; + top:100px; + left:100px; + width:300px; + min-height:360px; + background-color:#F5F5F5; + text-align: left; + overflow: visible; + z-index:14000; + color: #424242; + border-radius:2px; + box-shadow: 0px 3px 3px rgba(0,0,0,0.23), 0 3px 3px rgba(0,0,0,0.16); +} + +.text { + margin: 7px; +} + +#infovis { + width:100%; + height:100%; +} + +.showcard .permission { + width:100%; + height:100%; +} + +.CardOnGraph { + display:block; + position:relative; + width:100%; + height:100%; + z-index: 25; +} + +.CardOnGraph .title { + font-size: 18px; + line-height: 22px; + display: block; + padding: 8px 16px; + height: 80px; + text-align: center; + font-family: 'din-regular', sans-serif; +} + +.best_in_place_name { + +} + +.best_in_place_name textarea, .best_in_place_name input { + font-family: 'din-regular', sans-serif; + color: #424242; + font-size: 18px; + line-height: 22px; +height: 15px; +padding: 5px 0; +width: 100%; +margin: 0; +border: 0; +outline: none; +background: none; +text-align:center; +} + +.CardOnGraph .scroll { + display:block; + padding: 8px 16px; + height: 152px; + font-size: 12px; + line-height:15px; + font-family: helvetica, sans-serif; +} + +.CardOnGraph .best_in_place_desc textarea { + font-size: 12px; + line-height:15px; + font-family: helvetica, sans-serif; + color: #424242; +padding: 0; +width: 100%; +margin: 0; +border: 0; +outline: none; +font-size: 12px; +line-height: 15px; +background: none; +} + +.CardOnGraph .desc h3 { + font-style:normal; + margin-top:5px; +} + +.CardOnGraph .best_in_place_desc input { + float: right; + margin: 2px 0px 0px 2px; + padding: 1px 5px; +} + +.CardOnGraph .best_in_place_desc { + display:block; + margin-top:2px; +} + +#edit_synapse .best_in_place_desc { + width: auto; +} + +.CardOnGraph .links { + position:relative; + border-bottom: 1px solid #BDBDBD; + border-top: 1px solid #BDBDBD; +} + +.linkItem { + float:left; + min-width:46px; + height:46px; + background-repeat: no-repeat; + background-position: 0 center; + background-size: 24px 24px; + z-index: 1; + position: relative; + color: #424242; + font-size: 12px; + line-height:12px; + height:12px; + padding:17px 0; +} +.linkItem a { + color: #424242; +} + +.CardOnGraph .icon { + position:absolute; + width:100%; + z-index:1; + padding: 0; +} +.linkItem.contributor { + background-image: url(MMCCicon_mapper_black.png); + margin-left:32px; + z-index:1; + padding:17px 0 17px 28px; +} +.linkItem.mapCount { + background-image: url(MMCCicon_map_black.png); + min-width: 16px; + padding:17px 0 17px 28px; +} +.linkItem.synapseCount { + background-image: url(MMCCicon_synapse_black.png); + min-width: 16px; + padding:17px 0 17px 28px; +} +.linkItem.mapPerm { + +} +.linkItem.mapPerm.co { + background-image: url(MMCCicon_commons.png); +} +.linkItem.mapPerm.pu { + background-image: url(MMCCicon_public.png); +} +.linkItem.mapPerm.pr { + background-image: url(MMCCicon_private.png); +} + +.showcard .yourTopic .mapPerm:hover { + background-image: url(/assets/MMCCicon_maximize_arrow_black.png); + background-size: 31px 25px; + background-position-x: 8px; + cursor:pointer; +} +.showcard .yourTopic .mapPerm.minimize { + background-image: url(MMCCicon_minimize_arrow_black.png) !important; + background-size: 31px 25px; +background-position-x: 8px; +cursor: pointer; +} +.mapPerm .permissionSelect { + list-style: none; + width: 40px; + height: 80px; + position: relative; + top: 40px; +} +.mapPerm .permissionSelect li { + width: 40px; + height: 40px; + background-repeat: no-repeat; + background-position: center center; + background-size: 27px 27px; + background-color: #F5F5F5; +} +.mapPerm .permissionSelect .commons { + background-image: url(MMCCicon_commons.png); +} +.mapPerm .permissionSelect .public { + background-image: url(MMCCicon_public.png); +} +.mapPerm .permissionSelect .private { + background-image: url(MMCCicon_private.png); +} +.mapPerm .permissionSelect .commons:hover { + background-image: url(MMCCicon_commons_black.png); +} +.mapPerm .permissionSelect .public:hover { + background-image: url(MMCCicon_public_black.png); +} +.mapPerm .permissionSelect .private:hover { + background-image: url(MMCCicon_private_black.png); +} + +.CardOnGraph .metacodeTitle { + font-style: italic; + font-family: 'vinyl'; + text-transform: uppercase; + position: absolute; + line-height: 24px; + height:24px; + font-size: 20px; + display: none; + width: 90%; + padding: 11px 0 11px 10%; + background-color: #64BC61; + color: #000; +} +.permission.canEdit .metacodeTitle { + cursor:pointer; + background-image: url(MMCCicon_maximize_arrow_black.png); + background-repeat:no-repeat; + background-position: right center; +} +.permission.canEdit .metacodeTitle.minimize { + background-image: url(MMCCicon_minimize_arrow_black.png); +} + +.CardOnGraph .metacodeImage { + cursor:move; + width:46px; + height:46px; + position:absolute; + left:-23px; + top:0; + background-size:46px 46px; + background-position:0 0; + background-repeat:no-repeat; +} + +#metacodeOptions { + display:none; +} +.CardOnGraph .metacodeSelect { + display:none; + width:100%; + z-index: 2; + position: absolute; + background: #EAEAEA; + height: 150px; +} +.CardOnGraph .metacodeSelect ul { +font-style: italic; +font-family: 'vinyl'; +text-transform: uppercase; +position: absolute; +line-height: 36px; +font-size: 20px; +display:block; +width: 100%; +margin:0; +padding: 0; +list-style:none; +height:150px; +overflow:hidden; +} +.CardOnGraph .metacodeSelect ul li { +background-color: #EAEAEA; +width:100%; +border-bottom:1px solid #AAAAAA; +cursor:pointer; +} +.CardOnGraph .metacodeSelect ul li:hover { +background-color: #F8F8F8; +} +.CardOnGraph .metacodeSelect ul li img, .CardOnGraph .metacodeSelect ul li .mSelectName { +float:left; +} + +.CardOnGraph .hoverForTip:hover .tip, .mapCard .hoverForTip:hover .tip { + display:block; +} +.CardOnGraph .tip, .mapCard .tip { + display:none; + position: absolute; + background: black; + top: 35px; + left: 0; + color: white; + border-radius: 4px; + font-size:15px !important; + font-family:'LatoRegular'; + line-height:17px; + padding: 3px 5px 2px; + z-index:100; +} + + +.CardOnGraph .attachments { + border-top: 1px solid #BDBDBD; + width:100%; + height:47px; +} + +.attachments a { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + display: block; + margin-left: 40px; + padding-top:9px; + font-size: 16px; + line-height: 16px; +} + +.addAttachment div { + display: inline-block; + width: 150px; + height: 23px; + text-align: center; + padding-top: 25px; + font-size: 12px; + color: #9e9e9e; + cursor: pointer; +} + +.addAttachment div:hover { + color: #616161; +} + +.addLink div { + float: left; +} + +#addLinkBack { + height: 48px; + width: 48px; + cursor: pointer; +} +#addLinkInput { + height: 32px; + width: 236px; + padding: 8px 16px 8px 0; + position: relative; +} + +#addLinkInput input{ +padding: 7px 31px 7px 31px; +height: 16px; +width: 172px; +margin: 0 0 0 0; +border: 1px solid #BDBDBD; +outline: none; +font-size: 16px; +line-height: 16px; +background: white; +color: black; +font-family: 'LatoLight'; +} + +#addLinkReset { + position: absolute; + top: 8px; + right: 16px; + width: 32px; + height: 32px; + cursor: pointer; + float:none; +} + +.cardSettings { + position: absolute; + left: 12px; + top: 12px; +} + +.editSettings { + background: #ddd; + border-radius: 10px; + padding: 5px 0 5px 5px; + position: relative; + left: 16px; + width: 175px; + opacity: 0.98; + box-shadow: 4px 4px 5px #888888; + border: 1px solid #AAA; + z-index: 5; +} + +.editSettings span { + display: inline-block; +} + +.permActivator { + width: 16px; + height: 16px; + background: url('settings.png') no-repeat 0 0; + overflow:hidden; + position: absolute; + left: 0px; + top: 30px; +} + +#edit_synapse .mapPerm, +#edit_synapse .permActivator { + position: static; + display: inline-block; + color: #000; +} + +#edit_synapse .mapPerm { + width: 20px; + height:20px; + background-repeat: no-repeat; + background-size: 20px 20px; + margin: 10px 12px 0 12px; +} +#edit_synapse .mapPerm.co { + background-image: url("/assets/MMCCicon_commons.png"); +} +#edit_synapse .mapPerm.pu { + background-image: url("/assets/MMCCicon_public.png"); +} +#edit_synapse .mapPerm.pr { + background-image: url("/assets/MMCCicon_private.png"); +} + +#edit_synapse .permActivator { + position: absolute; + margin-top: -1.3em; +} + +#edit_synapse { + background: url("/assets/MMCCicon_synapse_black.png") no-repeat scroll 0 center / 30px 30px #FFFFFF; + border-radius: 5px; + padding: 5px 5px 5px 30px; + color: #000; +} + +#edit_synapse_name { + margin-left: 0.4em; + border-bottom: 1px solid black; + text-align:center; + max-width: 160px; +} + +#edgeUser { + display:inline-block; + background-position: center center; + background-repeat: no-repeat; + background-size: 20px 20px; + height: 20px; + min-width: 20px; + position: relative; + background-image: url("MMCCicon_mapper_black.png"); + margin: 10px 0 0 10px; +} +#edgeUser.hoverForTip:hover .tip { + display:block; +} +#edgeUser .tip { + background: none repeat scroll 0 0 #000000; + border-radius: 4px; + color: #FFFFFF; + display: none; + font-family: 'LatoRegular'; + font-size: 15px !important; + line-height: 17px; + padding: 3px 5px 2px; + position: absolute; + left: 0; + text-align: center; + top: 23px; + z-index: 100; +} + +#edit_synapse .click-to-edit { + margin-left: 0.3em; +} + +#edit_synapse.yourEdge .mapPerm:hover { + background-image: url(/assets/MMCCicon_maximize_arrow_black.png); + background-size: 24px 17px; + background-position: 0px 2px; + cursor:pointer; +} +#edit_synapse.yourEdge .mapPerm.minimize { + background-image: url(MMCCicon_minimize_arrow_black.png) !important; + background-size: 24px 17px; + background-position: 0px 2px; + cursor: pointer; +} +#edit_synapse .mapPerm .permissionSelect { + list-style: none; + width: 26px; + height: 52px; + position: relative; + top: 20px; + left:-3px; +} +#edit_synapse .mapPerm .permissionSelect li { + width: 26px; + height: 26px; + background-repeat: no-repeat; + background-position: center center; + background-size: 20px 20px; + background-color:white; +} + + +/* Map Cards */ + +.map { + float:left; + width:220px; + height:340px; + font-size: 12px; + text-align: left; + overflow: visible; + background: #424242; + border-radius:2px; + margin:0 12px 12px 0; +} + +.mapCard { + display: -webkit-box; /* OLD - iOS 6-, Safari 3.1-6 */ + display: -moz-box; /* OLD - Firefox 19- (buggy but mostly works) */ + display: -ms-flexbox; /* TWEENER - IE 10 */ + display: -webkit-flex; /* NEW - Chrome */ + display: flex; /* NEW, Spec - Opera 12.1, Firefox 20+ */ + -webkit-box-orient: vertical; + -moz-box-orient: vertical; + -webkit-box-direction: normal; + -moz-box-direction: normal; + -ms-flex-direction: column; + -webkit-flex-direction: column; + flex-direction: column; + position:relative; + width:100%; + height:308px; + padding: 16px 0; + color:#F5F5F5; +} + +.mapCard .title { + font-size:18px; + line-height:22px; + display:block; + padding: 0 16px; + text-align: center; + -webkit-box-flex: none; /* OLD - iOS 6-, Safari 3.1-6 */ + -moz-box-flex: none; /* OLD - Firefox 19- */ + -webkit-flex: none; /* Chrome */ + -ms-flex: none; /* IE 10 */ + flex: none; /* NEW, Spec - Opera 12.1, Firefox 20+ */ + font-family: 'din-regular', sans-serif; +} + +.mapCard .mapScreenshot { + width: 188px; + height: 126px; + padding: 8px 16px; +} +.mapCard .mapScreenshot img { + width: 188px; + height: 126px; +} + +.mapCard .scroll { + display:block; + -webkit-box-flex: 1; /* OLD - iOS 6-, Safari 3.1-6 */ + -moz-box-flex: 1; /* OLD - Firefox 19- */ + -webkit-flex: 1; /* Chrome */ + -ms-flex: 1; /* IE 10 */ + flex: 1; /* NEW, Spec - Opera 12.1, Firefox 20+ */ + overflow-y:auto; + padding:0 16px 8px; + font-family: helvetica, sans-serif; + font-style: italic; + font-size: 12px; +} +.mCS_no_scrollbar { + padding-right: 5px; +} + +.mapCard .mapMetadata { + font-family: 'din-regular', sans-serif; + font-size: 12px; + position:relative; + border-top: 1px solid #BDBDBD; + -webkit-box-flex: none; /* OLD - iOS 6-, Safari 3.1-6 */ + -moz-box-flex: none; /* OLD - Firefox 19- */ + -webkit-flex: none; /* Chrome */ + -ms-flex: none; /* IE 10 */ + flex: none; /* NEW, Spec - Opera 12.1, Firefox 20+ */ +} + +.mapCard .metadataSection { + padding: 8px 16px 0 16px; + width: 78px; + float: left; +} + +.mapPermission { + font-family: 'din-medium', sans-serif; +} +.cCountColor { + font-family: 'din-medium', sans-serif; + color: #DB5D5D; +} +.tCountColor { + font-family: 'din-medium', sans-serif; + color: #4FC059; +} +.sCountColor { + font-family: 'din-medium', sans-serif; + color: #DAB539; +} \ No newline at end of file diff --git a/app/assets/images/CO32.png b/app/assets/images/CO32.png deleted file mode 100755 index be5e7ffe..00000000 Binary files a/app/assets/images/CO32.png and /dev/null differ diff --git a/app/assets/images/CO32b.png b/app/assets/images/CO32b.png deleted file mode 100755 index 63394b5b..00000000 Binary files a/app/assets/images/CO32b.png and /dev/null differ diff --git a/app/assets/images/CO36.png b/app/assets/images/CO36.png deleted file mode 100755 index 693f4d67..00000000 Binary files a/app/assets/images/CO36.png and /dev/null differ diff --git a/app/assets/images/CO36b.png b/app/assets/images/CO36b.png deleted file mode 100755 index 3d61f596..00000000 Binary files a/app/assets/images/CO36b.png and /dev/null differ diff --git a/app/assets/images/CO64.png b/app/assets/images/CO64.png deleted file mode 100755 index 33c34de5..00000000 Binary files a/app/assets/images/CO64.png and /dev/null differ diff --git a/app/assets/images/CO64b.png b/app/assets/images/CO64b.png deleted file mode 100755 index bbb712c1..00000000 Binary files a/app/assets/images/CO64b.png and /dev/null differ diff --git a/app/assets/images/PR32.png b/app/assets/images/PR32.png deleted file mode 100755 index b2b5d696..00000000 Binary files a/app/assets/images/PR32.png and /dev/null differ diff --git a/app/assets/images/PR32b.png b/app/assets/images/PR32b.png deleted file mode 100755 index c839999a..00000000 Binary files a/app/assets/images/PR32b.png and /dev/null differ diff --git a/app/assets/images/PR36.png b/app/assets/images/PR36.png deleted file mode 100755 index d9e02367..00000000 Binary files a/app/assets/images/PR36.png and /dev/null differ diff --git a/app/assets/images/PR36b.png b/app/assets/images/PR36b.png deleted file mode 100755 index 60f4a0d1..00000000 Binary files a/app/assets/images/PR36b.png and /dev/null differ diff --git a/app/assets/images/PR64.png b/app/assets/images/PR64.png deleted file mode 100755 index a9680255..00000000 Binary files a/app/assets/images/PR64.png and /dev/null differ diff --git a/app/assets/images/PR64b.png b/app/assets/images/PR64b.png deleted file mode 100755 index b5fd6b94..00000000 Binary files a/app/assets/images/PR64b.png and /dev/null differ diff --git a/app/assets/images/PU32.png b/app/assets/images/PU32.png deleted file mode 100755 index 963fd339..00000000 Binary files a/app/assets/images/PU32.png and /dev/null differ diff --git a/app/assets/images/PU32b.png b/app/assets/images/PU32b.png deleted file mode 100755 index 5f2520e9..00000000 Binary files a/app/assets/images/PU32b.png and /dev/null differ diff --git a/app/assets/images/PU36.png b/app/assets/images/PU36.png deleted file mode 100755 index 243d2fd1..00000000 Binary files a/app/assets/images/PU36.png and /dev/null differ diff --git a/app/assets/images/PU36b.png b/app/assets/images/PU36b.png deleted file mode 100755 index 153603b6..00000000 Binary files a/app/assets/images/PU36b.png and /dev/null differ diff --git a/app/assets/images/PU64.png b/app/assets/images/PU64.png deleted file mode 100755 index 0dcf03af..00000000 Binary files a/app/assets/images/PU64.png and /dev/null differ diff --git a/app/assets/images/PU64b.png b/app/assets/images/PU64b.png deleted file mode 100755 index 59275b14..00000000 Binary files a/app/assets/images/PU64b.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._CO32.png b/app/assets/images/__MACOSX/._CO32.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._CO32.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._CO32b.png b/app/assets/images/__MACOSX/._CO32b.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._CO32b.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._CO36.png b/app/assets/images/__MACOSX/._CO36.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._CO36.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._CO36b.png b/app/assets/images/__MACOSX/._CO36b.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._CO36b.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._CO64.png b/app/assets/images/__MACOSX/._CO64.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._CO64.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._CO64b.png b/app/assets/images/__MACOSX/._CO64b.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._CO64b.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._PR32.png b/app/assets/images/__MACOSX/._PR32.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._PR32.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._PR32b.png b/app/assets/images/__MACOSX/._PR32b.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._PR32b.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._PR36.png b/app/assets/images/__MACOSX/._PR36.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._PR36.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._PR36b.png b/app/assets/images/__MACOSX/._PR36b.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._PR36b.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._PR64.png b/app/assets/images/__MACOSX/._PR64.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._PR64.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._PR64b.png b/app/assets/images/__MACOSX/._PR64b.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._PR64b.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._PU32.png b/app/assets/images/__MACOSX/._PU32.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._PU32.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._PU32b.png b/app/assets/images/__MACOSX/._PU32b.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._PU32b.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._PU36.png b/app/assets/images/__MACOSX/._PU36.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._PU36.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._PU36b.png b/app/assets/images/__MACOSX/._PU36b.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._PU36b.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._PU64.png b/app/assets/images/__MACOSX/._PU64.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._PU64.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._PU64b.png b/app/assets/images/__MACOSX/._PU64b.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._PU64b.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._activity.png b/app/assets/images/__MACOSX/._activity.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._activity.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._addtomap.png b/app/assets/images/__MACOSX/._addtomap.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._addtomap.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._arrowcollapse.png b/app/assets/images/__MACOSX/._arrowcollapse.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._arrowcollapse.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._arrowdown.png b/app/assets/images/__MACOSX/._arrowdown.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._arrowdown.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._arrowexpand.png b/app/assets/images/__MACOSX/._arrowexpand.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._arrowexpand.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._arrowright.png b/app/assets/images/__MACOSX/._arrowright.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._arrowright.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._center.png b/app/assets/images/__MACOSX/._center.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._center.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._contextdelete.png b/app/assets/images/__MACOSX/._contextdelete.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._contextdelete.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._contextgear.png b/app/assets/images/__MACOSX/._contextgear.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._contextgear.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._contexthide.png b/app/assets/images/__MACOSX/._contexthide.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._contexthide.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._contextpermissions.png b/app/assets/images/__MACOSX/._contextpermissions.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._contextpermissions.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._contextpopout.png b/app/assets/images/__MACOSX/._contextpopout.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._contextpopout.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._contextremove.png b/app/assets/images/__MACOSX/._contextremove.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._contextremove.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._edit.png b/app/assets/images/__MACOSX/._edit.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._edit.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._featured.png b/app/assets/images/__MACOSX/._featured.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._featured.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._feedback.png b/app/assets/images/__MACOSX/._feedback.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._feedback.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._filter.png b/app/assets/images/__MACOSX/._filter.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._filter.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._fork.png b/app/assets/images/__MACOSX/._fork.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._fork.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._help.png b/app/assets/images/__MACOSX/._help.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._help.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._home.png b/app/assets/images/__MACOSX/._home.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._home.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._junto24.png b/app/assets/images/__MACOSX/._junto24.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._junto24.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._junto32.png b/app/assets/images/__MACOSX/._junto32.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._junto32.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._lbToS.png b/app/assets/images/__MACOSX/._lbToS.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._lbToS.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._lbgithub.png b/app/assets/images/__MACOSX/._lbgithub.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._lbgithub.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._lbgoogle.png b/app/assets/images/__MACOSX/._lbgoogle.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._lbgoogle.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._lbtwitter.png b/app/assets/images/__MACOSX/._lbtwitter.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._lbtwitter.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._lbwordpress.png b/app/assets/images/__MACOSX/._lbwordpress.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._lbwordpress.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._link.png b/app/assets/images/__MACOSX/._link.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._link.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._linkedmedia.png b/app/assets/images/__MACOSX/._linkedmedia.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._linkedmedia.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._mapinfo.png b/app/assets/images/__MACOSX/._mapinfo.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._mapinfo.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._metamap.png b/app/assets/images/__MACOSX/._metamap.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._metamap.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._metamap16.png b/app/assets/images/__MACOSX/._metamap16.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._metamap16.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._metamap32.png b/app/assets/images/__MACOSX/._metamap32.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._metamap32.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._metamap32c.png b/app/assets/images/__MACOSX/._metamap32c.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._metamap32c.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._metamap36c.png b/app/assets/images/__MACOSX/._metamap36c.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._metamap36c.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._newmap.png b/app/assets/images/__MACOSX/._newmap.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._newmap.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._photo.png b/app/assets/images/__MACOSX/._photo.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._photo.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._remove.png b/app/assets/images/__MACOSX/._remove.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._remove.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._search.png b/app/assets/images/__MACOSX/._search.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._search.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._settings32.png b/app/assets/images/__MACOSX/._settings32.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._settings32.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._share.png b/app/assets/images/__MACOSX/._share.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._share.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._synapse16.png b/app/assets/images/__MACOSX/._synapse16.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._synapse16.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._synapse32scard.png b/app/assets/images/__MACOSX/._synapse32scard.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._synapse32scard.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._synapse32tmcard.png b/app/assets/images/__MACOSX/._synapse32tmcard.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._synapse32tmcard.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._synapsedirection.png b/app/assets/images/__MACOSX/._synapsedirection.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._synapsedirection.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._synapsedirectionright.png b/app/assets/images/__MACOSX/._synapsedirectionright.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._synapsedirectionright.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._synapsestar.png b/app/assets/images/__MACOSX/._synapsestar.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._synapsestar.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._topic16.png b/app/assets/images/__MACOSX/._topic16.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._topic16.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._topic32.png b/app/assets/images/__MACOSX/._topic32.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._topic32.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._upload.png b/app/assets/images/__MACOSX/._upload.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._upload.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._user.png b/app/assets/images/__MACOSX/._user.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._user.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._useradmin.png b/app/assets/images/__MACOSX/._useradmin.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._useradmin.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._userlogout.png b/app/assets/images/__MACOSX/._userlogout.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._userlogout.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._usersettings.png b/app/assets/images/__MACOSX/._usersettings.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._usersettings.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._usershareinvite.png b/app/assets/images/__MACOSX/._usershareinvite.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._usershareinvite.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._xlightbox.png b/app/assets/images/__MACOSX/._xlightbox.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._xlightbox.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._zoomin.png b/app/assets/images/__MACOSX/._zoomin.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._zoomin.png and /dev/null differ diff --git a/app/assets/images/__MACOSX/._zoomout.png b/app/assets/images/__MACOSX/._zoomout.png deleted file mode 100755 index 179046b5..00000000 Binary files a/app/assets/images/__MACOSX/._zoomout.png and /dev/null differ diff --git a/app/assets/images/about_sprite.png b/app/assets/images/about_sprite.png new file mode 100755 index 00000000..58eafff7 Binary files /dev/null and b/app/assets/images/about_sprite.png differ diff --git a/app/assets/images/activity.png b/app/assets/images/activity.png deleted file mode 100755 index 7202cf70..00000000 Binary files a/app/assets/images/activity.png and /dev/null differ diff --git a/app/assets/images/addtomap.png b/app/assets/images/addtomap.png deleted file mode 100755 index 36193642..00000000 Binary files a/app/assets/images/addtomap.png and /dev/null differ diff --git a/app/assets/images/addtopic_sprite.png b/app/assets/images/addtopic_sprite.png new file mode 100755 index 00000000..14213bf5 Binary files /dev/null and b/app/assets/images/addtopic_sprite.png differ diff --git a/app/assets/images/arrow_sprite.png b/app/assets/images/arrow_sprite.png new file mode 100755 index 00000000..d033c784 Binary files /dev/null and b/app/assets/images/arrow_sprite.png differ diff --git a/app/assets/images/arrowcollapse.png b/app/assets/images/arrowcollapse.png deleted file mode 100755 index 969c3b1d..00000000 Binary files a/app/assets/images/arrowcollapse.png and /dev/null differ diff --git a/app/assets/images/arrowdown.png b/app/assets/images/arrowdown.png deleted file mode 100755 index 55f218c6..00000000 Binary files a/app/assets/images/arrowdown.png and /dev/null differ diff --git a/app/assets/images/arrowdown_sprite.png b/app/assets/images/arrowdown_sprite.png new file mode 100755 index 00000000..ec3a4550 Binary files /dev/null and b/app/assets/images/arrowdown_sprite.png differ diff --git a/app/assets/images/arrowexpand.png b/app/assets/images/arrowexpand.png deleted file mode 100755 index d51b6b96..00000000 Binary files a/app/assets/images/arrowexpand.png and /dev/null differ diff --git a/app/assets/images/arrowright.png b/app/assets/images/arrowright.png deleted file mode 100755 index f59fd68f..00000000 Binary files a/app/assets/images/arrowright.png and /dev/null differ diff --git a/app/assets/images/arrowright_sprite.png b/app/assets/images/arrowright_sprite.png new file mode 100755 index 00000000..f0242bfb Binary files /dev/null and b/app/assets/images/arrowright_sprite.png differ diff --git a/app/assets/images/context_sprite.png b/app/assets/images/context_sprite.png new file mode 100755 index 00000000..df724cb9 Binary files /dev/null and b/app/assets/images/context_sprite.png differ diff --git a/app/assets/images/contextdelete.png b/app/assets/images/contextdelete.png deleted file mode 100755 index faa61758..00000000 Binary files a/app/assets/images/contextdelete.png and /dev/null differ diff --git a/app/assets/images/contextgear.png b/app/assets/images/contextgear.png deleted file mode 100755 index 28fdeb14..00000000 Binary files a/app/assets/images/contextgear.png and /dev/null differ diff --git a/app/assets/images/contexthide.png b/app/assets/images/contexthide.png deleted file mode 100755 index 0709401c..00000000 Binary files a/app/assets/images/contexthide.png and /dev/null differ diff --git a/app/assets/images/contextpermissions.png b/app/assets/images/contextpermissions.png deleted file mode 100755 index c4d10531..00000000 Binary files a/app/assets/images/contextpermissions.png and /dev/null differ diff --git a/app/assets/images/contextpopout.png b/app/assets/images/contextpopout.png deleted file mode 100755 index f67289cb..00000000 Binary files a/app/assets/images/contextpopout.png and /dev/null differ diff --git a/app/assets/images/contextremove.png b/app/assets/images/contextremove.png deleted file mode 100755 index 96c0bc7f..00000000 Binary files a/app/assets/images/contextremove.png and /dev/null differ diff --git a/app/assets/images/edit.png b/app/assets/images/edit.png index d6e91233..ead97a43 100755 Binary files a/app/assets/images/edit.png and b/app/assets/images/edit.png differ diff --git a/app/assets/images/exploremaps_sprite.png b/app/assets/images/exploremaps_sprite.png new file mode 100755 index 00000000..16535918 Binary files /dev/null and b/app/assets/images/exploremaps_sprite.png differ diff --git a/app/assets/images/extents_sprite.png b/app/assets/images/extents_sprite.png new file mode 100755 index 00000000..583d2c7c Binary files /dev/null and b/app/assets/images/extents_sprite.png differ diff --git a/app/assets/images/featured.png b/app/assets/images/featured.png deleted file mode 100755 index eecc93e1..00000000 Binary files a/app/assets/images/featured.png and /dev/null differ diff --git a/app/assets/images/feedback.png b/app/assets/images/feedback.png deleted file mode 100755 index 8df58729..00000000 Binary files a/app/assets/images/feedback.png and /dev/null differ diff --git a/app/assets/images/feedback_sprite.png b/app/assets/images/feedback_sprite.png new file mode 100755 index 00000000..fc7998d3 Binary files /dev/null and b/app/assets/images/feedback_sprite.png differ diff --git a/app/assets/images/filter.png b/app/assets/images/filter.png deleted file mode 100755 index 9f53e56e..00000000 Binary files a/app/assets/images/filter.png and /dev/null differ diff --git a/app/assets/images/fork.png b/app/assets/images/fork.png deleted file mode 100755 index 8db7e011..00000000 Binary files a/app/assets/images/fork.png and /dev/null differ diff --git a/app/assets/images/help.png b/app/assets/images/help.png deleted file mode 100755 index 43992f4c..00000000 Binary files a/app/assets/images/help.png and /dev/null differ diff --git a/app/assets/images/help_sprite.png b/app/assets/images/help_sprite.png new file mode 100755 index 00000000..da171b68 Binary files /dev/null and b/app/assets/images/help_sprite.png differ diff --git a/app/assets/images/home.png b/app/assets/images/home.png deleted file mode 100755 index 01577b91..00000000 Binary files a/app/assets/images/home.png and /dev/null differ diff --git a/app/assets/images/home_dark.png b/app/assets/images/home_dark.png new file mode 100755 index 00000000..0008b5b4 Binary files /dev/null and b/app/assets/images/home_dark.png differ diff --git a/app/assets/images/home_light.png b/app/assets/images/home_light.png new file mode 100755 index 00000000..de4291da Binary files /dev/null and b/app/assets/images/home_light.png differ diff --git a/app/assets/images/junto24.png b/app/assets/images/junto24.png deleted file mode 100755 index 7dd13a98..00000000 Binary files a/app/assets/images/junto24.png and /dev/null differ diff --git a/app/assets/images/junto24_sprite.png b/app/assets/images/junto24_sprite.png new file mode 100755 index 00000000..24e1a1af Binary files /dev/null and b/app/assets/images/junto24_sprite.png differ diff --git a/app/assets/images/junto32.png b/app/assets/images/junto32.png deleted file mode 100755 index 5d2793bb..00000000 Binary files a/app/assets/images/junto32.png and /dev/null differ diff --git a/app/assets/images/lbToS.png b/app/assets/images/lbToS.png deleted file mode 100755 index e6b8eb3a..00000000 Binary files a/app/assets/images/lbToS.png and /dev/null differ diff --git a/app/assets/images/lbgithub.png b/app/assets/images/lbgithub.png deleted file mode 100755 index 9a556f2d..00000000 Binary files a/app/assets/images/lbgithub.png and /dev/null differ diff --git a/app/assets/images/lbgoogle.png b/app/assets/images/lbgoogle.png deleted file mode 100755 index f5de8936..00000000 Binary files a/app/assets/images/lbgoogle.png and /dev/null differ diff --git a/app/assets/images/lbtwitter.png b/app/assets/images/lbtwitter.png deleted file mode 100755 index 242b918e..00000000 Binary files a/app/assets/images/lbtwitter.png and /dev/null differ diff --git a/app/assets/images/lbwordpress.png b/app/assets/images/lbwordpress.png deleted file mode 100755 index d9474ada..00000000 Binary files a/app/assets/images/lbwordpress.png and /dev/null differ diff --git a/app/assets/images/link.png b/app/assets/images/link.png deleted file mode 100755 index 2115f872..00000000 Binary files a/app/assets/images/link.png and /dev/null differ diff --git a/app/assets/images/link_sprite.png b/app/assets/images/link_sprite.png new file mode 100755 index 00000000..fdfec698 Binary files /dev/null and b/app/assets/images/link_sprite.png differ diff --git a/app/assets/images/linkedmedia.png b/app/assets/images/linkedmedia.png index 504d8882..2009b7a3 100755 Binary files a/app/assets/images/linkedmedia.png and b/app/assets/images/linkedmedia.png differ diff --git a/app/assets/images/map32_sprite.png b/app/assets/images/map32_sprite.png new file mode 100755 index 00000000..33c8ee6c Binary files /dev/null and b/app/assets/images/map32_sprite.png differ diff --git a/app/assets/images/mapinfo.png b/app/assets/images/mapinfo.png deleted file mode 100755 index 6ee30b20..00000000 Binary files a/app/assets/images/mapinfo.png and /dev/null differ diff --git a/app/assets/images/mapinfo_sprite.png b/app/assets/images/mapinfo_sprite.png new file mode 100755 index 00000000..9429ab30 Binary files /dev/null and b/app/assets/images/mapinfo_sprite.png differ diff --git a/app/assets/images/metacodesettings_sprite.png b/app/assets/images/metacodesettings_sprite.png new file mode 100755 index 00000000..6b64c74e Binary files /dev/null and b/app/assets/images/metacodesettings_sprite.png differ diff --git a/app/assets/images/metamap.png b/app/assets/images/metamap.png deleted file mode 100755 index 67674677..00000000 Binary files a/app/assets/images/metamap.png and /dev/null differ diff --git a/app/assets/images/metamap16.png b/app/assets/images/metamap16.png index bd94d326..923dbc4e 100755 Binary files a/app/assets/images/metamap16.png and b/app/assets/images/metamap16.png differ diff --git a/app/assets/images/metamap32.png b/app/assets/images/metamap32.png deleted file mode 100755 index dbbb8444..00000000 Binary files a/app/assets/images/metamap32.png and /dev/null differ diff --git a/app/assets/images/metamap36c.png b/app/assets/images/metamap36c.png index a206a860..5917fb6f 100755 Binary files a/app/assets/images/metamap36c.png and b/app/assets/images/metamap36c.png differ diff --git a/app/assets/images/newmap.png b/app/assets/images/newmap.png deleted file mode 100755 index 733107c6..00000000 Binary files a/app/assets/images/newmap.png and /dev/null differ diff --git a/app/assets/images/permissions32_sprite.png b/app/assets/images/permissions32_sprite.png new file mode 100755 index 00000000..dd1e175e Binary files /dev/null and b/app/assets/images/permissions32_sprite.png differ diff --git a/app/assets/images/permissions36_sprite.png b/app/assets/images/permissions36_sprite.png new file mode 100755 index 00000000..422022c5 Binary files /dev/null and b/app/assets/images/permissions36_sprite.png differ diff --git a/app/assets/images/permissions64sprite.png b/app/assets/images/permissions64sprite.png new file mode 100755 index 00000000..2f9d189d Binary files /dev/null and b/app/assets/images/permissions64sprite.png differ diff --git a/app/assets/images/photo.png b/app/assets/images/photo.png index 397d343e..ba283a57 100755 Binary files a/app/assets/images/photo.png and b/app/assets/images/photo.png differ diff --git a/app/assets/images/remove.png b/app/assets/images/remove.png index 6f469cb8..9f44bea2 100755 Binary files a/app/assets/images/remove.png and b/app/assets/images/remove.png differ diff --git a/app/assets/images/settings32.png b/app/assets/images/settings32.png deleted file mode 100755 index d1261782..00000000 Binary files a/app/assets/images/settings32.png and /dev/null differ diff --git a/app/assets/images/share.png b/app/assets/images/share.png deleted file mode 100755 index 667a1d86..00000000 Binary files a/app/assets/images/share.png and /dev/null differ diff --git a/app/assets/images/share_sprite.png b/app/assets/images/share_sprite.png new file mode 100755 index 00000000..5486daef Binary files /dev/null and b/app/assets/images/share_sprite.png differ diff --git a/app/assets/images/synapse16.png b/app/assets/images/synapse16.png index 3e33e504..d88b0a06 100755 Binary files a/app/assets/images/synapse16.png and b/app/assets/images/synapse16.png differ diff --git a/app/assets/images/synapse32.png b/app/assets/images/synapse32.png new file mode 100755 index 00000000..d56080eb Binary files /dev/null and b/app/assets/images/synapse32.png differ diff --git a/app/assets/images/synapse32scard.png b/app/assets/images/synapse32scard.png deleted file mode 100755 index 4510a484..00000000 Binary files a/app/assets/images/synapse32scard.png and /dev/null differ diff --git a/app/assets/images/synapse32sprite.png b/app/assets/images/synapse32sprite.png new file mode 100755 index 00000000..53c593d5 Binary files /dev/null and b/app/assets/images/synapse32sprite.png differ diff --git a/app/assets/images/synapse32tmcard.png b/app/assets/images/synapse32tmcard.png deleted file mode 100755 index cd51f59e..00000000 Binary files a/app/assets/images/synapse32tmcard.png and /dev/null differ diff --git a/app/assets/images/synapsedirection.png b/app/assets/images/synapsedirection.png deleted file mode 100755 index b483c46b..00000000 Binary files a/app/assets/images/synapsedirection.png and /dev/null differ diff --git a/app/assets/images/synapsedirectionleft_sprite.png b/app/assets/images/synapsedirectionleft_sprite.png new file mode 100755 index 00000000..df9f11ee Binary files /dev/null and b/app/assets/images/synapsedirectionleft_sprite.png differ diff --git a/app/assets/images/synapsedirectionright.png b/app/assets/images/synapsedirectionright.png deleted file mode 100755 index 2906864d..00000000 Binary files a/app/assets/images/synapsedirectionright.png and /dev/null differ diff --git a/app/assets/images/synapsedirectionright_sprite.png b/app/assets/images/synapsedirectionright_sprite.png new file mode 100755 index 00000000..8ecebd60 Binary files /dev/null and b/app/assets/images/synapsedirectionright_sprite.png differ diff --git a/app/assets/images/synapsestar.png b/app/assets/images/synapsestar.png index 08c9d142..ba9a7dd3 100755 Binary files a/app/assets/images/synapsestar.png and b/app/assets/images/synapsestar.png differ diff --git a/app/assets/images/topic32.png b/app/assets/images/topic32.png index d6360c1a..53e34702 100755 Binary files a/app/assets/images/topic32.png and b/app/assets/images/topic32.png differ diff --git a/app/assets/images/topright_sprite.png b/app/assets/images/topright_sprite.png new file mode 100755 index 00000000..938c6a0b Binary files /dev/null and b/app/assets/images/topright_sprite.png differ diff --git a/app/assets/images/upload.png b/app/assets/images/upload.png deleted file mode 100755 index 1f49f9f3..00000000 Binary files a/app/assets/images/upload.png and /dev/null differ diff --git a/app/assets/images/upload_sprite.png b/app/assets/images/upload_sprite.png new file mode 100755 index 00000000..563be4b4 Binary files /dev/null and b/app/assets/images/upload_sprite.png differ diff --git a/app/assets/images/user.png b/app/assets/images/user.png index f30804dc..67239052 100755 Binary files a/app/assets/images/user.png and b/app/assets/images/user.png differ diff --git a/app/assets/images/user_sprite.png b/app/assets/images/user_sprite.png new file mode 100755 index 00000000..72bcafac Binary files /dev/null and b/app/assets/images/user_sprite.png differ diff --git a/app/assets/images/useradmin.png b/app/assets/images/useradmin.png deleted file mode 100755 index 0fd2e03e..00000000 Binary files a/app/assets/images/useradmin.png and /dev/null differ diff --git a/app/assets/images/userlogout.png b/app/assets/images/userlogout.png deleted file mode 100755 index 816083db..00000000 Binary files a/app/assets/images/userlogout.png and /dev/null differ diff --git a/app/assets/images/usersettings.png b/app/assets/images/usersettings.png deleted file mode 100755 index 2ca328f9..00000000 Binary files a/app/assets/images/usersettings.png and /dev/null differ diff --git a/app/assets/images/usershareinvite.png b/app/assets/images/usershareinvite.png deleted file mode 100755 index 84b1a917..00000000 Binary files a/app/assets/images/usershareinvite.png and /dev/null differ diff --git a/app/assets/images/xlightbox.png b/app/assets/images/xlightbox.png index 04144909..48932848 100755 Binary files a/app/assets/images/xlightbox.png and b/app/assets/images/xlightbox.png differ diff --git a/app/assets/images/zoom_sprite.png b/app/assets/images/zoom_sprite.png new file mode 100755 index 00000000..b03bdeec Binary files /dev/null and b/app/assets/images/zoom_sprite.png differ diff --git a/app/assets/images/zoomextents.png b/app/assets/images/zoomextents.png deleted file mode 100755 index 256ed2da..00000000 Binary files a/app/assets/images/zoomextents.png and /dev/null differ diff --git a/app/assets/images/zoomin.png b/app/assets/images/zoomin.png deleted file mode 100755 index f02613ca..00000000 Binary files a/app/assets/images/zoomin.png and /dev/null differ diff --git a/app/assets/images/zoomout.png b/app/assets/images/zoomout.png deleted file mode 100755 index c54b4c4b..00000000 Binary files a/app/assets/images/zoomout.png and /dev/null differ diff --git a/app/assets/javascripts/metamaps/Metamaps.GlobalUI.js b/app/assets/javascripts/metamaps/Metamaps.GlobalUI.js index 5f10d4cf..5f03e7b7 100644 --- a/app/assets/javascripts/metamaps/Metamaps.GlobalUI.js +++ b/app/assets/javascripts/metamaps/Metamaps.GlobalUI.js @@ -313,6 +313,7 @@ Metamaps.GlobalUI.Account = { $('.sidebarAccountBox').fadeIn(200, function () { self.changing = false; self.isOpen = true; + $('.sidebarAccountBox #user_email').focus(); }); } }, @@ -321,6 +322,7 @@ Metamaps.GlobalUI.Account = { if (!self.changing) { self.changing = true; + $('.sidebarAccountBox #user_email').blur(); $('.sidebarAccountBox').fadeOut(200, function () { self.changing = false; self.isOpen = false; @@ -396,7 +398,7 @@ Metamaps.GlobalUI.Search = { width: '400px' }, 300, function () { $('.sidebarSearchField, .sidebarSearch .tt-hint').css({ - padding: '10px 10px 0 10px', + padding: '7px 10px 3px 10px', width: '380px' }); $('.sidebarSearchField').focus(); @@ -413,7 +415,7 @@ Metamaps.GlobalUI.Search = { if (!self.locked && !self.changing && self.isOpen && (bypass || $('.sidebarSearchField').val() == '')) { self.changing = true; $('.sidebarSearchField, .sidebarSearch .tt-hint').css({ - padding: '10px 0 0 0', + padding: '7px 0 3px 0', width: '400px' }); $('.sidebarSearch .twitter-typeahead, .sidebarSearch .tt-hint, .sidebarSearchField').animate({ diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 389a0ec2..83f9c6b0 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -116,36 +116,36 @@ 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; + height: 32px; outline: none; - padding: 0 0; - width: 60px; + padding: 0 18px; -webkit-box-shadow: none; box-shadow: none; - background: #AEA9FD; + background: #4FC059; vertical-align: top; - color: black; + color: #FFF; margin: 0px; cursor: pointer; display: inline-block; - font-weight: bold; - line-height: 29px; - min-width: 54px; + text-transform: uppercase; + font-size: 14px; + line-height: 16px; text-align: center; text-decoration: none; -webkit-border-radius: 2px; border-radius: 2px; -webkit-user-select: none; + font-family: 'din-medium', helvetica, sans-serif; } button.button:hover, a.button:hover, input[type="submit"]:hover { - background: #B6B2FD; + background: #49AD4E; +} +button.button:active, +a.button:active, +input[type="submit"]:active { + background: #429B46; } /* * Utility @@ -184,7 +184,7 @@ input[type="submit"]:hover { height: 100%; margin-bottom: 50px; } -.centeredProfile { +.centeedProfile { margin: 0 auto; display: block; width: 830px; @@ -358,16 +358,6 @@ 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, @@ -473,99 +463,147 @@ label[for="user_remember_me"] { background-color: #E0E0E0; color: #424242; text-transform: uppercase; - text-align: center; + text-align: left; font-size: 14px; line-height: 14px; + position:relative; +} +.accountInnerArrow { + width:16px; + height:16px; + background-image: url(arrowdown_sprite.png); + background-repeat: no-repeat; + position:absolute; + top: 8px; + right:6px; +} +.unauthenticated .sidebarAccountIcon:hover .accountInnerArrow { + background-position: 0px -16px; } .sidebarAccountIcon img { - border-radius: 17px; + border-radius: 16px; } .sidebarAccountBox { display: none; height: auto; - padding: 10px; - min-width: 120px; } .authenticated .sidebarAccountBox { - width: auto; + width: 138px; + padding: 16px; } .unauthenticated .sidebarAccountBox { - width: 200px; + width: 270px; + height: 280px; +} +.sidebarAccountImage { + width:48px; + height:48px; + margin: 0 auto; + border-radius: 24px; } .sidebarAccountBox h3 { - font-family: 'vinyl', helvetica, sans-serif; text-transform: uppercase; - font-style: italic; + color:#424242; + font-size:14px; + line-height:14px; + margin-top:8px; + text-align:center; + max-width:138px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } .sidebarAccountBox ul { list-style: none; + margin-top:10px; } -.sidebarAccountBox li.accountIcon { +.sidebarAccountBox .accountListItem { padding: 0; background-size: 18px 18px; background-repeat: no-repeat; background-position: 0px 6px; - font-size: 18px; - line-height: 20px; + font-size: 14px; + line-height: 14px; + color: #757575; } -li.accountIcon:hover { - background-position: 4px 6px; +.accountListItem:hover { + color: #424242; } -li.accountMaps { - background-image: url('MMCCicon_map.png'); +.accountListItem .accountIcon { + width:32px; + height:32px; + position:absolute; + pointer-events:none; + background-repeat:no-repeat; + background-image: url(user_sprite.png); } -li.accountSettings { - background-image: url('usersettings.png'); +.accountSettings .accountIcon { + background-position: 0 0; } -li.accountAdmin { - background-image: url('MMCCicon_admin.png'); +.accountAdmin .accountIcon { + background-position: 0 -32px; } -li.accountInvite { - background-image: url('MMCCicon_invite.png'); +.accountInvite .accountIcon { + background-position: 0 -64px; } -li.accountLogout { - background-image: url('MMCCicon_logout.png'); +.accountLogout .accountIcon { + background-position: 0 -96px; } -li.accountIcon a { +.accountListItem a { display: block; - padding: 6px 0 6px 25px; + padding: 9px 0 9px 62px; + color: #757575; +} +.accountListItem:hover a { + color: #424242; +} +.accountListItem:hover .accountIcon { + background-position-x: -32px; } li.accountInvite span { display: block; - padding: 6px 0 6px 25px; + padding: 9px 0 9px 62px; } -.sidebarAccountBox a { - +.accountImage { + background-image: url(user.png); + background-repeat: no-repeat; + height:84px; + width:84px; + margin: 24px auto; +} +.accountInput { + margin: 0 35px 10px; } .sidebarAccountBox input[type="email"], .sidebarAccountBox input[type="password"] { width: 200px; height: 32px; - font-size: 15px; + font-size: 14px; direction: ltr; + outline:none; -webkit-appearance: none; appearance: none; display: inline-block; margin: 0; - padding: 0 8px; + padding: 0 10px; 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; + -webkit-border-radius: 2px; + -moz-border-radius: 2px; + border-radius: 2px; font: -webkit-small-control; - color: initial; + color: #BDBDBD; letter-spacing: normal; word-spacing: normal; text-transform: none; text-indent: 0px; text-shadow: none; - display: inline-block; text-align: start; + font-family: 'din-medium', helvetica, sans-serif; } .sidebarAccountBox input[type="email"]:hover, .sidebarAccountBox input[type="password"]:hover { @@ -575,25 +613,40 @@ li.accountInvite span { -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; +.accountSubmit { + margin-left: 35px; + float:left; } +.accountRememberMe { + float:right; + margin-right: 35px; +} +#user_remember_me { + margin-top: 11px; +} +#user_remember_me, +label[for="user_remember_me"] { + float: left; + font-size: 12px; + color: #424242; +} +.accountForgotPass { + margin: 8px 0 0 35px; + font-size: 12px; +} +.accountForgotPass a { + color: #757575; +} +.accountForgotPass a:hover { + color: #424242; +} + /* Save To New Map */ .sidebarFork { width: 32px; height: 32px; } -.sidebarForkIcon { - position: absolute; - width: 32px; - height: 32px; - background: url('fork.png') no-repeat center center; - background-size: 32px 32px; - cursor: pointer; -} -.sidebarForkIcon:hover {} .sidebarFork .hoverForTip:hover .tip { display: block; @@ -622,18 +675,6 @@ li.accountInvite span { height: 32px; } -.sidebarFilterIcon { - position: absolute; - width: 32px; - height: 32px; - background: url('filter.png') no-repeat center center; - background-size: 32px 32px; - cursor: pointer; -} -.sidebarFilterIcon:hover { - -} - .sidebarFilterBox { display:none; height: 400px; @@ -704,19 +745,6 @@ h3.filterBox { width: 32px; height: 32px; } -.sidebarCollaborateIcon { - position: absolute; - width: 32px; - height: 32px; - background-image: url('junto32.png'); - background-size: 32px 32px; - background-position: center center; - background-repeat: no-repeat; - cursor: pointer; -} -.sidebarCollaborateIcon.blue { - background-image: url('junto32.png'); -} .sidebarCollaborateBox { display: none; height: auto; @@ -855,13 +883,13 @@ float: left; display: block; } .rightclickmenu .rc-permission .toCommons { - background-image: url(MMCCicon_commons.png); + background-image: url(CO64.png); } .rightclickmenu .rc-permission .toPublic { - background-image: url(MMCCicon_public.png); + background-image: url(PU64.png); } .rightclickmenu .rc-permission .toPrivate { - background-image: url(MMCCicon_private.png); + background-image: url(PR64.png); } .rightclickmenu p { padding: 7px; @@ -895,13 +923,13 @@ float: left; background-size: 16px 16px; } #new_topic .topicPermission.commons { - background-image: url(MMCCicon_commons.png); + background-image: url(CO64.png); } #new_topic .topicPermission.public { - background-image: url(MMCCicon_public.png); + background-image: url(PU64.png); } #new_topic .topicPermission.private { - background-image: url(MMCCicon_private.png); + background-image: url(PR64.png); } #new_topic .topicOriginatorIcon { position: relative; @@ -968,13 +996,13 @@ float: left; background-size: 16px 16px; } #new_synapse .synapsePermission.commons { - background-image: url(MMCCicon_commons.png); + background-image: url(CO64.png); } #new_synapse .synapsePermission.public { - background-image: url(MMCCicon_public.png); + background-image: url(PU64.png); } #new_synapse .synapsePermission.private { - background-image: url(MMCCicon_private.png); + background-image: url(PR64.png); } #new_synapse .synapseOriginatorIcon { position: relative; @@ -1009,55 +1037,53 @@ float: left; display: none; } /* map info box */ +/* 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; + background-color: #424242; + color: #F5F5F5; + border-radius: 2px; + width: 360px; + height: 300px; + padding: 0; font-style: normal; text-align: center; + box-shadow: 0 3px 3px rgba(0,0,0,0.23), 0px 3px 3px rgba(0,0,0,0.16); } .mapInfoName { - padding-bottom: 10px; - margin-bottom: 10px; - background: url(mapInfoLine.png) no-repeat bottom center; + font-size: 18px; + line-height: 20px; + height: 20px; + padding: 26px 0; } -.mapInfoName, .mapInfoStat { - font-size: 25px; - line-height: 27px; + background-color: #E0E0E0; + font-size: 18px; + line-height: 20px; + height: 48px; + padding: 0; + color: #424242; } .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; + padding: 14px 0px 14px 45px; + height: 20px; 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; + background-position: 13px center; position: relative; } .infoStatIcon .tip { @@ -1070,7 +1096,6 @@ div.mapInfoStat { color: black; border-radius: 4px; font-size: 15px !important; - font-family: 'LatoRegular'; line-height: 17px; padding: 3px 5px 2px; z-index: 100; @@ -1087,86 +1112,88 @@ div.mapInfoStat { display: block; } .mapTopics { - background-image: url(MMCCicon_topic.png); - background-position: 16px 6px; - background-size: 27px 27px; + background-image: url(topic32.png); + background-position: 13px center; } .mapSynapses { - background-image: url(MMCCicon_synapse.png); - background-position: 18px 6px; - background-size: 27px 27px; + background-image: url(synapse32tmcard.png); + background-position: 13px center; } .mapInfoBox .mapPermission { background-position: 0 center; - background-size: 30px 30px; - width: 30px; - height: 30px; + width: 32px; + height: 32px; padding: 0; - margin: 5px 30px 5px 10px; + margin: 8px 30px 8px 10px; position: relative; } .mapInfoBox .mapPermission.commons { - background-image: url(MMCCicon_commons.png); + background-image: url(CO32.png); } .mapInfoBox .mapPermission.public { - background-image: url(MMCCicon_public.png); + background-image: url(PU32.png); } .mapInfoBox .mapPermission.private { - background-image: url(MMCCicon_private.png); + background-image: url(PR32.png); } .yourMap .mapPermission:hover { - background-image: url(/assets/MMCCicon_maximize_arrow.png); + background-image: url(arrowexpand.png); cursor: pointer; } .yourMap .mapPermission.minimize { - background-image: url(MMCCicon_minimize_arrow.png) !important; + background-image: url(arrowcollapse.png) !important; cursor: pointer; } .mapInfoBox .mapPermission .permissionSelect { list-style: none; - width: 30px; - height: 60px; + width: 32px; + height: 64px; position: relative; - top: 30px; + top: 32px; } .mapInfoBox .mapPermission .permissionSelect li { - width: 30px; - height: 30px; + width: 32px; + height: 32px; background-repeat: no-repeat; background-position: center center; - background-size: 30px 30px; } .mapInfoBox .mapPermission .permissionSelect .commons { - background-image: url(MMCCicon_commons.png); + background-image: url(CO32.png); } .mapInfoBox .mapPermission .permissionSelect .public { - background-image: url(MMCCicon_public.png); + background-image: url(PU32.png); } .mapInfoBox .mapPermission .permissionSelect .private { - background-image: url(MMCCicon_private.png); + background-image: url(PR32.png); } .mapInfoBox .mapPermission .permissionSelect .commons:hover { - background-image: url(MMCCicon_commons_black.png); + background-image: url(CO32b.png); } .mapInfoBox .mapPermission .permissionSelect .public:hover { - background-image: url(MMCCicon_public_black.png); + background-image: url(PU32b.png); } .mapInfoBox .mapPermission .permissionSelect .private:hover { - background-image: url(MMCCicon_private_black.png); + background-image: url(PR32b).png); } .mapInfoBox .mapInfoDesc { - font-style: italic; - color: #BBB; - padding-bottom: 5px; - margin: 5px 0 8px; - background: url(mapInfoLine.png) no-repeat bottom center; + font-family: helvetica, sans-serif; + color: #E0E0E0; + margin: 8px; + height: 106px; + font-size: 14px; + line-height: 16px; +} +.mapInfoBox .mapInfoMeta { + height: 35px; + border-top: 1px solid #F5F5F5; + padding: 6px 0 7px; } .mapInfoBox .mapInfoMeta p { margin: 4px 0; - font-size: 14px; - font-style: italic; - color: #BBB; + font-size: 12px; + color: #F5F5F5; } + /* lightboxes */ #lightbox_overlay { @@ -1179,7 +1206,7 @@ div.mapInfoStat { display: none; } #lightbox_main { - width: 550px; + width: 770px; height: auto; margin: 0 auto; z-index: 2; @@ -1222,27 +1249,114 @@ div.mapInfoStat { border: none; } #lightbox_content { - background: white url(metacode-watermark.png) 443px -30px no-repeat; +/* background: white url(metacode-watermark.png) 443px -30px no-repeat; padding: 20px; - border-radius: 5px; + border-radius: 5px;*/ + width: 552px; + height: 434px; + background-color: #e0e0e0; + padding: 64px 124px 64px 124px; + border-radius: 2px; } .lightboxContent h3 { - font-style: italic; +/* font-style: italic; text-transform: uppercase; font-family: 'vinyl'; font-size: 30px; line-height: 35px; - color: black; + color: black;*/ + font-family: 'din-medium'; + font-size: 24px; + text-transform: uppercase; + color: #424242; + text-align: left; + padding: 0 0 0 0; } .lightboxContent h3.forCreateMap { text-align: center; } +#svi { + padding-top: 56px; + padding-left: 162px; + margin: 0 auto; +} +#svi1 { + font-family: 'din-medium'; + font-size: 14px; + font-color: #424242; + text-transform: uppercase; + text-align: left; + display: inline-block; +} +#svi2 { + font-family: 'din-medium'; + font-size: 14px; + font-color: #424242; + text-transform: uppercase; + text-align: left; + display: inline-block; +} + +#svi1 > p, #svi2 > p { + width: 150px; +} .lightboxContent { - display: none; + font-family: 'din-regular'; + font-size: 14px; + color: #424242; + text-align: left; } .openLightbox { cursor: pointer; } +.lightbox_links a { + height: 70px; + width: 104px; + border-radius: 2px; + padding-bottom: 0; + font-family: 'din-medium'; + font-size: 14px; + text-transform: uppercase; + color: #757575; + text-align: center; + display: block; + cursor: pointer; + position:relative; + +} +.lightbox_links a:hover { + color: #424242; +} +.lightbox_links a:active { + color: #00bcd4; +} +.lightbox_links .lightboxAboutIcon { + background-image: url(about_sprite.png); + background-repeat: no-repeat; + width:32px; + height:32px; + margin:10px auto; + background-position: 0 0; +} +.lightbox_links a:hover .lightboxAboutIcon { + background-position-y: -32px; +} +#lightbox_metamapps .lightboxAboutIcon { + background-position-x: 0; +} +#lightbox_community .lightboxAboutIcon { + background-position-x: -32px; +} +#lightbox_source .lightboxAboutIcon { + background-position-x: -64px; +} +#lightbox_blog .lightboxAboutIcon { + background-position-x: -96px; +} +#lightbox_term .lightboxAboutIcon { + background-position-x: -128px; +} + /* jquery ui tabs */ .ui-tabs-hide { @@ -1344,20 +1458,16 @@ div.mapInfoStat { /* about */ #about > p { - color: #000; - font-size: 16px; - line-height: 24px; +/* color: #000; + font-size: 16px;*/ margin: 10px 0; + line-height: 24px; } #about ul { list-style: none; } #about ul li { display: inline-block; - padding: 5px; -} -#about li a { - color: #097A51; } /* invite */ @@ -1458,25 +1568,25 @@ div.mapInfoStat { cursor: pointer; } .new_map .mapCommonsIcon { - background-image: url(MMCCicon_commons.png); + background-image: url(CO64.png); } .new_map .mapPublicIcon { - background-image: url(MMCCicon_public.png); + background-image: url(PU64.png); } .new_map .mapPrivateIcon { - background-image: url(MMCCicon_private.png); + background-image: url(PR64.png); } .new_map .mapCommonsIcon.selected, .new_map .mapCommonsIcon:hover { - background-image: url(MMCCicon_commons_black.png); + background-image: url(CO64b.png); } .new_map .mapPublicIcon.selected, .new_map .mapPublicIcon:hover { - background-image: url(MMCCicon_public_black.png); + background-image: url(PU64b.png); } .new_map .mapPrivateIcon.selected, .new_map .mapPrivateIcon:hover { - background-image: url(MMCCicon_private_black.png); + background-image: url(PR64b.png); } .new_map .permIcon h4 { font-style: italic; @@ -1692,53 +1802,7 @@ div.mapInfoStat { -webkit-box-shadow: none; box-shadow: none; } -/* 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 { @@ -1750,17 +1814,6 @@ div.mapInfoStat { height: 100%; overflow: hidden; } -.addMap { - display: block; - width: 32px; - height: 32px; - background: url('newmap.png') no-repeat center center; - background-size: 32px 32px; - cursor: pointer; - border-radius: 2px; - margin-right: 10px; -} - .home_bg { display: block; diff --git a/app/assets/stylesheets/base.css b/app/assets/stylesheets/base.css index 871a861e..07faaad4 100644 --- a/app/assets/stylesheets/base.css +++ b/app/assets/stylesheets/base.css @@ -121,6 +121,7 @@ background: none; position:relative; border-bottom: 1px solid #BDBDBD; border-top: 1px solid #BDBDBD; + background-color: #e0e0e0; } .linkItem { @@ -155,12 +156,12 @@ background: none; padding:17px 0 17px 28px; } .linkItem.mapCount { - background-image: url(MMCCicon_map_black.png); + background-image: url(metamap32.png); min-width: 16px; padding:17px 0 17px 28px; } .linkItem.synapseCount { - background-image: url(MMCCicon_synapse_black.png); + background-image: url(synapse32tmcard.png); min-width: 16px; padding:17px 0 17px 28px; } @@ -168,23 +169,23 @@ background: none; } .linkItem.mapPerm.co { - background-image: url(MMCCicon_commons.png); + background-image: url(CO32.png); } .linkItem.mapPerm.pu { - background-image: url(MMCCicon_public.png); + background-image: url(PU32.png); } .linkItem.mapPerm.pr { - background-image: url(MMCCicon_private.png); + background-image: url(PR32.png); } .showcard .yourTopic .mapPerm:hover { - background-image: url(/assets/MMCCicon_maximize_arrow_black.png); + background-image: url(arrowexpand.png); background-size: 31px 25px; background-position-x: 8px; cursor:pointer; } .showcard .yourTopic .mapPerm.minimize { - background-image: url(MMCCicon_minimize_arrow_black.png) !important; + background-image: url(arrowcollapse.png) !important; background-size: 31px 25px; background-position-x: 8px; cursor: pointer; @@ -205,22 +206,22 @@ cursor: pointer; background-color: #F5F5F5; } .mapPerm .permissionSelect .commons { - background-image: url(MMCCicon_commons.png); + background-image: url(CO32.png); } .mapPerm .permissionSelect .public { - background-image: url(MMCCicon_public.png); + background-image: url(PU32.png); } .mapPerm .permissionSelect .private { - background-image: url(MMCCicon_private.png); + background-image: url(PR32.png); } .mapPerm .permissionSelect .commons:hover { - background-image: url(MMCCicon_commons_black.png); + background-image: url(CO32b.png); } .mapPerm .permissionSelect .public:hover { - background-image: url(MMCCicon_public_black.png); + background-image: url(PU32b.png); } .mapPerm .permissionSelect .private:hover { - background-image: url(MMCCicon_private_black.png); + background-image: url(PR32b.png); } .CardOnGraph .metacodeTitle { @@ -437,13 +438,13 @@ font-family: 'LatoLight'; margin: 10px 12px 0 12px; } #edit_synapse .mapPerm.co { - background-image: url("/assets/MMCCicon_commons.png"); + background-image: url("CO32.png"); } #edit_synapse .mapPerm.pu { - background-image: url("/assets/MMCCicon_public.png"); + background-image: url("PU32.png"); } #edit_synapse .mapPerm.pr { - background-image: url("/assets/MMCCicon_private.png"); + background-image: url("PR32.png"); } #edit_synapse .permActivator { @@ -452,7 +453,7 @@ font-family: 'LatoLight'; } #edit_synapse { - background: url("/assets/MMCCicon_synapse_black.png") no-repeat scroll 0 center / 30px 30px #FFFFFF; + background: url("synapse32tmcard.png") no-repeat scroll 0 center / 30px 30px #FFFFFF; border-radius: 5px; padding: 5px 5px 5px 30px; color: #000; @@ -500,7 +501,7 @@ font-family: 'LatoLight'; } #edit_synapse.yourEdge .mapPerm:hover { - background-image: url(/assets/MMCCicon_maximize_arrow_black.png); + background-image: url(MMCCicon_maximize_arrow_black.png); background-size: 24px 17px; background-position: 0px 2px; cursor:pointer; @@ -532,7 +533,7 @@ font-family: 'LatoLight'; /* Map Cards */ .map { - float:left; + display:inline-block; width:220px; height:340px; font-size: 12px; @@ -540,7 +541,7 @@ font-family: 'LatoLight'; overflow: visible; background: #424242; border-radius:2px; - margin:0 12px 12px 0; + margin:16px 16px 16px 19px; } .mapCard { diff --git a/app/assets/stylesheets/clean.css b/app/assets/stylesheets/clean.css index 369d1875..a06e0103 100644 --- a/app/assets/stylesheets/clean.css +++ b/app/assets/stylesheets/clean.css @@ -104,6 +104,7 @@ } .bottomLinks li { display: inline-block; + cursor:pointer; } .bottomLinks li a { color: #9e9e9e; @@ -131,11 +132,17 @@ .homeButton { width: 40px; height: 32px; - background: #757575 url(home.png) no-repeat center center; + background-color: #757575; + background-image: url(home_light.png); + background-repeat: no-repeat; + background-position: center center; border-top-left-radius: 2px; border-bottom-left-radius: 2px; float:left; } +.homeButton:hover { + background-image: url(home_light.png); +} .homeButton a { display:block; width: 40px; @@ -174,7 +181,7 @@ .explorePage .sidebarSearchField, .explorePage .sidebarSearch .tt-hint { width: 380px; - padding: 10px 10px 0 10px; + padding: 7px 10px 3px 10px; } .sidebarSearchField, @@ -184,7 +191,7 @@ border-bottom: 1px solid #BDBDBD; border-left: none; border-right: none; - padding: 10px 0 0 0; + padding: 7px 0 3px 0; width: 0px; margin: 0; outline: none; @@ -192,7 +199,7 @@ line-height: 14px; background: #FFFFFF; color: #BDBDBD; - font-family: 'LatoRegular'; + font-family: 'din-medium', helvetica, sans-serif; } .sidebarSearch .tt-dropdown-menu { left: -35px !important; @@ -485,8 +492,8 @@ position: fixed; top:52px; right:24px; - background-color: #E5E5E5; - border-radius: 4px; + background-color: #E0E0E0; + border-radius: 2px; box-shadow: 0 3px 3px rgba(0,0,0,0.23), 0 3px 3px rgba(0,0,0,0.16); } @@ -497,22 +504,49 @@ .mapPage .upperRightMapButtons { top: 0; } -/*.upperRightMapButtons.animations { - -webkit-transition-property: top; - -moz-transition-property: top; - -o-transition-property: top; - -ms-transition-property: top; - transition-property: top; -}*/ + +.upperRightIcon { + width: 32px; + height: 32px; + background-image: url('topright_sprite.png'); + background-repeat: no-repeat; + cursor: pointer; +} +.upperRightIcon:hover { + background-position-y: -32px; +} +.sidebarCollaborateIcon.blue { + background-position-x: -32px; +} +.sidebarCollaborateIcon { + background-position-x: 0; +} +.sidebarFilterIcon { + background-position-x: -64px; +} +.sidebarForkIcon { + background-position-x: -96px; +} +.addMap { + background-position-x: -128px; + margin-right:10px; +} + /* end upperRightUI */ +/* yield */ + +.famousYield { + overflow-y:auto; +} + /* homepage */ .homeWrapper { width: 560px; - margin: 0 auto; + margin: 56px auto 72px; color: #424242; } @@ -585,12 +619,20 @@ cursor: pointer; } .openCheatsheet { - background: url('help.png') no-repeat center center; + background-image: url('help_sprite.png'); + background-repeat:no-repeat; +} +.openCheatsheet:hover { + background-position-y: -32px; } .mapInfoIcon { position: relative; top: 56px; /* puts it just offscreen */ - background: url('mapinfo.png') no-repeat center center; + background-image: url('mapinfo_sprite.png'); + background-repeat:no-repeat; +} +.mapInfoIcon:hover { + background-position-y: -32px; } .mapPage .mapInfoIcon { top: 0; @@ -624,24 +666,26 @@ height:32px; background-color: #424242; background-repeat: no-repeat; - background-position: center center; + background-position: 0 0; cursor:pointer; } -.zoomExtents { - - margin-bottom:5px; - border-radius: 2px; +.mapControl:hover { + background-position-x: -32px; } .zoomExtents { - background-image: url(zoomextents.png); + margin-bottom:5px; + border-radius: 2px; + background-image: url(extents_sprite.png); } .zoomIn { - background-image: url(zoomin.png); + background-image: url(zoom_sprite.png); + background-position: 0 0; border-top-left-radius: 2px; border-top-right-radius: 2px; } .zoomOut { - background-image: url(zoomout.png); + background-image: url(zoom_sprite.png); + background-position:0 -32px; border-bottom-left-radius: 2px; border-bottom-right-radius: 2px; } @@ -670,7 +714,7 @@ z-index: 3; } -.exploreMapsCenter a { +.exploreMapsButton { color: #757575; cursor: default; font-weight: normal; @@ -681,20 +725,37 @@ border-bottom: 2px solid rgba(0,0,0,0); display: inline-block; cursor: pointer; + position:relative; } -.exploreMapsCenter a:hover, .exploreMapsCenter a.active { +.exploreMapsButton:hover, .exploreMapsButton.active { text-decoration: none; color: #424242; border-bottom: 2px solid #00BCD4; } -.exploreMapsCenter .myMaps { - background: url(metamap.png) no-repeat 0 center; + +.exploreMapsButton .exploreMapsIcon { + background-repeat: no-repeat; + width:32px; + height:32px; + position:absolute; + top:5px; + left:5px; + background-position-y: 0; } -.exploreMapsCenter .activeMaps { - background: url(activity.png) no-repeat 0 center; +.exploreMapsCenter .myMaps .exploreMapsIcon { + background-image: url(exploremaps_sprite.png); + background-position-x: 0; } -.exploreMapsCenter .featuredMaps { - background: url(featured.png) no-repeat 0 center; +.exploreMapsCenter .activeMaps .exploreMapsIcon { + background-image: url(exploremaps_sprite.png); + background-position-x: -32px; +} +.exploreMapsCenter .featuredMaps .exploreMapsIcon { + background-image: url(exploremaps_sprite.png); + background-position-x: -64px; +} +.exploreMapsButton:hover .exploreMapsIcon, .exploreMapsButton.active .exploreMapsIcon { + background-position-y: -32px; } .mapsWrapper { @@ -721,7 +782,8 @@ /* feedback */ body a#barometer_tab { -background-image: url(feedback.png); +background-image: url(feedback_sprite.png); +background-position: 0 0; background-color: transparent; height: 110px; margin-left:0; @@ -731,4 +793,8 @@ width: 22px; border-top-right-radius: 2px; border-bottom-right-radius: 2px; box-shadow: 0px 1px 1.5px rgba(0,0,0,0.12), 0 1px 1px rgba(0,0,0,0.24); -} \ No newline at end of file +} + +body a#barometer_tab:hover { + background-position: 0 -110px; +} diff --git a/app/models/map.rb b/app/models/map.rb index 74fce74d..1c3728e1 100644 --- a/app/models/map.rb +++ b/app/models/map.rb @@ -62,8 +62,19 @@ class Map < ActiveRecord::Base self.contributors.length end + def created_at_str + self.created_at.strftime("%m/%d/%Y") + end + + def updated_at_str + self.updated_at.strftime("%m/%d/%Y") + end + def as_json(options={}) - super(:methods =>[:user_name, :user_image, :topic_count, :synapse_count, :contributor_count]) + json = super(:methods =>[:user_name, :user_image, :topic_count, :synapse_count, :contributor_count], :except => [:created_at, :updated_at]) + json[:created_at] = self.created_at_str + json[:updated_at] = self.updated_at_str + json end ##### PERMISSIONS ###### diff --git a/app/views/layouts/_account.html.erb b/app/views/layouts/_account.html.erb index c44f0a78..5fe43665 100644 --- a/app/views/layouts/_account.html.erb +++ b/app/views/layouts/_account.html.erb @@ -5,42 +5,47 @@ <% if authenticated? %> <% account = current_user %> + <%= image_tag user.image.url(:thumb), :size => "48x48", :class => "sidebarAccountImage" %>

<%= account.name.split[0...1][0] %>

<% else %> -

Sign In

<%= form_for(resource, :as => resource_name, :url => session_path(resource_name), :html => { class: "loginAnywhere" }) do |f| %> -
- <%= f.label :email %> - <%= f.email_field :email, :autofocus => true %> +
+
+ <%= f.email_field :email, :placeholder => "Email" %>
-
- <%= f.label :password %> - <%= f.password_field :password %> +
+ <%= f.password_field :password, :placeholder => "Password" %>
+
<%= f.submit "SIGN IN" %>
<% if devise_mapping.rememberable? -%> -
<%= f.check_box :remember_me %> <%= f.label :remember_me %>
+
<%= f.check_box :remember_me %> <%= f.label :remember_me, "Stay signed in" %>
<% end -%> -
- <%= f.submit "Sign in" %>
- -
+
<% end %> -
+
<%- if devise_mapping.recoverable? && controller_name != 'passwords' %> - <%= link_to "Forgot your password?", new_password_path(resource_name), + <%= link_to "Forgot password?", new_password_path(resource_name), :data => { :bypass => 'true'} %> <% end -%> - Request Invite
<% end %> diff --git a/app/views/layouts/_lightboxes.html.erb b/app/views/layouts/_lightboxes.html.erb index 9cf5b9eb..4462be29 100644 --- a/app/views/layouts/_lightboxes.html.erb +++ b/app/views/layouts/_lightboxes.html.erb @@ -18,13 +18,37 @@

Metamaps.cc is created and maintained by a distributed, nomadic community comprised of technologists, artists and storytellers. We are currently based between San Francisco, CA and Waterloo, Ontario, Canada. Learn more in the PAQ link below.

-
diff --git a/app/views/layouts/_templates.html.erb b/app/views/layouts/_templates.html.erb index 3c4036c2..d0761885 100644 --- a/app/views/layouts/_templates.html.erb +++ b/app/views/layouts/_templates.html.erb @@ -5,6 +5,38 @@
+