diff --git a/ckeditor/ckstyles.js b/ckeditor/ckstyles.js index 01a96fb..bc6998b 100644 --- a/ckeditor/ckstyles.js +++ b/ckeditor/ckstyles.js @@ -8,164 +8,308 @@ CKEDITOR.addStylesSet( 'my_styles', // These styles are already available in the "Format" combo, so they are // not needed here by default. You may enable them to avoid placing the // "Format" combo in the toolbar, maintaining the same features. - /*{ name : 'Blue Title' , element : 'h3', styles : { 'color' : 'Blue' } }, - { name : 'Red Title' , element : 'h3', styles : { 'color' : 'Red' } }, - */ /* Inline Styles */ - // These are core styles available as toolbar buttons. You may opt enabling // some of them in the Styles combo, removing them from the toolbar. /* - { name : 'Strong' , element : 'strong', overrides : 'b' }, - { name : 'Emphasis' , element : 'em' , overrides : 'i' }, - { name : 'Underline' , element : 'u' }, + { name : 'Strong' , element : 'strong', overrides : 'b' }, + { name : 'Emphasis' , element : 'em' , overrides : 'i' }, + { name : 'Underline', element : 'u' }, { name : 'Strikethrough' , element : 'strike' }, - { name : 'Subscript' , element : 'sub' }, - { name : 'Superscript' , element : 'sup' }, + { name : 'Subscript', element : 'sub' }, + { name : 'Superscript', element : 'sup' }, */ - /* { name : 'Marker: Yellow' , element : 'span', styles : { 'background-color' : 'Yellow' } }, - { name : 'Marker: Green' , element : 'span', styles : { 'background-color' : 'Lime' } }, -*/ { - name : 'Typewriter' , - element : 'tt' + name : 'Typewriter', + element : 'tt' + }, + { + name : 'Code', + element : 'code' + }, + { + name : 'Cited Work', + element : 'cite' }, { - name : 'Code' , - element : 'code' + name : 'Inline Quotation' , + element : 'q' }, /* { name : 'Computer Code' , element : 'code' }, { name : 'Keyboard Phrase' , element : 'kbd' }, - { name : 'Sample Text' , element : 'samp' }, - { name : 'Variable' , element : 'var' }, + { name : 'Sample Text', element : 'samp' }, + { name : 'Variable' , element : 'var' }, - { name : 'Deleted Text' , element : 'del' }, + { name : 'Deleted Text', element : 'del' }, { name : 'Inserted Text' , element : 'ins' }, - - { name : 'Cited Work' , element : 'cite' }, - { name : 'Inline Quotation' , element : 'q' },*/ + */ { - name : 'Two Columns', - element : 'table', - attributes : - { - 'style' : '', - 'class' : 'twoColumns' - - } + name : 'Two Columns', + element : 'table', + attributes : + { + 'style' : '', + 'class' : 'twoColumns' + + } }, /* Object Styles */ /* we strongly recommend to use CSS classes only! */ - + { - name : 'Link Image Thumbnail', - element : 'img', - attributes : - { - 'style' : '', - 'class' : 'thumbnail', - 'border' : '0', - 'vspace' : '0', - 'hspace' : '0', - 'align' : '' - } + name : 'Link Image Thumbnail', + element : 'img', + attributes : + { + 'style' : '', + 'class' : 'thumbnail', + 'border' : '0', + 'vspace' : '0', + 'hspace' : '0', + 'align' : '' + } }, - + { - name : 'Image Pull Left', - element : 'img', - attributes : - { - 'class' : 'pull-left' - } + name : 'Image Pull Left', + element : 'img', + attributes : + { + 'class' : 'pull-left' + } }, { - name : 'Image Pull Right', - element : 'img', - attributes : - { - 'class' : 'pull-right' - } + name : 'Image Pull Right', + element : 'img', + attributes : + { + 'class' : 'pull-right' + } }, { - name : 'DIV Pull Left', - element : 'div', - attributes : - { - 'class' : 'pull-left' - } + name : 'DIV Pull Left', + element : 'div', + attributes : + { + 'class' : 'pull-left' + } }, { - name : 'DIV Pull Right', - element : 'div', - attributes : - { - 'class' : 'pull-right' - } + name : 'DIV Pull Right', + element : 'div', + attributes : + { + 'class' : 'pull-right' + } }, { - name : 'Clearfix', - element : 'div', - attributes : { - 'class' : 'clearfix' - } + name : 'Clearfix', + element : 'div', + attributes : { + 'class' : 'clearfix' + } }, { - name : '1/1 width, container span12', - element : 'div', - attributes : { - 'class' : 'span12' - } + name : '1/1 width, container span12', + element : 'div', + attributes : { + 'class' : 'span12' + } }, { - name : '3/4 width, container span10', - element : 'div', - attributes : { - 'class' : 'span9' - } + name : '3/4 width, container span10', + element : 'div', + attributes : { + 'class' : 'span10' + } }, { - name : '2/3 width, container span9', - element : 'div', - attributes : { - 'class' : 'span9' - } + name : '2/3 width, container span9', + element : 'div', + attributes : { + 'class' : 'span9' + } }, { - name : '1/2 width, container span6', - element : 'div', - attributes : { - 'class' : 'span6' - } + name : '1/2 width, container span6', + element : 'div', + attributes : { + 'class' : 'span6' + } }, { - name : '1/3 width, container span4', - element : 'div', - attributes : { - 'class' : 'span4' - } + name : '1/3 width, container span4', + element : 'div', + attributes : { + 'class' : 'span4' + } }, { - name : '1/4 width, container span3', - element : 'div', - attributes : { - 'class' : 'span3' - } + name : '1/4 width, container span3', + element : 'div', + attributes : { + 'class' : 'span3' + } }, { - name : '1/6 width, container span2', - element : 'div', - attributes : { - 'class' : 'span2' - } + name : '1/6 width, container span2', + element : 'div', + attributes : { + 'class' : 'span2' + } + }, + + + // Bootstrap block styles + { + name : 'alert success', + element : 'div', + attributes : { + 'class' : 'alert alert-block alert-success' + } }, + { + name : 'alert warning', + element : 'div', + attributes : { + 'class' : 'alert alert-block alert-warning' + } + }, + { + name : 'alert error', + element : 'div', + attributes : { + 'class' : 'alert alert-block alert-error' + } + }, + { + name : 'alert info', + element : 'div', + attributes : { + 'class' : 'alert alert-block alert-info' + } + }, + + // Bootstap inline styles + { + name : 'badge success', + element : 'span', + attributes : { + 'class' : 'badge badge-success' + } + }, + { + name : 'badge warning', + element : 'span', + attributes : { + 'class' : 'badge badge-warning' + } + }, + { + name : 'badge error', + element : 'span', + attributes : { + 'class' : 'badge badge-error' + } + }, + { + name : 'badge info', + element : 'span', + attributes : { + 'class' : 'badge badge-info' + } + }, + { + name : 'badge inverse', + element : 'span', + attributes : { + 'class' : 'badge badge-inverse' + } + }, + + { + name : 'label success', + element : 'span', + attributes : { + 'class' : 'label label-success' + } + }, + { + name : 'label warning', + element : 'span', + attributes : { + 'class' : 'label label-warning' + } + }, + { + name : 'label error', + element : 'span', + attributes : { + 'class' : 'label label-error' + } + }, + { + name : 'label info', + element : 'span', + attributes : { + 'class' : 'label label-info' + } + }, + { + name : 'label inverse', + element : 'span', + attributes : { + 'class' : 'label label-inverse' + } + }, + + { + name : 'button', + element : 'a', + attributes : { + 'class' : 'btn' + } + }, + { + name : 'button large', + element : 'a', + attributes : { + 'class' : 'btn btn-large' + } + }, + { + name : 'button small', + element : 'a', + attributes : { + 'class' : 'btn btn-small' + } + }, + + /*{ + name : 'tooltip (title)', + element : 'a', + attributes : { + 'rel' : 'tooltip' + } + },*/ + + { + name : 'thumbnail', + element : 'img', + attributes : { + 'class' : 'thumbnail' + } + }, + + + ]); diff --git a/css/img/glyphicons-halflings-white.png b/css/img/glyphicons-halflings-white.png new file mode 100644 index 0000000..3bf6484 Binary files /dev/null and b/css/img/glyphicons-halflings-white.png differ diff --git a/css/img/glyphicons-halflings.png b/css/img/glyphicons-halflings.png new file mode 100644 index 0000000..79bc568 Binary files /dev/null and b/css/img/glyphicons-halflings.png differ diff --git a/css/p3.css b/css/p3.css index 3f2808d..c4a772d 100644 --- a/css/p3.css +++ b/css/p3.css @@ -1,4 +1,4 @@ -/* We need to import these files, so not include them elsewhere, eg. yii-bootstrap oder layouts/main.php */ +/* import bootrap */ /*! * Bootstrap v2.0.3 * @@ -2063,7 +2063,7 @@ table .span24 { *margin-right: .3em; line-height: 14px; vertical-align: text-top; - background-image: url("../img/glyphicons-halflings.png"); + background-image: url("img/glyphicons-halflings.png"); background-position: 14px 14px; background-repeat: no-repeat; } @@ -2076,7 +2076,7 @@ table .span24 { *margin-left: 0; } .icon-white { - background-image: url("../img/glyphicons-halflings-white.png"); + background-image: url("img/glyphicons-halflings-white.png"); } .icon-glass { background-position: 0 0; @@ -7346,6 +7346,11 @@ a.badge:hover { overflow: visible !important; } } +/* use bootstrap with blueprint translation */ +/* IMPORT YOUR BOOTSTRAP FILES + +@import "../../../twitter/bootstrap/less/bootstrap.less"; +@import "../../../twitter/bootstrap/less/responsive.less";*/ /* TODO: add all spans, and much more */ #content { /*.row; @@ -7791,6 +7796,7 @@ div.form INPUT[type="submit"] .caret { opacity: 0.75; filter: alpha(opacity=75); } +/* override variables with local values */ html { overflow-y: scroll; } @@ -7801,7 +7807,6 @@ img.pull-right { .container hr { clear: both; } -/* Module: rights */ /* iPhone Hacks */ @media (max-width: 480px) { .je-node INPUT { diff --git a/less/p3.less b/less/p3.less index df6d209..0682f5d 100644 --- a/less/p3.less +++ b/less/p3.less @@ -1,9 +1,16 @@ +/* USAGE IN THEME FOLDER */ /* import bootrap */ @import "../../../protected/extensions/twitter/bootstrap/less/bootstrap.less"; @import "../../../protected/extensions/twitter/bootstrap/less/responsive.less"; +/* use bootstrap with blueprint translation */ +@import "../../../protected/extensions/phundament/lessii/translations/blueprint-bootstrap.less"; +/* USAGE IN EXTENSION PHUNDAMENT */ +/* import bootrap */ +/* @import "../../../../twitter/bootstrap/less/bootstrap.less"; +@import "../../../../twitter/bootstrap/less/responsive.less"; */ /* use bootstrap with blueprint translation */ -@import "../../../protected/extensions/lessii/translations/blueprint-bootstrap.less"; +/* @import "../../../lessii/translations/blueprint-bootstrap.less"; */ /* override variables with local values */ @import "variables.less"; diff --git a/less/variables.less b/less/variables.less index 191c6d9..2c5ed7d 100644 --- a/less/variables.less +++ b/less/variables.less @@ -129,8 +129,8 @@ // Sprite icons path // ------------------------- -@iconSpritePath: "../img/glyphicons-halflings.png"; -@iconWhiteSpritePath: "../img/glyphicons-halflings-white.png"; +@iconSpritePath: "img/glyphicons-halflings.png"; +@iconWhiteSpritePath: "img/glyphicons-halflings-white.png"; // Input placeholder text color