Skip to content

Commit

Permalink
added editor widget
Browse files Browse the repository at this point in the history
  • Loading branch information
Atanas Atanasov committed Apr 30, 2017
1 parent 7b284f1 commit 5ac822c
Show file tree
Hide file tree
Showing 43 changed files with 2,178 additions and 11,114 deletions.
4 changes: 4 additions & 0 deletions Gijgo.GitHub.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,10 @@
<Content Include="src\draggable\js\header.txt" />
<Content Include="src\droppable\js\droppable.base.js" />
<Content Include="src\droppable\js\header.txt" />
<Content Include="src\editor\css\editor.base.css" />
<Content Include="src\editor\js\editor.base.js" />
<Content Include="src\editor\js\header.txt" />
<Content Include="src\editor\js\messages\messages.en-us.js" />
<Content Include="src\grid\css\grid.base.css" />
<Content Include="src\grid\css\grid.columnReorder.css" />
<Content Include="src\grid\css\grid.pagination.css" />
Expand Down
21 changes: 18 additions & 3 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
{ src: ['src/droppable/js/*.js'], dest: 'examples/droppable/' },
{ src: ['src/grid/js/*.js'], dest: 'examples/grid/' },
{ src: ['src/tree/js/*.js'], dest: 'examples/tree/' },
{ src: ['src/checkbox/js/*.js'], dest: 'examples/checkbox/' }
{ src: ['src/checkbox/js/*.js'], dest: 'examples/checkbox/' },
{ src: ['src/editor/js/*.js'], dest: 'examples/editor/' }
]
}
},
Expand Down Expand Up @@ -66,6 +67,12 @@
'dist/modular/checkbox/css/checkbox.code.css': ['src/checkbox/css/checkbox.base.css']
}
},
editor: {
files: {
'dist/modular/editor/js/editor.code.js': ['src/editor/js/messages/messages.en-us.js', 'src/editor/js/editor.base.js'],
'dist/modular/editor/css/editor.code.css': ['src/editor/css/editor.base.css']
}
},
final: {
files: {
'dist/modular/draggable/js/draggable.js': ['src/draggable/js/header.txt', 'src/widget.js', 'dist/modular/draggable/js/draggable.code.js'],
Expand All @@ -78,9 +85,11 @@
'dist/modular/tree/css/tree.css': ['src/widget.css', 'dist/modular/tree/css/tree.code.css'],
'dist/modular/checkbox/js/checkbox.js': ['src/checkbox/js/header.txt', 'src/widget.js', 'dist/modular/checkbox/js/checkbox.code.js'],
'dist/modular/checkbox/css/checkbox.css': ['src/widget.css', 'dist/modular/checkbox/css/checkbox.code.css'],
'dist/modular/editor/js/editor.js': ['src/editor/js/header.txt', 'src/widget.js', 'dist/modular/editor/js/editor.code.js'],
'dist/modular/editor/css/editor.css': ['src/widget.css', 'dist/modular/editor/css/editor.code.css'],

'dist/combined/js/gijgo.js': ['src/header.txt', 'src/widget.js', 'dist/modular/dialog/js/dialog.code.js', 'dist/modular/draggable/js/draggable.code.js', 'dist/modular/droppable/js/droppable.code.js', 'dist/modular/grid/js/grid.code.js', 'dist/modular/tree/js/tree.code.js', 'dist/modular/checkbox/js/checkbox.code.js'],
'dist/combined/css/gijgo.css': ['src/widget.css', 'dist/modular/dialog/css/dialog.code.css', 'dist/modular/grid/css/grid.code.css', 'dist/modular/tree/css/tree.code.css', 'dist/modular/checkbox/css/checkbox.code.css'],
'dist/combined/js/gijgo.js': ['src/header.txt', 'src/widget.js', 'dist/modular/dialog/js/dialog.code.js', 'dist/modular/draggable/js/draggable.code.js', 'dist/modular/droppable/js/droppable.code.js', 'dist/modular/grid/js/grid.code.js', 'dist/modular/tree/js/tree.code.js', 'dist/modular/checkbox/js/checkbox.code.js', 'dist/modular/editor/js/editor.code.js'],
'dist/combined/css/gijgo.css': ['src/widget.css', 'dist/modular/dialog/css/dialog.code.css', 'dist/modular/grid/css/grid.code.css', 'dist/modular/tree/css/tree.code.css', 'dist/modular/checkbox/css/checkbox.code.css', 'dist/modular/editor/css/editor.code.css'],
'dist/combined/js/messages/messages.bg-bg.js': ['src/dialog/js/messages/messages.bg-bg.js', 'src/grid/js/messages/messages.bg-bg.js'],
'dist/combined/js/messages/messages.fr-fr.js': ['src/dialog/js/messages/messages.fr-fr.js', 'src/grid/js/messages/messages.fr-fr.js'],
'dist/combined/js/messages/messages.de-de.js': ['src/dialog/js/messages/messages.de-de.js', 'src/grid/js/messages/messages.de-de.js'],
Expand Down Expand Up @@ -328,6 +337,9 @@ var writer = {
case 'checkbox':
result += ' <link href="../../dist/modular/checkbox/css/checkbox.css" rel="stylesheet" type="text/css">\r\n';
break;
case 'editor':
result += ' <link href="../../dist/modular/editor/css/editor.css" rel="stylesheet" type="text/css">\r\n';
break;
}
}
for (i = 0; i < names.length; i++) {
Expand All @@ -351,6 +363,9 @@ var writer = {
case 'checkbox':
result += ' <script src="../../dist/modular/checkbox/js/checkbox.js"></script>\r\n';
break;
case 'editor':
result += ' <script src="../../dist/modular/editor/js/editor.js"></script>\r\n';
break;
}
}
}
Expand Down
97 changes: 97 additions & 0 deletions dist/combined/css/gijgo.css
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,48 @@
content: "\E15B";
}

