Skip to content

Commit

Permalink
EZP-24731: Added the embed button
Browse files Browse the repository at this point in the history
  • Loading branch information
dpobel committed Aug 31, 2015
1 parent 2b26cc8 commit 76200a2
Show file tree
Hide file tree
Showing 19 changed files with 1,341 additions and 861 deletions.
2 changes: 2 additions & 0 deletions Resources/config/css.yml
Expand Up @@ -82,6 +82,7 @@ system:
- 'bundles/ezplatformui/css/modules/table-data.css'
- 'bundles/ezplatformui/css/modules/breadcrumbs.css'
- 'bundles/ezplatformui/css/modules/yui-calendar.css'
- 'bundles/ezplatformui/css/alloyeditor/content.css'
- 'bundles/ezplatformui/css/alloyeditor/toolbars/appendcontent.css'
# theme stylesheets
- 'bundles/ezplatformui/css/theme/app.css'
Expand Down Expand Up @@ -146,4 +147,5 @@ system:
- 'bundles/ezplatformui/css/theme/modules/breadcrumbs.css'
- 'bundles/ezplatformui/css/theme/modules/yui-calendar.css'
- 'bundles/ezplatformui/css/theme/alloyeditor/general.css'
- 'bundles/ezplatformui/css/theme/alloyeditor/content.css'
- 'bundles/ezplatformui/css/theme/alloyeditor/toolbars/appendcontent.css'
4 changes: 4 additions & 0 deletions Resources/config/yui.yml
Expand Up @@ -25,6 +25,9 @@ system:
ez-alloyeditor-button-heading:
requires: ['ez-alloyeditor']
path: %ez_platformui.public_dir%/js/alloyeditor/buttons/heading.js
ez-alloyeditor-button-embed:
requires: ['ez-alloyeditor']
path: %ez_platformui.public_dir%/js/alloyeditor/buttons/embed.js
ez-platformuiapp:
requires:
- 'app'
Expand Down Expand Up @@ -428,6 +431,7 @@ system:
- 'ez-alloyeditor-plugin-appendcontent'
- 'ez-alloyeditor-toolbar-appendcontent'
- 'ez-alloyeditor-button-heading'
- 'ez-alloyeditor-button-embed'
- 'richtexteditview-ez-template'
path: %ez_platformui.public_dir%/js/views/fields/ez-richtext-editview.js
richtexteditview-ez-template:
Expand Down
22 changes: 22 additions & 0 deletions Resources/public/css/alloyeditor/content.css
@@ -0,0 +1,22 @@
/**
* Copyright (C) eZ Systems AS. All rights reserved.
* For full copyright and license information view LICENSE file distributed with this source code.
*/

.ez-richtext-editable ezembed {
display: block;
margin: 1em 0.1em;
line-height: 2em;
height: 2em;
}

.ez-richtext-editable ezembed:before {
padding: 0 0.2em 0 0.5em;
}

.ez-richtext-editable ezembed:before,
.ez-richtext-editable ezembed:after {
line-height: 100%;
height: 100%;
display: inline-block;
}
7 changes: 6 additions & 1 deletion Resources/public/css/alloyeditor/toolbars/appendcontent.css
Expand Up @@ -6,8 +6,13 @@
.ae-ui .ez-ae-appendcontent .ez-ae-labeled-button {
width: auto;
height: auto;
margin: 0.3em 0.8em;
}

.ae-ui .ez-ae-appendcontent .ez-ae-label {
margin: 0;
margin: 0.3em 0 0 0;
}

.ae-ui .ez-ae-icon:before {
display: block;
}
26 changes: 26 additions & 0 deletions Resources/public/css/theme/alloyeditor/content.css
@@ -0,0 +1,26 @@
/**
* Copyright (C) eZ Systems AS. All rights reserved.
* For full copyright and license information view LICENSE file distributed with this source code.
*/

.ez-richtext-editable ezembed {
background: #eee;
border: 1px solid #aaa;
font-size: 1.1em;
}

.ez-richtext-editable ezembed:before {
font-family: 'ez-platformui-icomoon';
speak: none;
font-weight: normal;
font-variant: normal;
text-transform: none;
line-height: 1;
-webkit-font-smoothing: antialiased;

content: "\E62e";
}

.ez-richtext-editable ezembed:after {
content: attr(href);
}
Expand Up @@ -10,3 +10,11 @@
.ae-ui .ez-ae-appendcontent .ez-ae-label {
font-size: 80%;
}

.ae-ui .ez-ae-icon:before {
font-size: 28px;
}

.ae-ui .ez-ae-icon-embed:before {
content: "\E62e";
}
Binary file modified Resources/public/fonts/icomoon.eot
Binary file not shown.
1 change: 1 addition & 0 deletions Resources/public/fonts/icomoon.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/public/fonts/icomoon.ttf
Binary file not shown.
Binary file modified Resources/public/fonts/icomoon.woff
Binary file not shown.

0 comments on commit 76200a2

Please sign in to comment.