diff --git a/app/assets/images/homepage-bg.png b/app/assets/images/homepage-bg.png deleted file mode 100644 index 9bfb1040..00000000 Binary files a/app/assets/images/homepage-bg.png and /dev/null differ diff --git a/app/assets/images/homepage_bg.png b/app/assets/images/homepage_bg.png new file mode 100644 index 00000000..594bd17c Binary files /dev/null and b/app/assets/images/homepage_bg.png differ diff --git a/app/assets/images/mm-homepage-bg-image.png b/app/assets/images/mm-homepage-bg-image.png deleted file mode 100644 index 9bfb1040..00000000 Binary files a/app/assets/images/mm-homepage-bg-image.png and /dev/null differ diff --git a/app/assets/images/user.png b/app/assets/images/user.png old mode 100755 new mode 100644 index 67239052..e7b41d48 Binary files a/app/assets/images/user.png and b/app/assets/images/user.png differ diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index df4bba62..6fb092b2 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; diff --git a/app/assets/stylesheets/base.css b/app/assets/stylesheets/base.css index f8c6e075..f586d26b 100644 --- a/app/assets/stylesheets/base.css +++ b/app/assets/stylesheets/base.css @@ -608,7 +608,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; diff --git a/app/assets/stylesheets/clean.css b/app/assets/stylesheets/clean.css index 22b6fab4..b09f1cb6 100644 --- a/app/assets/stylesheets/clean.css +++ b/app/assets/stylesheets/clean.css @@ -213,14 +213,14 @@ 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); } @@ -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 { @@ -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 { @@ -806,12 +798,11 @@ background-color: #4fb5c0; } .callToAction .learnMoreCTA:hover { - background-color: #9150bc; + background-color: #3d8e8e; } .fullWidthWrapper.withPartners { - background: url(homepage-bg.png) no-repeat center -332px; - background-size: 1430px 1072px; + background: url(homepage_bg.png) no-repeat center -300px; } .homeWrapper.homePartners { padding: 64px 0 100px; diff --git a/app/views/layouts/_lightboxes.html.erb b/app/views/layouts/_lightboxes.html.erb index 0aa38302..e3b75001 100644 --- a/app/views/layouts/_lightboxes.html.erb +++ b/app/views/layouts/_lightboxes.html.erb @@ -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

- + -

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:

- +

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