From 8ef56735bf72ef20b4cc682be7e814eccbb25046 Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Wed, 1 Oct 2014 16:23:59 -0400 Subject: [PATCH 1/4] switch metacode set styling complete --- app/assets/stylesheets/application.css | 15 +++++++++------ app/views/shared/_switchmetacodes.html.erb | 4 ++-- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index c4fc66b5..7963398b 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -1706,11 +1706,11 @@ float: left; } .ui-tabs-vertical .ui-tabs-nav li a { display: block; - width: 92%; - padding: 4% !important; + width: 100%; + padding: 4px 0 !important; } .ui-tabs-vertical .ui-tabs-panel { - padding: 5px !important; + padding: 0 !important; float: right; width: 388px; } @@ -1722,12 +1722,13 @@ float: left; line-height: 21px; border: none; background: none; -} -#metacodeSwitchTabs .setTitle { - + padding: 0; } #metacodeSwitchTabs .setDesc { margin-bottom: 5px; + font-family: 'din-medium', helvetica, sans-serif; + color: #424242; + font-size: 14px; } #switchMetacodes > p { margin: 16px 0 16px 0; @@ -1777,6 +1778,8 @@ float: left; background: none; font-size: 14px; line-height: 14px; + font-family: 'din-regular', helvetica, sans-serif; + color: #424242; } #metacodeSwitchTabs button.button { width: auto !important; diff --git a/app/views/shared/_switchmetacodes.html.erb b/app/views/shared/_switchmetacodes.html.erb index 238a83a3..42d1f59f 100644 --- a/app/views/shared/_switchmetacodes.html.erb +++ b/app/views/shared/_switchmetacodes.html.erb @@ -30,8 +30,8 @@ <% m.metacodes.sort{|x,y| x.name <=> y.name }.each_with_index do |m, index| %> <% @list += '
  • ' + m.name + '

    ' + m.name.downcase + '

    • ' %> <% end %> +

    <%= m.desc %>

    -

    <%= m.desc %>

    @@ -43,7 +43,7 @@
    <% end %>
    -

    Pick Your Own Metacodes

    +

    Choose Your Metacodes

    <% @list = '' %> <% Metacode.order("name").all.each_with_index do |m, index| %> <% if selectedSet == "custom" %> From 999dae34ea73df20212423b555cb75b8954abfde Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Wed, 1 Oct 2014 16:44:11 -0400 Subject: [PATCH 2/4] switched add link section on topic card to be without upload file for now --- app/assets/javascripts/src/Metamaps.js | 28 ++++++++------------------ 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/app/assets/javascripts/src/Metamaps.js b/app/assets/javascripts/src/Metamaps.js index 1cbb6f06..4232a0a8 100644 --- a/app/assets/javascripts/src/Metamaps.js +++ b/app/assets/javascripts/src/Metamaps.js @@ -683,8 +683,8 @@ Metamaps.TopicCard = { link: null }); $('.embeds').empty(); + $('#addLinkInput input').val(""); $('.attachments').removeClass('hidden'); - $('.addAttachment').show(); $('.CardOnGraph').removeClass('hasAttachment'); }, bindShowCardListeners: function (topic) { @@ -700,21 +700,9 @@ Metamaps.TopicCard = { Metamaps.Mapper.get(topic.get('user_id'), setMapperImage) // starting embed.ly - var addLinkFunc = function () { - var addLinkDiv =''; - var addLinkDesc ='Enter or paste a link'; - addLinkDiv+='
    '; - addLinkDiv+='
    '; - addLinkDiv+='
    '; - $('.addAttachment').hide(); - $('.attachments').append(addLinkDiv); - $('.showcard #addLinkReset').click(resetFunc); - $('.showcard #addLinkInput input').bind("paste keyup",inputEmbedFunc); - $('#addLinkInput input').focus(); - }; var resetFunc = function () { - $('.addLink').remove(); - $('.addAttachment').show(); + $('#addLinkInput input').val(""); + $('#addLinkInput input').focus(); }; var inputEmbedFunc = function (event) { @@ -734,7 +722,6 @@ Metamaps.TopicCard = { 'data-card-description': '0', href: text }).html(text); - $('.addLink').remove(); $('.attachments').addClass('hidden'); $('.embeds').append(embedlyEl); $('.embeds').append('
    '); @@ -749,6 +736,8 @@ Metamaps.TopicCard = { } }, 100); }; + $('#addLinkReset').click(resetFunc); + $('#addLinkInput input').bind("paste keyup",inputEmbedFunc); // initialize the link card, if there is a link if (topic.get('link') && topic.get('link') !== '') { @@ -760,7 +749,6 @@ Metamaps.TopicCard = { loader.show(); // Hidden by default embedly('card', document.getElementById('embedlyLink')); } - $('.showcard #addlink').click(addLinkFunc); var selectingMetacode = false; @@ -940,9 +928,9 @@ Metamaps.TopicCard = { } if (authorized) { - nodeValues.attachments = '
    '; - nodeValues.attachments += ''; - nodeValues.attachments += '
    Upload a file
    '; + nodeValues.attachments = '
    '; + nodeValues.attachments += '
    '; + nodeValues.attachments += '
    '; } else { nodeValues.attachmentsHidden = 'hidden'; nodeValues.attachments = ''; From b577f4fd197b0d72cbc58506f8ccf860ed4e80da Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Wed, 1 Oct 2014 17:15:35 -0400 Subject: [PATCH 3/4] improved z-indexes --- app/assets/javascripts/src/Metamaps.js | 2 +- app/assets/stylesheets/application.css | 2 +- app/assets/stylesheets/base.css | 2 +- app/assets/stylesheets/clean.css | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/src/Metamaps.js b/app/assets/javascripts/src/Metamaps.js index 4232a0a8..da3355e4 100644 --- a/app/assets/javascripts/src/Metamaps.js +++ b/app/assets/javascripts/src/Metamaps.js @@ -1494,7 +1494,7 @@ Metamaps.Realtime = { }); $('body').click(self.close); - self.socket = io.connect('http://gentle-savannah-1303.herokuapp.com'); + self.socket = io.connect('http://localhost:5001'); self.startActiveMap(); }, toggleBox: function (event) { diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 7963398b..3ffe8cca 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -2281,7 +2281,7 @@ float: left; position:fixed; top:50%; left:50%; - z-index: 4; + z-index: 1; } .collabCompass:hover p { diff --git a/app/assets/stylesheets/base.css b/app/assets/stylesheets/base.css index 3725297e..e59634af 100644 --- a/app/assets/stylesheets/base.css +++ b/app/assets/stylesheets/base.css @@ -15,7 +15,7 @@ background-color:#F5F5F5; text-align: left; overflow: visible; - z-index:14000; + z-index:2; 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); diff --git a/app/assets/stylesheets/clean.css b/app/assets/stylesheets/clean.css index a586d6ba..c952bfa2 100644 --- a/app/assets/stylesheets/clean.css +++ b/app/assets/stylesheets/clean.css @@ -267,14 +267,14 @@ left: 156px; } .sidebarSearch .tt-dropdown-menu .minimizeResults, .sidebarSearch .tt-dropdown-menu .maximizeResults { - float: right; width: 32px; height: 32px; background-image: url(arrowpermswhite_sprite.png); background-repeat: no-repeat; cursor: pointer; - margin-top: 5px; - margin-right: 20px; + position: absolute; + top: 5px; + left: 410px; } .sidebarSearch .tt-dropdown-menu .minimizeResults { background-position-x: 0; From a1925b357349120d1490709d08a179582a06e996 Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Wed, 1 Oct 2014 17:20:02 -0400 Subject: [PATCH 4/4] heroku --- app/assets/javascripts/src/Metamaps.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/src/Metamaps.js b/app/assets/javascripts/src/Metamaps.js index da3355e4..4232a0a8 100644 --- a/app/assets/javascripts/src/Metamaps.js +++ b/app/assets/javascripts/src/Metamaps.js @@ -1494,7 +1494,7 @@ Metamaps.Realtime = { }); $('body').click(self.close); - self.socket = io.connect('http://localhost:5001'); + self.socket = io.connect('http://gentle-savannah-1303.herokuapp.com'); self.startActiveMap(); }, toggleBox: function (event) {