Skip to content
Permalink
Browse files

authors list working and new icons

  • Loading branch information...
EdwardBock committed Oct 8, 2015
1 parent 9c84fd6 commit c9f9665120a24b8512ca64538047c5ef22a2a3d8
@@ -1,9 +1,13 @@
@charset "UTF-8";
/* **************
Dimensions
****************/
/**************
* index stack
***************/
/**
* transitions
*/
.grid-all-wrapper,
.grid-editor-wrapper {
font-family: "OpenSans", sans-serif;
@@ -147,6 +151,152 @@ h3 {
/* Uncomment for 3D effect */
/* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */ }

/**
* like they come from fontello
*/
.icon-cog:before {
content: '\e800'; }

/* '' */
.icon-check:before {
content: '\e801'; }

/* '' */
.icon-cancel:before {
content: '\e802'; }

/* '' */
.icon-minus:before {
content: '\e803'; }

/* '' */
.icon-plus:before {
content: '\e804'; }

/* '' */
.icon-link:before {
content: '\e805'; }

/* '' */
.icon-eye:before {
content: '\e806'; }

/* '' */
.icon-pencil:before {
content: '\e807'; }

/* '' */
.icon-trash:before {
content: '\e808'; }

/* '' */
.icon-shareable:before {
content: '\e809'; }

/* '' */
.icon-right-dir:before {
content: '\e80a'; }

/* '' */
.icon-ccw:before {
content: '\e80b'; }

/* '' */
.icon-back-in-time:before {
content: '\e80c'; }

/* '' */
.icon-brush:before {
content: '\e80d'; }

/* '' */
.icon-dot-3:before {
content: '\e80e'; }

/* '' */
.icon-megaphone:before {
content: '\e80f'; }

/* '' */
.icon-recycle:before {
content: '\e810'; }

/* '' */
.icon-flow-tree:before {
content: '\e811'; }

/* '' */
.icon-lock-open-alt:before {
content: '\e812'; }

/* '' */
.icon-lock:before {
content: '\e813'; }

/* '' */
.icon-lock-open:before {
content: '\e814'; }

/* '' */
.icon-clock:before {
content: '\e815'; }

/* '' */
.icon-picture:before {
content: '\e816'; }

/* '' */
.icon-grid-2x2:before {
content: '\e817'; }

/* '' */
.icon-grid-3x3:before {
content: '\e818'; }

/* '' */
.icon-list-numbered:before {
content: '\e819'; }

/* '' */
.icon-list-bullet:before {
content: '\e81a'; }

/* '' */
.icon-chat:before {
content: '\e81b'; }

/* '' */
.icon-plus-squared:before {
content: '\e81c'; }

/* '' */
.icon-minus-squared:before {
content: '\e81d'; }

/* '' */
.icon-cancel-squared:before {
content: '\e81e'; }

/* '' */
.icon-beaker:before {
content: '\e81f'; }

/* '' */
.icon-filter:before {
content: '\e820'; }

/* '' */
.icon-hourglass:before {
content: '\e821'; }

/* '' */
.icon-github-circled:before {
content: '\e822'; }

/* '' */
/**
* rename to function names
*/
.icon-link:before {
content: '\e805'; }

@@ -220,9 +370,9 @@ h3 {
position: fixed;
width: 260px;
z-index: 91;
right: -500px;
-webkit-transition: all 0.3s;
transition: all 0.3s; }
right: -300px;
-webkit-transition: all 0.1337s ease;
transition: all 0.1337s ease; }
.grid-authors-wrapper.is-active {
right: 0px; }
.grid-authors-wrapper .grid-authors {
@@ -238,8 +388,6 @@ h3 {
text-transform: uppercase;
font-weight: bold;
height: 45px;
-webkit-transition: all 0.1337s ease;
transition: all 0.1337s ease;
position: relative;
color: white;
background-color: #3ac5d9; }
@@ -1188,8 +1336,8 @@ h3 {
width: 260px;
border-left: 1px solid rgba(176, 186, 194, 0.7);
z-index: 90;
-webkit-transition: all 0.3s;
transition: all 0.3s; }
-webkit-transition: all 0.1337s ease;
transition: all 0.1337s ease; }
.is-active-authors .grid-tool-elements {
right: -500px; }

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -4,6 +4,9 @@ Dimensions
/**************
* index stack
***************/
/**
* transitions
*/
/*
* Containers table
*/

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
BIN +3.11 KB (140%) fonts/grid-font/grid_font.eot 100755 → 100644
Binary file not shown.
22 fonts/grid-font/grid_font.svg 100755 → 100644
@@ -1,7 +1,7 @@
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg xmlns="http://www.w3.org/2000/svg">
<metadata>Copyright (C) 2014 by original authors @ fontello.com</metadata>
<metadata>Copyright (C) 2015 by original authors @ fontello.com</metadata>
<defs>
<font id="grid_font" horiz-adv-x="1000" >
<font-face font-family="grid_font" font-weight="400" font-stretch="normal" units-per-em="1000" ascent="850" descent="-150" />
@@ -24,9 +24,23 @@
<glyph glyph-name="megaphone" unicode="&#xe80f;" d="m792 500q58-138 67-258t-39-140q-28-12-61 3t-65 40-99 41-149 8q-28-4-42-19t-6-37q22-56 46-108 4-10 24-22t24-20q14-34-22-46-50-22-102-40-30-10-54 42-32 76-58 132-6 12-34 17t-46 31q-30-10-38-14-34-12-74 12t-54 60q-17 32-5 79t43 61q126 52 213 108t124 103 59 92 25 78 15 59 36 36q48 20 130-70t142-228z m-28-300q8 4 10 38t-11 98-41 128q-28 66-67 123t-67 84-36 23-10-42 10-105 40-133 68-119 68-76 36-19z" horiz-adv-x="860" />
<glyph glyph-name="recycle" unicode="&#xe810;" d="m467 198l-9-206-1-12-234 16q-20 2-38 18t-26 36q-6 15-8 31t2 36 7 31 12 36 11 29q43-6 284-15z m-216 327l100-212-82 52q-35-41-62-81t-41-70-22-53-10-35l-2-11-106 199q-10 14-10 31t3 26l4 10q20 35 64 105l-78 48z m686-289l-104-200q-7-16-21-26t-24-12l-10-2q-40-4-122-7l4-91-128 205 118 202 3-97q95-9 158-3t95 19z m-438 516q-26-35-147-243l-177 104-11 7 126 199q11 17 33 25t45 5q13-1 27-6t23-12 23-18 21-20 20-22 17-19z m366-172l118-202q10-21 7-42t-15-42q-7-11-19-20t-21-16-27-12-26-9-29-8-25-7q-19 40-148 244l174 108z m-80 127l79 46-122-208-234 11 84 48q-19 49-42 92t-42 69-36 45-26 26l-10 7 226 0q18 1 33-6t22-16l6-8q21-34 62-106z" horiz-adv-x="1000" />
<glyph glyph-name="flow-tree" unicode="&#xe811;" d="m868 112q72-34 72-112 0-50-35-85t-85-35-85 35-35 85q0 78 72 112l0 114q0 78-76 78l-100 0q-44 0-78 12l0-204q72-34 72-112 0-50-35-85t-85-35-85 35-35 85q0 78 72 112l0 204q-30-12-76-12l-100 0q-34 0-53-19t-22-33-3-26l0-114q72-34 72-112 0-50-35-85t-85-35-85 35-35 85q0 78 72 112l0 114q0 64 43 118t131 54l100 0q76 0 76 52l0 140q-72 34-72 110 0 50 35 85t85 35 85-35 35-85q0-76-72-110l0-140q0-52 78-52l100 0q86 0 129-54t43-118l0-114z m-678-112q0 30-21 50t-49 20-48-20-20-50q0-28 20-48t48-20 49 20 21 48z m212 700q0-28 20-48t48-20 49 20 21 48q0 30-21 50t-49 20-48-20-20-50z m138-700q0 30-21 50t-49 20-48-20-20-50q0-28 20-48t48-20 49 20 21 48z m280-68q28 0 49 20t21 48q0 30-21 50t-49 20-48-20-20-50q0-28 20-48t48-20z" horiz-adv-x="940" />
<glyph glyph-name="down-dir" unicode="&#xe812;" d="m460 550l-230-400-230 400 460 0z" horiz-adv-x="460" />
<glyph glyph-name="up-dir" unicode="&#xe813;" d="m0 150l230 400 230-400-460 0z" horiz-adv-x="460" />
<glyph glyph-name="left-dir" unicode="&#xe814;" d="m400 580l0-460-400 230z" horiz-adv-x="400" />
<glyph glyph-name="lock-open-alt" unicode="&#xe812;" d="m589 421q23 0 38-15t16-38v-322q0-22-16-37t-38-16h-535q-23 0-38 16t-16 37v322q0 22 16 38t38 15h17v179q0 103 74 177t176 73 177-73 73-177q0-15-10-25t-25-11h-36q-14 0-25 11t-11 25q0 59-42 101t-101 42-101-42-41-101v-179h410z" horiz-adv-x="642.9" />
<glyph glyph-name="lock" unicode="&#xe813;" d="m179 421h285v108q0 59-42 101t-101 41-101-41-41-101v-108z m464-53v-322q0-22-16-37t-38-16h-535q-23 0-38 16t-16 37v322q0 22 16 38t38 15h17v108q0 102 74 176t176 74 177-74 73-176v-108h18q23 0 38-15t16-38z" horiz-adv-x="642.9" />
<glyph glyph-name="lock-open" unicode="&#xe814;" d="m929 529v-143q0-15-11-25t-25-11h-36q-14 0-25 11t-11 25v143q0 59-41 101t-101 41-101-41-42-101v-108h53q23 0 38-15t16-38v-322q0-22-16-37t-38-16h-535q-23 0-38 16t-16 37v322q0 22 16 38t38 15h375v108q0 103 73 176t177 74 176-74 74-176z" horiz-adv-x="928.6" />
<glyph glyph-name="clock" unicode="&#xe815;" d="m500 546v-250q0-7-5-12t-13-5h-178q-8 0-13 5t-5 12v36q0 8 5 13t13 5h125v196q0 8 5 13t12 5h36q8 0 13-5t5-13z m232-196q0 83-41 152t-110 111-152 41-153-41-110-111-41-152 41-152 110-111 153-41 152 41 110 111 41 152z m125 0q0-117-57-215t-156-156-215-58-216 58-155 156-58 215 58 215 155 156 216 58 215-58 156-156 57-215z" horiz-adv-x="857.1" />
<glyph glyph-name="picture" unicode="&#xe816;" d="m357 529q0-45-31-76t-76-32-76 32-31 76 31 75 76 32 76-32 31-75z m572-215v-250h-786v107l178 179 90-89 285 285z m53 393h-893q-7 0-12-5t-6-13v-678q0-8 6-13t12-5h893q7 0 13 5t5 13v678q0 7-5 13t-13 5z m89-18v-678q0-37-26-63t-63-27h-893q-36 0-63 27t-26 63v678q0 37 26 63t63 27h893q37 0 63-27t26-63z" horiz-adv-x="1071.4" />
<glyph glyph-name="grid-2x2" unicode="&#xe817;" d="m429 279v-215q0-29-22-50t-50-21h-286q-29 0-50 21t-21 50v215q0 29 21 50t50 21h286q29 0 50-21t22-50z m0 428v-214q0-29-22-50t-50-22h-286q-29 0-50 22t-21 50v214q0 29 21 50t50 22h286q29 0 50-22t22-50z m500-428v-215q0-29-22-50t-50-21h-286q-29 0-50 21t-21 50v215q0 29 21 50t50 21h286q29 0 50-21t22-50z m0 428v-214q0-29-22-50t-50-22h-286q-29 0-50 22t-21 50v214q0 29 21 50t50 22h286q29 0 50-22t22-50z" horiz-adv-x="928.6" />
<glyph glyph-name="grid-3x3" unicode="&#xe818;" d="m286 154v-108q0-22-16-37t-38-16h-178q-23 0-38 16t-16 37v108q0 22 16 38t38 15h178q22 0 38-15t16-38z m0 285v-107q0-22-16-38t-38-15h-178q-23 0-38 15t-16 38v107q0 23 16 38t38 16h178q22 0 38-16t16-38z m357-285v-108q0-22-16-37t-38-16h-178q-23 0-38 16t-16 37v108q0 22 16 38t38 15h178q23 0 38-15t16-38z m-357 571v-107q0-22-16-38t-38-16h-178q-23 0-38 16t-16 38v107q0 22 16 38t38 16h178q22 0 38-16t16-38z m357-286v-107q0-22-16-38t-38-15h-178q-23 0-38 15t-16 38v107q0 23 16 38t38 16h178q23 0 38-16t16-38z m357-285v-108q0-22-16-37t-38-16h-178q-22 0-38 16t-16 37v108q0 22 16 38t38 15h178q23 0 38-15t16-38z m-357 571v-107q0-22-16-38t-38-16h-178q-23 0-38 16t-16 38v107q0 22 16 38t38 16h178q23 0 38-16t16-38z m357-286v-107q0-22-16-38t-38-15h-178q-22 0-38 15t-16 38v107q0 23 16 38t38 16h178q23 0 38-16t16-38z m0 286v-107q0-22-16-38t-38-16h-178q-22 0-38 16t-16 38v107q0 22 16 38t38 16h178q23 0 38-16t16-38z" horiz-adv-x="1000" />
<glyph glyph-name="list-numbered" unicode="&#xe819;" d="m213-54q0-45-31-70t-75-26q-60 0-96 37l31 49q28-25 60-25 16 0 28 8t12 24q0 35-59 31l-14 31q4 6 18 24t24 31 20 21v1q-9 0-27-1t-27 0v-30h-59v85h186v-49l-53-65q28-6 45-27t17-49z m1 350v-89h-202q-4 20-4 30 0 29 14 52t31 38 37 27 31 24 14 25q0 14-9 22t-22 7q-25 0-45-32l-47 33q13 28 40 44t59 16q40 0 68-23t28-63q0-28-19-51t-42-36-42-28-20-30h71v34h59z m786-178v-107q0-8-5-13t-13-5h-678q-8 0-13 5t-5 13v107q0 8 5 13t13 5h678q7 0 13-6t5-12z m-786 502v-56h-187v56h60q0 22 0 68t1 67v7h-1q-5-10-28-30l-40 42 76 71h59v-225h60z m786-216v-108q0-7-5-12t-13-5h-678q-8 0-13 5t-5 12v108q0 7 5 12t13 5h678q7 0 13-5t5-12z m0 285v-107q0-7-5-12t-13-6h-678q-8 0-13 6t-5 12v107q0 8 5 13t13 5h678q7 0 13-5t5-13z" horiz-adv-x="1000" />
<glyph glyph-name="list-bullet" unicode="&#xe81a;" d="m214 64q0-44-31-76t-76-31-76 31-31 76 31 76 76 31 76-31 31-76z m0 286q0-45-31-76t-76-31-76 31-31 76 31 76 76 31 76-31 31-76z m786-232v-107q0-7-5-13t-13-5h-678q-8 0-13 5t-5 13v107q0 7 5 12t13 6h678q7 0 13-6t5-12z m-786 518q0-45-31-76t-76-31-76 31-31 76 31 76 76 31 76-31 31-76z m786-232v-108q0-7-5-12t-13-5h-678q-8 0-13 5t-5 12v108q0 7 5 12t13 5h678q7 0 13-5t5-12z m0 285v-107q0-7-5-12t-13-6h-678q-8 0-13 6t-5 12v107q0 8 5 13t13 5h678q7 0 13-5t5-13z" horiz-adv-x="1000" />
<glyph glyph-name="chat" unicode="&#xe81b;" d="m290 240l350 0q2 0 6 2l4 0 0-92q0-40-29-70t-71-30l-250 0-150-150 0 150-50 0q-40 0-70 30t-30 70l0 300q0 42 30 71t70 29l190 0 0-310z m610 560q42 0 71-29t29-71l0-300q0-40-29-70t-71-30l-50 0 0-150-150 150-350 0 0 400q0 42 30 71t70 29l450 0z" horiz-adv-x="1000" />
<glyph glyph-name="plus-squared" unicode="&#xe81c;" d="m700 750q42 0 71-29t29-71l0-600q0-40-29-70t-71-30l-600 0q-40 0-70 30t-30 70l0 600q0 42 30 71t70 29l600 0z m-50-450l0 100-200 0 0 200-100 0 0-200-200 0 0-100 200 0 0-200 100 0 0 200 200 0z" horiz-adv-x="800" />
<glyph glyph-name="minus-squared" unicode="&#xe81d;" d="m700 750q42 0 71-29t29-71l0-600q0-40-29-70t-71-30l-600 0q-40 0-70 30t-30 70l0 600q0 42 30 71t70 29l600 0z m-50-450l0 100-500 0 0-100 500 0z" horiz-adv-x="800" />
<glyph glyph-name="cancel-squared" unicode="&#xe81e;" d="m700 750q42 0 71-29t29-71l0-600q0-40-29-70t-71-30l-600 0q-40 0-70 30t-30 70l0 600q0 42 30 71t70 29l600 0z m-146-638l86 86-154 152 154 154-86 86-154-152-152 152-88-86 154-154-154-152 88-86 152 152z" horiz-adv-x="800" />
<glyph glyph-name="beaker" unicode="&#xe81f;" d="m852 42q31-50 12-85t-78-36h-643q-59 0-79 36t12 85l281 442v223h-36q-14 0-25 11t-10 25 10 25 25 11h286q15 0 25-11t11-25-11-25-25-11h-36v-223z m-435 405l-151-240h397l-152 240-11 17v243h-71v-243z" horiz-adv-x="928.6" />
<glyph glyph-name="filter" unicode="&#xe820;" d="m783 685q9-23-8-39l-275-275v-414q0-23-22-33-7-3-14-3-15 0-25 11l-143 143q-10 10-10 25v271l-275 275q-18 16-8 39 9 22 33 22h714q23 0 33-22z" horiz-adv-x="785.7" />
<glyph glyph-name="hourglass" unicode="&#xe821;" d="m560 622q0-44-48-96t-97-99-49-77 49-76 97-97 48-97l0-118q0-34-86-73t-194-39-194 39-86 73l0 118q0 46 48 97t97 97 49 76-49 77-97 99-48 96l0 118q0 32 87 71t193 39 193-39 87-71l0-118z m-482 112l-18-14q-4-8 4-14 92-52 216-52 132 0 220 50 14 10-16 30-96 54-202 54-120 0-204-54z m228-384q0 18 4 33t18 33 20 25 31 31 29 28q92 92 92 122l2 50q-100-54-222-54t-222 54l4-50q0-32 90-122 6-6 22-21t23-22l19-19t17-21 11-20 9-23 3-24q0-10-1-19t-6-18-8-16-11-17l-12-15t-15-16-16-15-18-16-17-16q-90-90-90-122l0-66q8 4 66 23t92 43 34 58q0 30 26 30t26-30q0-34 33-58t94-43 67-23l0 66q0 30-92 122-4 4-21 20t-22 21-18 19-18 22-12 20-9 23-2 23z" horiz-adv-x="560" />
<glyph glyph-name="github-circled-1" unicode="&#xe822;" d="m857 350q0-140-82-252t-211-155q-15-3-22 4t-7 17v118q0 54-29 79 32 3 57 10t53 22 45 37 30 58 11 84q0 68-44 115 21 51-5 114-15 5-45-6t-51-25l-21-13q-52 15-107 15t-108-15q-8 6-23 15t-47 22-48 7q-24-63-4-114-44-47-44-115 0-47 12-83t29-59 45-37 52-22 57-10q-22-20-27-58-12-5-25-8t-32-3-36 12-31 35q-11 18-27 29t-28 14l-11 1q-12 0-16-2t-3-7 5-8 7-6l4-3q12-6 24-21t18-29l5-13q8-21 25-34t37-17 39-4 31 2l13 3q0-22 0-50t1-30q0-10-8-17t-22-4q-129 43-211 155t-82 252q0 117 58 215t155 156 216 58 215-58 156-156 57-215z" horiz-adv-x="857.1" />
</font>
</defs>
</svg>
BIN +3.11 KB (140%) fonts/grid-font/grid_font.ttf 100755 → 100644
Binary file not shown.
BIN +1.91 KB (140%) fonts/grid-font/grid_font.woff 100755 → 100644
Binary file not shown.
@@ -91,7 +91,7 @@ GRID = {
this.authors = new GridAuthors();
this.async.addObserver(this);
this.async.addObserver(this.authors);
this.async.init();


// load the grid + view
this.grid = new Grid({
@@ -127,9 +127,19 @@ GRID = {
model: GRID.getModel()
});
GRID.$root.prepend(GRID.toolbar.render().el);
jQuery(window).resize(function(){ GRID.toolbar.onResize() }).trigger("resize");

GRID.onSidebarCalculation();
GRID.$loading.removeClass("grid-init-loading");

/**
* init async connection on grid loading done
*/
GRID.async.init();

/**
* listen to changes of window size
*/
jQuery(window).resize(function(){ GRID.toolbar.onResize() }).trigger("resize");
}
});

