Skip to content

UI updates #13

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.

Sign up for GitHub

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

Open
escapecode wants to merge 2 commits into
base: master
Choose a base branch
from
Open

UI updates #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8baf788
Major UI cosmetic changes
Aug 15, 2019
b7e1ee9
Manual CSS and HTML updated
Aug 15, 2019
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
16 changes: 9 additions & 7 deletions _css/button.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,9 @@ img.button:hover {
height: 24px !important;
line-height: 24px !important;
}

li.leaf uiLink.md-18 div, li.leaf .uiButton.md-18, li.leaf .window h1 .uiButton {
width: 36px !important;
}
.uiLink.md-36 div, .uiButton.md-36 {
font-size: 36px !important;
width: 36px !important;
Expand Down Expand Up @@ -256,12 +258,12 @@ img.button:hover {
margin: 0.25ex 5px;
height: 0.9em;

width: 1px;
background: gray;
background: -webkit-linear-gradient(transparent, gray, transparent); /* For Safari 5.1 to 6.0 */
background: -o-linear-gradient(transparent, gray, transparent); /* For Opera 11.1 to 12.0 */
background: -moz-linear-gradient(transparent, gray, transparent); /* For Firefox 3.6 to 15 */
background: linear-gradient(transparent, gray, transparent); /* Standard syntax */
width: 1em;
/* background: gray; */
/* background: -webkit-linear-gradient(transparent, gray, transparent); /* For Safari 5.1 to 6.0 */
/* background: -o-linear-gradient(transparent, gray, transparent); /* For Opera 11.1 to 12.0 */
/* background: -moz-linear-gradient(transparent, gray, transparent); /* For Firefox 3.6 to 15 */
/* background: linear-gradient(transparent, gray, transparent); /* Standard syntax */
}


Expand Down
34 changes: 30 additions & 4 deletions _css/manual.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@
src: url('../_fonts/MaterialIcons/MaterialIcons-Regular.ttf') format('truetype');
}

*, articles > * {
transition : all 0.1s linear 0s;
}

body {
font-family: 'Open Sans', sans-serif;
Expand Down Expand Up @@ -179,6 +182,7 @@ p > img.right {

body nav {
font-size: 90%;
display: none;
}

body nav ol {
Expand All @@ -197,22 +201,42 @@ p {
margin-bottom: 1.5em;
}

div#menu_header{
vertical-align: top;
background-color: green;
top: 0;
position: fixed;
color: white;
padding: .5em;
border-radius: 0 0 10px 0;
cursor: pointer;
}

#menu {
font-size: 90%;
position: fixed;
top: 0px;
left: 0px;
border-right: 2em solid #008000;
border-right: .5em solid #008000;
background-color: white;
height: 100%;


z-index: 10000;

width: 0px;
overflow: hidden;

white-space: nowrap;
}

#menu:hover {
#menu > ol > li {
font-size: 120%;
}

#menu > ol > li > ol {
font-size: 70%;
}