/** Material Design */
.gj-md-button:hover {
background-color: rgba(158,158,158,.2);
}

.gj-md-button {
background: 0 0;
border: none;
border-radius: 2px;
color: #000;
position: relative;
height: 36px;
margin: 0;
min-width: 64px;
padding: 0 16px;
display: inline-block;
font-family: "Roboto","Helvetica","Arial",sans-serif;
font-size: 14px;
font-weight: 500;
text-transform: uppercase;
letter-spacing: 0;
overflow: hidden;
will-change: box-shadow;
transition: box-shadow .2s cubic-bezier(.4,0,1,1),background-color .2s cubic-bezier(.4,0,.2,1),color .2s cubic-bezier(.4,0,.2,1);
outline: none;
cursor: pointer;
text-decoration: none;
text-align: center;
line-height: 36px;
vertical-align: middle;
}

.gj-md-button-active {
background-color: rgba(158,158,158,.4);
}

.gj-md-button-group {
position: relative;
display: inline-block;
vertical-align: middle;
}

.gj-draggable {
cursor: move;
}
Expand Down Expand Up @@ -1000,3 +1042,58 @@ li.gj-tree-mdl-item [data-role="image"] {
background-color: rgba(0,0,0,.54);
}


/* Material Design */

.gj-editor-md {
padding: 7px;
font-family: "Roboto","Helvetica","Arial",sans-serif;
font-size: 14px;
font-weight: 500;
letter-spacing: 0;
border: 1px solid rgba(158,158,158,.2);
}

.gj-editor-md [data-role="toolbar"] {
margin-bottom: 7px;
}

.gj-editor-md div[data-role="body"] {
border: 1px solid rgba(158,158,158,.2);
}

.gj-editor-md p {
margin: 0;
padding: 0;
}

.gj-editor-md blockquote {
font-size: 14px;
}

/* Bootstrap */
.gj-editor-bootstrap {
padding: 7px;
border: 1px solid #eceeef;
}

.gj-editor-bootstrap [data-role="toolbar"] {
margin-bottom: 7px;
}

.gj-editor-bootstrap [data-role="toolbar"] .btn-group {
margin-right: 10px;
}

.gj-editor-bootstrap div[data-role="body"] {
border: 1px solid #eceeef;
}

.gj-editor-bootstrap p {
margin: 0;
padding: 0;
}

.gj-editor-bootstrap blockquote {
font-size: 14px;
}
Loading

0 comments on commit 5ac822c

Please sign in to comment.