@@ -138,6 +148,7 @@ GRID = {
reload: function(){
this.grid.destroy();
this.grid = null;
this.$root_authors.empty();
if(this.gridView != null){
this.gridView.remove();
}
@@ -404,9 +415,12 @@ GRID = {
GRID.$root_authors.empty();
var authors = new Authors();
GRID.$root_authors.append(authors.render().$el);
authors.listenTo( GRID.toolbar,'toolbar_resize', authors.onResize);
}

GRID.$root.toggleClass("is-active-authors");
GRID.$root_authors.toggleClass("is-active");
GRID.toolbar.onResize();
},
showAuthors: function(){
this.hideAuthors();
@@ -26,6 +26,11 @@ var Authors = GridBackbone.View.extend({
});
return this;
},
onResize: function(height){
console.log("resize triggered "+height);
this.$list.css("height", height+"px");

},
onAddAuthor: function(author){
var author = new Author({model: author});
this.$list.append(author.render().$el);
@@ -164,8 +164,10 @@ var GridToolbarView = GridBackbone.View.extend({
var window_height = jQuery(window).height();
var elements_top_offset = this.$el.offset().top;
var tab_height = this.$tab_container.outerHeight();
this.$tool_element_content.css("height", (window_height-elements_top_offset-tab_height));

var height = window_height-elements_top_offset-tab_height;
this.$tool_element_content.css("height", height);
console.log("trigger resize "+height);
this.trigger('toolbar_resize',height);
},
/**
* authors button
Oops, something went wrong.

0 comments on commit c9f9665

Please sign in to comment.
You can’t perform that action at this time.