div#menu_header:hover + #menu, #menu:hover {
width: auto;
overflow-y: auto;
padding: 0 1em;
Expand All @@ -230,6 +254,8 @@ div.logo {

div.logo img {
border: none;
max-width: 400px;
width: 40%;
display: inline-block;
}

Expand Down
7 changes: 5 additions & 2 deletions _css/section.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ div.uiSection > div:first-child {
position: absolute;
width: 100%;
height: 100%;
border-bottom: 1px solid lightgrey;
}

/* row 1 */
.section-top-row1, .section-top-row2 {
font-size: 24px;
font-size: 1em;
background: white;
}

Expand All @@ -26,9 +27,10 @@ div.uiSection > div:first-child {
margin-left: 4px;
height: 100%;
float: left;
font-size: 1.2em;
}

.section-top-row1 .editor > *, .section-top-row2 div:first-child > * {
.section-top-row1 .editor > * {
vertical-align: middle;
}

Expand Down Expand Up @@ -62,6 +64,7 @@ div.uiSection > div:first-child {
color: lightgray;
font-size: 0.85em;
font-style: italic;
width: 10em;
}

.section-top-row2 .uiButton {
Expand Down
24 changes: 14 additions & 10 deletions _css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,14 +446,16 @@ label.checkbox {

.timeline {
position: absolute;
width: 100%;
width: calc(100% - 10px);
margin-left: 5px;
z-index: 200;
height: 1px;
height: 0;
cursor: pointer;

border-top: 2px solid transparent;
border-bottom: 2px solid transparent;
border-top: 3px dotted blue;
border-bottom: 3px dotted blue;
background-clip: content-box;
top : -5px;
}

.timeline:hover {
Expand All @@ -468,7 +470,7 @@ label.checkbox {
font-size: 75%;
transform: translate(0, -100%);
cursor: pointer;
color: gray;
color: blue;
}

.timeline .boundary:hover {
Expand All @@ -477,12 +479,14 @@ label.checkbox {

}

.timeline .left {
left: 0.5ex;
.timeline .left, .timeline {
left: 0ex;
top: -2px;
}

.timeline .right {
right: 0.5ex;
right: 0ex;
top: -2px;
}

.timeline .slider {
Expand All @@ -491,8 +495,8 @@ label.checkbox {
cursor: pointer;
width: 9px;
height: 9px;
background-color: white;
border: 1.5px solid #555;
background-color: lightblue;
border: 1.5px solid blue;
border-radius: 50%;

transform: translate(-50%, 0);
Expand Down
15 changes: 13 additions & 2 deletions _css/window.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,19 @@ table.keyframes td:first-child {
color: transparent;
width: 0.5em !important;
cursor: pointer;
border: 1px solid transparent;
border: 1px solid red;
}

table.keyframes tr.selected td:first-child {
background-color: green;
background: repeating-linear-gradient(
0deg,
white,
#00ff00 1px,
transparent 1px,
transparent 3px
);
border-color: #00ff00;
}

table.keyframes td:first-child:hover {
Expand All @@ -174,7 +186,6 @@ table.keyframes td:first-child:hover {
border-color: black;
}


table.gradients tr.selected {
background-color: #eee;
}
Expand Down
54 changes: 47 additions & 7 deletions anigenActual.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -971,10 +971,50 @@ anigenActual.prototype.getNodeIcon = function(element) {
case "animatetransform":
case "animatecolor":
if(validChildren) {
icon = "settings_applications";
icon = "directions_walk"
} else {
icon = "settings";
icon = "directions_run"
}

switch(element.getAttribute('type'))
{
case 'translate':
icon2 = "trending_up";
break;

case 'rotate':
icon2 = "refresh";
break;

case 'scale':
icon2 = "zoom_out_map";
break;

case 'skewX':
icon2 = "swap_horiz";
break;

case 'skewY':
icon2 = "swap_vert";
break;

default:
if (element.getAttribute('attributeName') == undefined && element.getAttribute('attributeName') == null)
{
icon2 = "";
}
else
{
icon2 = "text_format";
}
break;
}
if (element.nodeName.toLowerCase() == "animatemotion")
{
icon2 = "swap_calls";
}

icon = icon + icon2;
break;
case "svg":
case "g":
Expand All @@ -988,11 +1028,11 @@ anigenActual.prototype.getNodeIcon = function(element) {
name = element.getAttribute("inkscape:label")+'#'+name;
}
if(element.getAttribute("anigen:name")) {
icon = "folder_special";
icon = "filter_none";
name = element.getAttribute("anigen:name")+'#'+name;
}
if(element.getAttribute("anigen:type") == "animationState") {
icon = "fingerprint";
icon = "directions_walk";
}
if(element.getAttribute("anigen:type") == "animationGroup") {
icon = "settings_applications";
Expand All @@ -1018,15 +1058,15 @@ anigenActual.prototype.getNodeIcon = function(element) {
if(validChildren) {
icon = "star_border";
} else {
icon = "star";
icon = "star_border";
}

break;
default:
if(validChildren) {
icon = "label_outline";
icon = "star_outline";
} else {
icon = "label";
icon = "star_outline";
}
if(element.getAttribute("anigen:type") == "animatedViewbox") {
icon = "videocam";
Expand Down
Loading