Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Submittal for Ben Davis and Brian Joerger #68

Open
wants to merge 25 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
bf0b261
added tabs to be filled with content
Joerger Oct 12, 2017
13106bb
Some layout changes to the original code for this page
Oct 12, 2017
e46f693
Some more layout changes
Oct 12, 2017
150129d
Made the youtube video on the homepage responsive
Oct 12, 2017
f0f594c
added rows with id's for each tab
Joerger Oct 12, 2017
ecefc88
Merge branch 'master' of github.com:bdavs3/paradixm
Joerger Oct 12, 2017
0749636
revised and edited the overview
Joerger Oct 12, 2017
a232526
Rewrote the OSX section and added some jquery stuff
Oct 12, 2017
edab1e2
Change tab fade settings
Oct 12, 2017
90159aa
changes to the tab layout
Oct 12, 2017
e1f69e4
added macOS_7 screenshots
Joerger Oct 12, 2017
1706957
corrected operating system names
Joerger Oct 12, 2017
cfe4f1f
updating to newest version of code (I was testing some things)
Oct 12, 2017
5dcf7e5
removed carousels and replaced them with different items
Oct 12, 2017
4a1cda3
minor adjustments
Joerger Oct 12, 2017
5b2dd72
minor adjustments
Joerger Oct 12, 2017
3e0961b
Had to list out images because of bootstrap4 bugs (can't use carousel…
Oct 12, 2017
3130206
fixed gif format
Joerger Oct 12, 2017
f8fac8a
Merge branch 'master' of github.com:bdavs3/paradixm
Joerger Oct 12, 2017
de40ceb
started MacOS_7 page, added back MacOSX picture
Oct 13, 2017
4f42ca4
finished MacOS 7 page
Joerger Oct 13, 2017
815dd22
added references and fixed spacing
Joerger Oct 13, 2017
33c1fb1
Populated the io11 page
Oct 13, 2017
b5cba8e
Merge branch 'master' of https://github.com/bdavs3/paradixm
Oct 13, 2017
cb36b2c
finished up the ios11 section, as well as added a bunch of images and…
Oct 13, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
_site/
.sass-cache/
**/.DS_Store
_site/
.sass-cache/
**/.DS_Store
44 changes: 22 additions & 22 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
The MIT License (MIT)

Copyright (c) 2015 John David N. Dionisio

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

The MIT License (MIT)
Copyright (c) 2015 John David N. Dionisio
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# paradixm
A survey of known user interface elements at the micro and macro levels.

# paradixm
A survey of known user interface elements at the micro and macro levels.
4 changes: 2 additions & 2 deletions site/.bundle/config
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
BUNDLE_WITHOUT: "production"
---
BUNDLE_WITHOUT: "production"
10 changes: 5 additions & 5 deletions site/.gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
_site/
.sass-cache/
_gh_pages
.DS_Store
node_modules/
_site/
.sass-cache/
_gh_pages
.DS_Store
node_modules/
36 changes: 18 additions & 18 deletions site/_config.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
title: Paradixm
email: [email protected]
description: A survey of known user interface elements at the micro and macro levels
twitter_username: zugzugglug
github_username: dondi

# Dependencies
markdown: kramdown
highlighter: rouge

# Permalinks
permalink: none

# Server
destination: _gh_pages
host: 127.0.0.1
baseurl: /paradixm
encoding: UTF-8
title: Paradixm
email: [email protected]
description: A survey of known user interface elements at the micro and macro levels
twitter_username: zugzugglug
github_username: dondi
# Dependencies
markdown: kramdown
highlighter: rouge
# Permalinks
permalink: none
# Server
destination: _gh_pages
host: 127.0.0.1
baseurl: /paradixm
encoding: UTF-8
204 changes: 102 additions & 102 deletions site/_data/catalog.yml
Original file line number Diff line number Diff line change
@@ -1,102 +1,102 @@
- group: Atomic
components:
- name: Button
path: button

- name: Menu
path: menu

- name: Radio Button
path: radio-button

- name: Check Box
path: check-box

- name: String Input
path: string-input

- name: Slider
path: slider

- name: Command Loop
path: command-loop

- group: Structured
components:
- name: Date & Time
path: date-and-time

- name: List
path: list

- name: Map
path: map

- name: Media
path: media

- name: Search
path: search

- name: Table
path: table

- name: Tree
path: tree

- name: Web
path: web

- group: Behavior
components:
- name: Drag & Drop
path: drag-and-drop

- name: Resizing
path: resizing

- name: Rotating
path: rotating

- name: Selecting
path: selecting

- name: Scrolling
path: scrolling

- name: Zooming
path: zooming

- group: Composite
components:
- name: Modal View
path: modal-view

- name: View Switcher
path: view-switcher

- name: Split View
path: split-view

- name: Macro View
path: macro-view

- group: Environment
components:
- name: Information Transfer
path: information-transfer

- name: Login/Unlock
path: login-unlock

- name: Persistent Storage
path: storage

- name: Task Launcher
path: task-launcher

- name: Task Switcher
path: task-switcher

- name: Window
path: window
- group: Atomic
components:
- name: Button
path: button
- name: Menu
path: menu
- name: Radio Button
path: radio-button
- name: Check Box
path: check-box
- name: String Input
path: string-input
- name: Slider
path: slider
- name: Command Loop
path: command-loop
- group: Structured
components:
- name: Date & Time
path: date-and-time
- name: List
path: list
- name: Map
path: map
- name: Media
path: media
- name: Search
path: search
- name: Table
path: table
- name: Tree
path: tree
- name: Web
path: web
- group: Behavior
components:
- name: Drag & Drop
path: drag-and-drop
- name: Resizing
path: resizing
- name: Rotating
path: rotating
- name: Selecting
path: selecting
- name: Scrolling
path: scrolling
- name: Zooming
path: zooming
- group: Composite
components:
- name: Modal View
path: modal-view
- name: View Switcher
path: view-switcher
- name: Split View
path: split-view
- name: Macro View
path: macro-view
- group: Environment
components:
- name: Information Transfer
path: information-transfer
- name: Login/Unlock
path: login-unlock
- name: Persistent Storage
path: storage
- name: Task Launcher
path: task-launcher
- name: Task Switcher
path: task-switcher
- name: Window
path: window
22 changes: 11 additions & 11 deletions site/_includes/footer.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<footer class="site-footer">
</footer>

<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js"
integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>

<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.11.0/umd/popper.min.js"
integrity="sha384-b/U6ypiBEHpOf/4+1nzFpr53nxSS+GLCkfwBdFNTxtclqqenISfwAzpKaMNFNmj4" crossorigin="anonymous"></script>

<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/js/bootstrap.min.js"
integrity="sha384-h0AbiXch4ZDo7tp9hKZ4TsHbi047NrKGLO3SEJAg45jXxnGIfYzk4Si90RDIqNm1" crossorigin="anonymous"></script>
<footer class="site-footer">
</footer>
<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js"
integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.11.0/umd/popper.min.js"
integrity="sha384-b/U6ypiBEHpOf/4+1nzFpr53nxSS+GLCkfwBdFNTxtclqqenISfwAzpKaMNFNmj4" crossorigin="anonymous"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/js/bootstrap.min.js"
integrity="sha384-h0AbiXch4ZDo7tp9hKZ4TsHbi047NrKGLO3SEJAg45jXxnGIfYzk4Si90RDIqNm1" crossorigin="anonymous"></script>
34 changes: 17 additions & 17 deletions site/_includes/head.html
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">

<title>{% if page.title %}{{ page.title }} - {% endif %}{{ site.title }}</title>
<meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">

<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css"
integrity="sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M" crossorigin="anonymous">

<style>
.component-nav {
min-height: 360px;
}
</style>
</head>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>{% if page.title %}{{ page.title }} - {% endif %}{{ site.title }}</title>
<meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css"
integrity="sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M" crossorigin="anonymous">
<style>
.component-nav {
min-height: 360px;
}
</style>
</head>
Loading