diff --git a/app/assets/images/.DS_Store b/app/assets/images/.DS_Store index a709ceac..73a08ba1 100644 Binary files a/app/assets/images/.DS_Store and b/app/assets/images/.DS_Store differ diff --git a/app/assets/images/geometry2.png b/app/assets/images/geometry2.png new file mode 100644 index 00000000..d43966e0 Binary files /dev/null and b/app/assets/images/geometry2.png differ diff --git a/app/assets/images/leap_full_transparent.png b/app/assets/images/leap_full_transparent.png new file mode 100644 index 00000000..075611ae Binary files /dev/null and b/app/assets/images/leap_full_transparent.png differ diff --git a/app/assets/images/leap_metamaps.png b/app/assets/images/leap_metamaps.png new file mode 100644 index 00000000..1133b9c2 Binary files /dev/null and b/app/assets/images/leap_metamaps.png differ diff --git a/app/assets/images/leap_transparent.png b/app/assets/images/leap_transparent.png new file mode 100644 index 00000000..b6dade4a Binary files /dev/null and b/app/assets/images/leap_transparent.png differ diff --git a/app/assets/javascripts/src/Metamaps.js b/app/assets/javascripts/src/Metamaps.js index 03aebc32..e44dcb59 100644 --- a/app/assets/javascripts/src/Metamaps.js +++ b/app/assets/javascripts/src/Metamaps.js @@ -28,10 +28,10 @@ Metamaps.Settings = { synapses: { normal: '#888888', hover: '#888888', - selected: '#FFFFFF' + selected: '#aea9fd' }, topics: { - selected: '#FFFFFF' + selected: '#aea9fd' }, labels: { background: '#18202E', diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 5d6931c9..b50ef73d 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -78,7 +78,7 @@ html { } body { - background: #d8d9da url(shattered_@2X.png); + background: #d8d9da url(geometry2.png); font-family: 'din-medium', helvetica, sans-serif; color: #424242; -moz-osx-font-smoothing: grayscale; diff --git a/app/assets/stylesheets/clean.css b/app/assets/stylesheets/clean.css index daf51d34..ceb5405b 100644 --- a/app/assets/stylesheets/clean.css +++ b/app/assets/stylesheets/clean.css @@ -88,8 +88,8 @@ } .logo { - height: 37px; - background: url(TVWlogo.png) no-repeat center center; + height: 48px; + background: url(leap_transparent.png) no-repeat center center; } .bottomLinks { color: #9e9e9e; @@ -717,12 +717,12 @@ .homeTextWrapper .homeLogo { width: 460px; - height: 200px; - background: url(TVWmetamaps.png) no-repeat 0 0; + height: 212px; + background: url(leap_metamaps.png) no-repeat 0 0; } .homeText { - padding: 0 14px; + padding: 0 8px; font-size: 24px; text-align: justify; } @@ -739,15 +739,15 @@ #toMetamaps { display: inline-block; width: 170px; - height: 36px; + height: 45px; background: url(MetamapsLogo.png) no-repeat 0 0; - margin-bottom: -5px; + margin-bottom: 12px; } -#toTheValueWeb { +#toSynbioLeap { display: inline-block; width: 204px; - height: 25px; - background: url(TVWtext.png) no-repeat 0 0; + height: 60px; + background: url(leap_full_transparent.png) no-repeat 0 0; margin-left:54px; } diff --git a/app/views/layouts/_lightboxes.html.erb b/app/views/layouts/_lightboxes.html.erb index 952cae1b..6c33e707 100644 --- a/app/views/layouts/_lightboxes.html.erb +++ b/app/views/layouts/_lightboxes.html.erb @@ -19,20 +19,20 @@
PRIVATE BETA
2.6 (Catalpa)
-Dec 3, 2014
+June 4th, 2015
Metamaps.thevalueweb.org is a partnership between The Value Web and Treeship LLC, a venture of the Metamaps Open Value Network. It consists of a customized installation of the publicly available platform that resides at Metamaps.cc, that acts as a graph-based knowledge management tool for sharing, learning, and live facilitation applications internally within The Value Web.
+Leap.metamaps.cc is a partnership between SynBio LEAP and Metamaps.cc, a project of the Metamaps Open Value Network. It consists of a customized installation of the publicly available platform that resides at Metamaps.cc, that acts as a graph-based knowledge management tool for sharing, learning, and live facilitation applications internally within SynBio LEAP.
-The Value Web is an international non-profit association, based in Switzerland, focused on multi-sector/multi-stakeholder collaboration in transformational projects for a more sustainable, equitable world. We design and deliver collaborative engagements to support like-minded leaders and their organizations around the world.
+The Synthetic Biology Leadership Excellence Accelerator Program (LEAP) envisions catalyzing a next generation of leaders in biotechnology to drive the responsible development of the field. In addition to building a cadre of young professionals taking on leadership roles in the synthetic biology community, LEAP aims to create sustainable tools and mechanisms for engaging a broader range of practitioners in the societal role of biotechnology development.
Metamaps.cc is a free and open source web platform that enables individuals and communities to build and visualize their shared knowledge and unlock their collective intelligence. It is a tool to help connect people, resources and ideas with rich detail and weave those relationships into actionable insights and stories.
-Publicly launched in 2012, Metamaps.cc continues to be a constantly developing work in progress. The platform is evolving for a range of applications amidst a growing network of designers, developers, practitioners, entrepreneurs, and artists.
+Publicly launched in 2012, Metamaps.cc continues to be a constantly developing work in progress. The platform is evolving for a range of applications amidst a growing network of designers, researchers, developers, practitioners, entrepreneurs, and artists.
For general inquiries, send us an email at team@metamaps.cc.
@@ -74,10 +74,10 @@Metamaps.thevalueweb.org is a partnership between The Value Web and Treeship, Inc, a venture of the Metamaps Open Value Network. It consists of a customized installation of the publicly available platform that resides at Metamaps.cc, for use internally within The Value Web for increased collective intelligence within the network.
+Leap.metamaps.cc is a partnership between SynBio LEAP and Metamaps.cc, a project of the Metamaps Open Value Network. It consists of a customized installation of the publicly available platform that resides at Metamaps.cc, for use internally within SynBio LEAP for increased collective intelligence within the network.
Benjamin Brownell (Metamaps), Ishan Shapiro (Metamaps, Treeship), Sita Magnusson (The Value Web)
+Ishan Shapiro (Metamaps), Rachel Lawley (Further), Jeff Hamaoui (Further)