diff --git a/.gitignore b/.gitignore index cf3d59bc..cd683d45 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,5 @@ db/*.sqlite3 # Ignore all logfiles and tempfiles. log/*.log tmp + +.DS_Store \ No newline at end of file diff --git a/app/assets/images/.DS_Store b/app/assets/images/.DS_Store new file mode 100644 index 00000000..5008ddfc Binary files /dev/null and b/app/assets/images/.DS_Store differ diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 8eaea083..f7a3ba5a 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -2050,20 +2050,65 @@ float: left; } #cheatSheet .csItem { margin: 5px 0; - font-size: 15px; + font-size: 14px; line-height: 18px; + font-family: 'din-regular'; } + +#cheatSheet .csItem a { + color: #c04f4f; +} + #cheatSheet .csItem img { display: inline-block; - margin: 0 2px; + margin-bottom: 10px; } #cheatSheet .csTitle { + font-weight: bold; + } #cheatSheet .indented { margin-left: 15px; } +#zoomIn { + background: #424242 url(zoom_sprite.png) no-repeat; + width: 22px; + height: 22px; + display: inline-block; + background-position: -37px -5px; + border-radius: 2px; + margin: 0 4px; + position: relative; + top: 3px; +} + +#zoomOut { + background: #424242 url(zoom_sprite.png) no-repeat; + width: 22px; + height: 22px; + display: inline-block; + background-position: -37px -37px; + border-radius: 2px; + margin: 0 4px; + position: relative; + top: 3px; +} + +#centerMap { + background: #424242 url(extents_sprite.png) no-repeat; + width: 22px; + height: 22px; + display: inline-block; + background-position: -5px -5px; + border-radius: 2px; + margin: 0 4px; + position: relative; + top: 3px; + +} + #helpWrapper { background: none; border: none; @@ -2096,7 +2141,17 @@ float: left; } #quickReference ul { width: 150px; + text-transform: uppercase; + font-size: 14px; + line-height: 14px; + font-family: din-medium; + } + +#quickReference ul li { + padding-bottom: 16px; +} + #quickReference li.ui-state-active a { color: #00BCD4; } diff --git a/app/views/shared/_cheatsheet.html.erb b/app/views/shared/_cheatsheet.html.erb index 338df912..10d8c2d2 100644 --- a/app/views/shared/_cheatsheet.html.erb +++ b/app/views/shared/_cheatsheet.html.erb @@ -14,7 +14,6 @@
-
Alt + click on topic icon: recenter topics around chosen topic
-
Right-click + 'center this topic': recenter topics around chosen topic
+
Recenter Topics around chosen Topic: Alt + click on the topic OR Right-click + 'center this topic'
+
@@ -37,83 +38,89 @@
Esc: Hides auto-suggestion results
Enter: create a new topic
Gear Icon: open up metacode settings
+

Learn More
- Open topic card: double-click on topic icon + Open 'Topic' card: Double-click on topic icon
- Move topic card: click + drag on topic card metacode + Move 'Topic' card: Click and drag on topic card metacode
- Change/edit metacode: mouse over metacode icon, then click on solid colored bar + Change/edit metacode: Mouse over metacode icon, then click on solid colored bar
- Edit topic title, description, link: click on text in respective area + Edit Topic title, description, link: Click on text in respective area
- Save topic title, description, link: hit enter + Save Topic title, description, link: Hit enter
- Change topic permission: click on 'permission' icon (only for topic creator) + Change Topic permission: Click on 'Permission' icon (only for topic creator)
- Open topic view: click on icon within topic card bar + Open Topic view: Click on icon within topic card bar
- Close topic card: click on canvas + Close 'Topic' card: Click on canvas
- Open context menu: right-click on topic icon + Open 'Context Menu': Right-click on topic icon
*Hide/Remove/Delete topic within context menu
+

Learn More
+
-
Right-click & drag from one topic to another: open create synapse prompt
+
Open 'Create Synapse' prompt: Right-click & drag from one topic to another
Enter: Create synapse
*You do not have to add a description
-
Right-click + drag from topic to open canvas: create new topic with synapse
+
Create new Topic with Synapse: Right-click + drag from topic to open canvas
Enter: Create topic
Enter: Create synapse
+

Learn More
+
-
Open synapse card:double-click on synapse
-
Edit synapse description: click on current description text
-
Save synapse description: hit enter
-
Edit directionality: select appropriate arrow boxes
-
Change synapse permission: click on 'permission' icon (only for synapse creator)
-
Right-click on synapse: open context menu
+
Open 'Synapse' card: Double-click on Synapse
+
Edit Synapse description: Click on current description text
+
Save Synapse description: Hit enter
+
Edit directionality: Select appropriate arrow boxes
+
Change synapse permission: Click on 'permission' icon (only for synapse creator)
+
Open 'Context Menu': Right-click on Synapse
*Hide/Remove/Delete synapse within context menu
+

Learn More
+
-
Click + drag: move around canvas
-
Scroll: zoom in/out
-
Refresh page: center map
+
Move around Canvas: Click and drag
+
Zoom in/out: Scroll OR click on
&
+
Center Map: Click
OR Refresh page
+

Learn More
+
-
Click on topic icon: select/deselect topic
-
Click on synapse: select/deselect synapse
-
Shift + click: select multiple topics / synapses
-
Shift + click + drag on canvas: make selection box, select multiple topics
-
Click + drag on selected topic(s): move all selected topics & synapses
-
Right-click on selected topic(s): open context menu
+
Select/Deselect Topic: Click on topic icon
+
Select/Deselect Synapse: Click on synapse
+
Select multiple Topics/Synapses: Shift + click
+
Make Selection box, select multiple Topics: Shift + click + drag on Canvas
+
Move all selected Topics & Synapses: Click + drag on selected Topic(s)
+
Open 'Context Menu': Right-click on selected topic(s)
*Hide/Remove/Delete/Change permissions of multiple topics & synapses within context menu
-
Click on background: deselect all topics & synapses
-
Esc: deselect all topics & synapses
+
Deselect all topics & Synapses: Click on background or Esc
-
Ctrl + /: open search prompt
-
Esc: close search prompt
-
Type into the search prompt: search for topics, maps, & mappers
-
Click on search result: open in new tab
+
Open 'Search' prompt: Ctrl + /
+
Close 'Search' prompt: Esc
<% if controller_name == "maps" && action_name == "show" %> -
Click "+" on a topic result: add to current map
+
Add to current Map: Click "+" on a topic result
<% end %>
Search by metacode: type "[name of metacode]:", then your search query. i.e. idea:create...
Search for map: type "map:", then your search query. i.e. map:exploring...
diff --git a/metacode_backgrounds.css b/metacode_backgrounds.css deleted file mode 100644 index adf69d4e..00000000 --- a/metacode_backgrounds.css +++ /dev/null @@ -1,120 +0,0 @@ -.mbgAction { - background-color: #bd6c85 !important; -} -.mbgActivity { - background-color: #6ebf65 !important; -} -.mbgArgument { - background-color: #7FAEFD !important; -} -.mbgBizarre { - background-color: #bdb25e !important; -} -.mbgCatalyst { - background-color: #EF8964 !important; -} -.mbgClosed { - background-color: #ABB49F !important; -} -.mbgCon { - background-color: #CF7C74 !important; -} -.mbgDecision { - background-color: #cca866 !important; -} -.mbgExample { - background-color: #598559 !important; -} -.mbgExperience { - background-color: #BE995F !important; -} -.mbgForesight { - background-color: #b0b0b0 !important; -} -.mbgFutureDev { - background-color: #25A17F !important; -} -.mbgGoodPractice { - background-color: #BD9E86 !important; -} -.mbgGroup { - background-color: #7076BC !important; -} -.mbgIdea { - background-color: #c4bc5e !important; -} -.mbgImplication { - background-color: #83DECA !important; -} -.mbgInsight { - background-color: #B074AD !important; -} -.mbgIntention { - background-color: #baeaff !important; -} -.mbgKnowledge { - background-color: #60acf7 !important; -} -.mbgList { - background-color: #B7A499 !important; -} -.mbgLocation { - background-color: #abd9a7 !important; -} -.mbgMovieMap { - background-color: #a5a0de !important; -} -.mbgNote { - background-color: #a389a1 !important; -} -.mbgOpenIssue { - background-color: #9bbf71 !important; -} -.mbgOpinion { - background-color: #54a19d !important; -} -.mbgOpportunity { - background-color: #889F64 !important; -} -.mbgPerson { - background-color: #de925f !important; -} -.mbgPlatform { - background-color: #21C8FE !important; -} -.mbgPro { - background-color: #89b879 !important; -} -.mbgProblem { - background-color: #99cfc4 !important; -} -.mbgQuestion { - background-color: #709899 !important; -} -.mbgReference { - background-color: #A7A7A7 !important; -} -.mbgRequirement { - background-color: #d2a7d4 !important; -} -.mbgResearch { - background-color: #CD8E89 !important; -} -.mbgResource { - background-color: #c98c63 !important; -} -.mbgRole { - background-color: #a8595d !important; -} -.mbgTask { - background-color: #2f89ba !important; -} -.mbgTool { - background-color: #828282 !important; -} -.mbgTrajectory { - background-color: #b3953d !important; -} -.mbgWildcard { - background-color: #73c7de !important; -} \ No newline at end of file diff --git a/public/404.html b/public/404.html index c68570fb..ae2713cb 100644 --- a/public/404.html +++ b/public/404.html @@ -54,12 +54,17 @@ padding-top: 150px; } .picture { - width: 500px; + width: 450px; + height: 450px; + border: 10px solid #424242; + border-radius: 225px; + -webkit-border-radius: 225px; + -moz-border-radius: 225px; + background: url(/assets/monkeyselfie.jpg) no-repeat; float: left; - } - - .picture img { - width: 500px; + background-position:50% 20%; + background-size: 100%; + margin-top: 162px; } .wrapper { @@ -68,10 +73,11 @@ } .button { - display: inline-block; + display: block; width: 220px; height: 14px; padding: 16px 0; + margin-bottom: 16px; text-align: center; border-radius: 2px; font-size: 14px; @@ -93,7 +99,7 @@ .exploreFeaturedCTA { background-color: #a354cd; - margin-right: 16px; + margin-bottom: 16px; } .exploreFeaturedCTA:hover { @@ -117,7 +123,6 @@
-
diff --git a/test/fixtures/metacodes.yml b/test/fixtures/metacodes.yml index 230bef78..c1244d02 100644 --- a/test/fixtures/metacodes.yml +++ b/test/fixtures/metacodes.yml @@ -12,155 +12,194 @@ one: two: name: Activity icon: /assets/icons/activity.png + color: #6ebf65 three: name: Bizarre icon: /assets/icons/bizarre.png + color: #BDB25E four: name: Catalyst icon: /assets/icons/catalyst.png + color: #EF8964 five: name: Closed icon: /assets/icons/closed.png + color: #ABB49F six: name: Experience icon: /assets/icons/experience.png + color: #BE995F seven: name: Future Dev icon: /assets/icons/futuredev.png + color: #25A17F eight: name: Group icon: /assets/icons/group.png + color: #7076BC nine: name: Idea icon: /assets/icons/idea.png + color: #C4BC5E ten: name: Implication icon: /assets/icons/implication.png + color: #83DECA eleven: name: Insight icon: /assets/icons/insight.png + color: #B074AD twelve: name: Intention icon: /assets/icons/intention.png + color: #BAEAFF thirteen: name: Knowledge icon: /assets/icons/knowledge.png + color: #60ACF7 fourteen: name: Location icon: /assets/icons/location.png + color: #ABD9A7 fifteen: name: Open Issue icon: /assets/icons/openissue.png + color: #9BBF71 sixteen: name: Opinion icon: /assets/icons/opinion.png + color: #54A19D seventeen: name: Opportunity icon: /assets/icons/opportunity.png + color: #889F64 eighteen: name: Person icon: /assets/icons/person.png + color: #DE925F nineteen: name: Platform icon: /assets/icons/platform.png + color: #21C8FE twenty: name: Problem icon: /assets/icons/problem.png + color: #99CFC4 twenty-one: name: Question icon: /assets/icons/question.png + color: #709899 twenty-two: name: Reference icon: /assets/icons/reference.png + color: #A7A7A7 twenty-three: name: Requirement icon: /assets/icons/requirement.png + color: #D2A7D4 twenty-four: name: Resource - icon: /assets/icons/resource.png + icon: /assets/icons/resource.png + color: #C98C63 twenty-five: name: Role icon: /assets/icons/role.png + color: #A8595D twenty-six: name: Task icon: /assets/icons/task.png + color: #2F89BA twenty-seven: name: Tool icon: /assets/icons/tool.png + color: #828282 twenty-eight: name: Trajectory icon: /assets/icons/trajectory.png + color: #B3953D twenty-nine: name: Argument icon: /assets/icons/argument.png + color: #7FAEFD thirty: name: Con icon: /assets/icons/con_icon.png + color: #CF7C74 thirty-one: name: Decision icon: /assets/icons/decision.png + color: #CCA866 thirty-two: name: Example icon: /assets/icons/example.png + color: #598559 thirty-three: name: Foresight icon: /assets/icons/foresight.png + color: #B0B0B0 thirty-four: name: Good Practice icon: /assets/icons/goodpractice.png + color: #BD9E86 thirty-five: name: List icon: /assets/icons/list.png + color: #B7A499 thirty-six: name: Movie Map icon: /assets/icons/moviemap.png + color: #A5A0DE thirty-seven: name: Note icon: /assets/icons/note.png + color: #A389A1 thirty-eight: name: Pro icon: /assets/icons/pro.png + color: #89B879 thirty-nine: name: Research icon: /assets/icons/research.png + color: #CD8E89 forty: name: Wildcard icon: /assets/icons/wildcard.png + color: #73C7DE