- commons
\
diff --git a/app/assets/javascripts/src/Metamaps.js b/app/assets/javascripts/src/Metamaps.js
index 0daf6b97..a907df8f 100644
--- a/app/assets/javascripts/src/Metamaps.js
+++ b/app/assets/javascripts/src/Metamaps.js
@@ -1321,7 +1321,12 @@ Metamaps.SynapseCard = {
//if edge data is blank or just whitespace, populate it with data_nil
if ($('#edit_synapse_desc').html().trim() == '') {
- $('#edit_synapse_desc').html(data_nil);
+ if (synapse.authorizeToEdit(Metamaps.Active.Mapper)) {
+ $('#edit_synapse_desc').html(data_nil);
+ }
+ else {
+ $('#edit_synapse_desc').html("(no description)");
+ }
}
$('#edit_synapse_desc').bind("ajax:success", function () {
@@ -3542,7 +3547,9 @@ Metamaps.Listeners = {
case 69: //if e or E is pressed
if (e.ctrlKey){
e.preventDefault();
- Metamaps.JIT.zoomExtents(null, Metamaps.Visualize.mGraph.canvas);
+ if (Metamaps.Active.Map) {
+ Metamaps.JIT.zoomExtents(null, Metamaps.Visualize.mGraph.canvas);
+ }
}
break;
case 77: //if m or M is pressed
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index 8cd71a74..c51011e3 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -520,7 +520,7 @@ input[type="submit"]:active {
left: 41px;
z-index: 9999;
width: 256px;
- height: 42px;
+ height: 34px;
}
.new_topic #topic_name,
.new_topic .tt-hint {
@@ -528,7 +528,7 @@ input[type="submit"]:active {
background: #FFFFFF;
height: 14px;
margin: 0;
- padding: 14px 6px;
+ padding: 10px 6px;
border: none;
border-radius: 2px;
outline: none;
@@ -811,6 +811,7 @@ li.accountInvite span {
}
.accountImage {
background-image: url(user.png);
+ background-size: 84px 84px;
background-repeat: no-repeat;
height:84px;
width:84px;
@@ -1176,6 +1177,14 @@ h3.realtimeBoxTitle {
color: black;
box-shadow: 0px 3px 3px rgba(0,0,0,0.12), 0 3px 3px rgba(0,0,0,0.24);
}
+
+.rightclickmenu .rc-spacer {
+ width:100%;
+ height:0;
+ border-top:1px solid #EBEBEB;
+ margin: 6px 0;
+ padding: 0;
+}
.rightclickmenu > ul {
}
@@ -1198,6 +1207,14 @@ h3.realtimeBoxTitle {
background-color: transparent;
cursor: default;
}
+
+.rc-keyboard {
+ position: absolute;
+ top: 6px;
+ right: 12px;
+ color: #757575;
+}
+
.rightclickmenu > ul > li .rc-icon {
position: absolute;
top: 0;
@@ -1596,6 +1613,7 @@ float: left;
.wrapper div.mapInfoDesc span {
float: none !important;
padding-bottom: 10px;
+ word-wrap: break-word;
}
.infoStatIcon {
float: left;
diff --git a/app/assets/stylesheets/base.css b/app/assets/stylesheets/base.css
index c30f88d3..5b0f3439 100644
--- a/app/assets/stylesheets/base.css
+++ b/app/assets/stylesheets/base.css
@@ -670,7 +670,7 @@ padding: 9px 7px 9px 31px;
height: 12px;
width: 198px;
margin: 0 0 0 0;
-border: 1px solid #BDBDBD;
+border: none;
outline: none;
font-size: 12px;
line-height: 12px;
@@ -946,6 +946,7 @@ font-family: 'din-regular', helvetica, sans-serif;
background: #424242;
border-radius:2px;
margin:16px 16px 16px 19px;
+ box-shadow: 0px 3px 3px rgba(0,0,0,0.23), 0 3px 3px rgba(0,0,0,0.16);
}
.mapCard {
@@ -969,8 +970,10 @@ font-family: 'din-regular', helvetica, sans-serif;
}
.mapCard .title {
+ word-wrap: break-word;
font-size:18px;
line-height:22px;
+ height: 44px;
display:block;
padding: 0 16px;
text-align: center;
@@ -1000,11 +1003,11 @@ font-family: 'din-regular', helvetica, sans-serif;
-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;
+ word-wrap: break-word;
}
.mCS_no_scrollbar {
padding-right: 5px;
diff --git a/app/assets/stylesheets/clean.css b/app/assets/stylesheets/clean.css
index 24a659fc..bca46825 100644
--- a/app/assets/stylesheets/clean.css
+++ b/app/assets/stylesheets/clean.css
@@ -213,16 +213,16 @@
outline: none;
font-size: 14px;
line-height: 14px;
- background: #FFFFFF;
+ background: #F5F5F5;
font-family: 'din-medium', helvetica, sans-serif;
}
.sidebarSearch .tt-dropdown-menu {
top: 40px !important;
background: #F5F5F5;
width: 472px;
- overflow-y: visible;
+ overflow-y: auto;
overflow-x: visible;
- box-shadow: 0 1px 1.5px rgba(0,0,0,0.12), 0 1px 1px rgba(0,0,0,0.24);
+ box-shadow: 0 10px 10px rgba(0,0,0,0.19), 0 6px 3px rgba(0,0,0,0.23);
}
.autoOptions #mapContribs {
@@ -327,7 +327,7 @@
display: table-cell;
vertical-align: middle;
height: 32px;
- padding: 0 8px;
+ padding: 0 18px 0 28px;
}
.sidebarSearch .tt-suggestion .icon {
width: 32px;
@@ -338,18 +338,16 @@
display: table-cell;
vertical-align: middle;
padding: 0 0 0 8px;
- max-width: 70px;
+ width: 70px;
}
.sidebarSearch .tt-dataset-topics .topicIcon {
width: 32px;
height: 32px;
-}
-.sidebarSearch .tt-dataset-topics .tt-is-under-cursor .topicIcon,
-.sidebarSearch .tt-dataset-topics .tt-is-under-mouse-cursor .topicIcon {
margin: 0 auto;
}
.sidebarSearch .tt-dataset-topics .metacodeTip {
display: none;
+ margin: 0 auto;
}
.sidebarSearch .tt-dataset-topics .tt-is-under-cursor .metacodeTip,
.sidebarSearch .tt-dataset-topics .tt-is-under-mouse-cursor .metacodeTip {
@@ -362,7 +360,7 @@
text-align: center;
}
.sidebarSearch .tt-dataset-mappers .tt-suggestion .icon {
- margin: 4px 9px 4px 4px;
+ margin: 0px 0px 0px 0px;
}
.sidebarSearch .tt-dataset-mappers .resultText {
width: 150px;
@@ -488,8 +486,7 @@
}
.sidebarSearch .topicOriginatorIcon .tip {
- left: 30px;
- right: auto;
+ right: 30px;
top: 1px;
}
.sidebarSearch .tip {
@@ -512,8 +509,7 @@
}
.sidebarSearch .mapContributorsIcon .tip {
- left: 40px;
- right: auto;
+ right: 40px;
top: -5px;
padding-top: 5px;
padding-bottom: 5px;
@@ -536,7 +532,7 @@
position: absolute;
width: 0;
height: 0;
- border-right: 4px solid #424242;
+ border-left: 4px solid #424242;
border-top: 5px solid transparent;
border-bottom: 5px solid transparent;
}
@@ -546,20 +542,16 @@
}
.sidebarSearch .hoverForTip.addToMap .tip:before {
right: -4px;
- border-left: 4px solid #424242;
- border-right: none;
}
.sidebarSearch .mapContributorsIcon .tip:before {
- top: 65px;
- left: -4px;
- margin-top: -53px;
+ top: 12px;
+ right: -4px;
}
.sidebarSearch .topicOriginatorIcon .tip:before {
- top: 58px;
- left: -4px;
- margin-top: -53px;
+ top: 5px;
+ right: -4px;
}
.sidebarSearch .mapContributorsIcon .mapContributors {
@@ -712,7 +704,7 @@
/* homepage */
.homeWrapper.homeText {
- margin-top: 10%;
+ margin-top: 5%;
}
.fullWidthWrapper {
@@ -724,20 +716,20 @@
}
.homeWrapper {
- width: 880px;
+ width: 800px;
margin: 0 auto;
color: #424242;
}
.homeTitle {
- font-size: 69px;
+ font-size: 63px;
line-height: 48px;
text-align: center;
margin-bottom: 20px;
}
.homeIntro {
- font-size: 23px;
+ font-size: 22px;
line-height: 26px;
text-align: justify;
margin: 32px 0 20px;
@@ -759,7 +751,7 @@
.homeWrapper .callToAction {
float: left;
- width: 220px;
+ width: 216px;
padding: 24px 0 24px 24px;
color: #F5F5F5;
}
@@ -767,11 +759,11 @@
font-size: 24px;
}
.callToAction p {
- margin: 16px 0;
- font-size: 14px;
+ margin: 8px 0 16px;
+ font-size: 13px;
line-height: 16px;
font-family: 'din-regular', helvetica, sans-serif;
- text-align: justify;
+ text-align: left;
}
.callToAction a, .callToAction button {
display: block;
@@ -806,15 +798,16 @@
background-color: #4fb5c0;
}
.callToAction .learnMoreCTA:hover {
- background-color: #9150bc;
+ background-color: #3d8e8e;
}
.fullWidthWrapper.withPartners {
- background: url(homepage-bg.png) no-repeat center -300px;
+ background: url(homepage_bg.png) no-repeat center -300px;
}
.homeWrapper.homePartners {
- padding-bottom: 100px;
- height: 200px;
+ padding: 64px 0 100px;
+ height: 96px;
+ background: url(partner_logos.png) no-repeat 0 64px;
}
.github-fork-ribbon-wrapper {
diff --git a/app/views/layouts/_lightboxes.html.erb b/app/views/layouts/_lightboxes.html.erb
index 81461c06..e3b75001 100644
--- a/app/views/layouts/_lightboxes.html.erb
+++ b/app/views/layouts/_lightboxes.html.erb
@@ -19,7 +19,7 @@
PRIVATE BETA
2.6
-
Aug 31, 2014
+
Nov 29, 2014
@@ -81,15 +81,15 @@
Iconography within Metamaps is a distinctive and subtle art. We thank the following creators of icons used throughout Metamaps for the courtesy of sharing their work under Creative Commons licenses:
System Icons
- Ryan Oksenhorn, Leonides Delgado, Matheus Antúrio, Nicholas Menghini, useiconic.com, Icomatic, AnsteyDesign, P.J. Onori, Michael Zenaty, Edward Boatman, Garrett Knoll, misirlou, Dmitry Baranovskiy, Nathan Thomson, Alex Auda Samora, Bernar Novalyi, Jeremy J Bristol, FivebyFive, Thibault Geffroy, Gavin Keech
+ Ryan Oksenhorn, Leonides Delgado, Matheus Antúrio, Nicholas Menghini, useiconic.com, Icomatic, AnsteyDesign, P.J. Onori, Michael Zenaty, Edward Boatman, Garrett Knoll, misirlou, Dmitry Baranovskiy, Nathan Thomson, Alex Auda Samora, Bernar Novalyi, Jeremy J Bristol, FivebyFive, Thibault Geffroy, Gavin Keech
- We are also indebted to The Noun Project, an invaluable resource for iconography on the web, and also where many of the above creators' icons can be found.
+ We are also indebted to The Noun Project, an invaluable resource for iconography on the web, and also where many of the above creators' icons can be found.
Metacodes:
- Legacy:Gavin Keech, Notthisbody
FivebyFive
+ Legacy:Gavin Keech, Notthisbody
FivebyFive
MEDIA
- Intro video: Notthisbody, Glenn Stillar
Tutorial videos: Notthisbody
+ Intro video: Notthisbody, Glenn Stillar
Tutorial videos: Notthisbody
OPEN SOURCE CREDITS
@@ -110,12 +110,12 @@
Communication
- Asana
- - Invision App *
- - Docracy *
- - Google Plus *
- - Hackpad *
- - Loomio *
- - Twitter *
+ - Invision App *
+ - Docracy *
+ - Google Plus *
+ - Hackpad *
+ - Loomio *
+ - Twitter *
- Hipchat
- Google Hangouts
- Vimeo
@@ -123,12 +123,12 @@
Design & Development
- - Github*
- - Pixelapse*
+ - Github*
+ - Pixelapse*
Documentation
- - Dropbox *
- - Google Drive *
+ - Dropbox *
+ - Google Drive *
- Toggl
Hosting
@@ -140,7 +140,7 @@
Support
-
+
diff --git a/app/views/layouts/_templates.html.erb b/app/views/layouts/_templates.html.erb
index d159c855..ef8ea19b 100644
--- a/app/views/layouts/_templates.html.erb
+++ b/app/views/layouts/_templates.html.erb
@@ -50,14 +50,14 @@
-
+
{{name}}
{{{screenshot}}}