diff --git a/admin/themes/default/img/noisy_grid_dark.png b/admin/themes/default/img/noisy_grid_dark.png index 38a7336..e3c1ab2 100644 Binary files a/admin/themes/default/img/noisy_grid_dark.png and b/admin/themes/default/img/noisy_grid_dark.png differ diff --git a/admin/themes/default/index.template.php b/admin/themes/default/index.template.php index 719aa79..7d52e34 100644 --- a/admin/themes/default/index.template.php +++ b/admin/themes/default/index.template.php @@ -4,7 +4,7 @@ Monstra :: <?php echo __('Administration', 'system'); ?> - + @@ -49,8 +49,8 @@ diff --git a/plugins/box/themes/views/backend/add.view.php b/plugins/box/themes/views/backend/add.view.php index c6ca8e9..70c28f9 100644 --- a/plugins/box/themes/views/backend/add.view.php +++ b/plugins/box/themes/views/backend/add.view.php @@ -40,7 +40,7 @@ echo ( Html::br(2). - Form::submit('add_file_and_exit', __('Save and Exit', 'themes'), array('class' => 'btn')).Html::nbsp(2). - Form::submit('add_file', __('Save', 'themes'), array('class' => 'btn')). + Form::submit('add_file_and_exit', __('Save and Exit', 'themes'), array('class' => 'btn btn-primary')).Html::nbsp(2). + Form::submit('add_file', __('Save', 'themes'), array('class' => 'btn btn-default')). Form::close() ); diff --git a/plugins/box/themes/views/backend/edit.view.php b/plugins/box/themes/views/backend/edit.view.php index 0ae7a75..18dee2c 100644 --- a/plugins/box/themes/views/backend/edit.view.php +++ b/plugins/box/themes/views/backend/edit.view.php @@ -48,8 +48,8 @@ echo ( Form::textarea('content', Html::toText($content), array('style' => 'width:100%;height:400px;', 'class' => 'source-editor')). Html::br(2). - Form::submit('edit_file_and_exit', __('Save and Exit', 'themes'), array('class' => 'btn')).Html::nbsp(2). - Form::submit('edit_file', __('Save', 'themes'), array('class' => 'btn')). Html::nbsp(). + Form::submit('edit_file_and_exit', __('Save and Exit', 'themes'), array('class' => 'btn btn-primary')).Html::nbsp(2). + Form::submit('edit_file', __('Save', 'themes'), array('class' => 'btn btn-default')). Html::nbsp(). Form::close() ); diff --git a/plugins/box/themes/views/backend/index.view.php b/plugins/box/themes/views/backend/index.view.php old mode 100755 new mode 100644 index 599a127..1146c55 --- a/plugins/box/themes/views/backend/index.view.php +++ b/plugins/box/themes/views/backend/index.view.php @@ -11,8 +11,8 @@ Form::open(). Form::hidden('csrf', Security::token()). Form::label('themes', __('Select Theme', 'themes')). - Form::select('themes', $themes_site, $current_site_theme, array('class' => 'input-xlarge')). Html::br(). - Form::submit('save_site_theme', __('Save', 'themes'), array('class' => 'btn')). + Form::select('themes', $themes_site, $current_site_theme, array('class' => 'form-control')). Html::br(). + Form::submit('save_site_theme', __('Save', 'themes'), array('class' => 'btn btn-primary')). Form::close() ); ?> @@ -31,8 +31,8 @@ Form::open(). Form::hidden('csrf', Security::token()). Form::label('themes', __('Select Theme', 'themes')). - Form::select('themes', $themes_admin, $current_admin_theme, array('class' => 'input-xlarge')). Html::br(). - Form::submit('save_admin_theme', __('Save', 'themes'), array('class' => 'btn')). + Form::select('themes', $themes_admin, $current_admin_theme, array('class' => 'form-control')). Html::br(). + Form::submit('save_admin_theme', __('Save', 'themes'), array('class' => 'btn btn-primary')). Form::close() ); ?> @@ -54,7 +54,7 @@ ); ?> - __('Create New Template'), 'class' => 'btn btn-small')).Html::br(2)); ?> + __('Create New Template'), 'class' => 'btn btn-default')).Html::br(2)); ?> @@ -71,16 +71,16 @@ @@ -89,7 +89,7 @@
- 'btn btn-small')); ?> - + 'btn btn-primary')); ?> + +
'btn btn-actions btn-small btn-actions-default', 'onclick' => "return confirmDelete('".__('Delete template: :name', 'themes', array(':name' => basename($template, '.template.php')))."')")); + array('class' => 'btn btn-actions btn-danger btn-actions-default', 'onclick' => "return confirmDelete('".__('Delete template: :name', 'themes', array(':name' => basename($template, '.template.php')))."')")); ?> -
- __('Create New Chnuk', 'themes'), 'class' => 'btn btn-small')).Html::br(2)); ?> + __('Create New Chunk', 'themes'), 'class' => 'btn btn-default')).Html::br(2)); ?> @@ -106,16 +106,16 @@ @@ -124,7 +124,7 @@
- 'btn btn-small')); ?> - + 'btn btn-primary')); ?> + +
'btn btn-actions btn-small btn-actions-default', 'onclick' => "return confirmDelete('".__('Delete chunk: :name', 'themes', array(':name' => basename($chunk, '.chunk.php')))."')")); + array('class' => 'btn btn-actions btn-danger btn-actions-default', 'onclick' => "return confirmDelete('".__('Delete chunk: :name', 'themes', array(':name' => basename($chunk, '.chunk.php')))."')")); ?> -
- __('Create New Style', 'themes'), 'class' => 'btn btn-small')).Html::br(2)); ?> + __('Create New Style', 'themes'), 'class' => 'btn btn-default')).Html::br(2)); ?> @@ -141,16 +141,16 @@ @@ -159,7 +159,7 @@
- 'btn btn-small')); ?> - + 'btn btn-primary')); ?> + +
'btn btn-actions btn-small btn-actions-default', 'onclick' => "return confirmDelete('".__('Delete styles: :name', 'themes', array(':name' => basename($style, '.css')))."')")); + array('class' => 'btn btn-actions btn-danger btn-actions-default', 'onclick' => "return confirmDelete('".__('Delete styles: :name', 'themes', array(':name' => basename($style, '.css')))."')")); ?> -
- __('Create New Script', 'themes'), 'class' => 'btn btn-small')).Html::br(2)); ?> + __('Create New Script', 'themes'), 'class' => 'btn btn-default')).Html::br(2)); ?> @@ -176,16 +176,16 @@ diff --git a/plugins/captcha/crypt/images/erreur1.png b/plugins/captcha/crypt/images/erreur1.png index 4db48c1..28cddc6 100644 Binary files a/plugins/captcha/crypt/images/erreur1.png and b/plugins/captcha/crypt/images/erreur1.png differ diff --git a/plugins/captcha/crypt/images/erreur2.png b/plugins/captcha/crypt/images/erreur2.png index c55c240..90b3a6e 100644 Binary files a/plugins/captcha/crypt/images/erreur2.png and b/plugins/captcha/crypt/images/erreur2.png differ diff --git a/plugins/captcha/crypt/images/erreur3.png b/plugins/captcha/crypt/images/erreur3.png index 0981bba..0d0eb45 100644 Binary files a/plugins/captcha/crypt/images/erreur3.png and b/plugins/captcha/crypt/images/erreur3.png differ diff --git a/plugins/captcha/crypt/images/reload.png b/plugins/captcha/crypt/images/reload.png index 745d9c2..d4d663d 100644 Binary files a/plugins/captcha/crypt/images/reload.png and b/plugins/captcha/crypt/images/reload.png differ diff --git a/plugins/codemirror/codemirror/doc/logo.png b/plugins/codemirror/codemirror/doc/logo.png index 2334f5e..1b38c74 100644 Binary files a/plugins/codemirror/codemirror/doc/logo.png and b/plugins/codemirror/codemirror/doc/logo.png differ diff --git a/plugins/markitup/markitup/sets/html/images/bold.png b/plugins/markitup/markitup/sets/html/images/bold.png index 51ddb88..61edec0 100644 Binary files a/plugins/markitup/markitup/sets/html/images/bold.png and b/plugins/markitup/markitup/sets/html/images/bold.png differ diff --git a/plugins/markitup/markitup/sets/html/images/colors.png b/plugins/markitup/markitup/sets/html/images/colors.png index 21a570f..72ace9a 100644 Binary files a/plugins/markitup/markitup/sets/html/images/colors.png and b/plugins/markitup/markitup/sets/html/images/colors.png differ diff --git a/plugins/markitup/markitup/sets/html/images/h1.png b/plugins/markitup/markitup/sets/html/images/h1.png index 6fdaef6..7cc1222 100644 Binary files a/plugins/markitup/markitup/sets/html/images/h1.png and b/plugins/markitup/markitup/sets/html/images/h1.png differ diff --git a/plugins/markitup/markitup/sets/html/images/h2.png b/plugins/markitup/markitup/sets/html/images/h2.png index ab10e73..b19e9f0 100644 Binary files a/plugins/markitup/markitup/sets/html/images/h2.png and b/plugins/markitup/markitup/sets/html/images/h2.png differ diff --git a/plugins/markitup/markitup/sets/html/images/h3.png b/plugins/markitup/markitup/sets/html/images/h3.png index 7c7ca64..476b0bc 100644 Binary files a/plugins/markitup/markitup/sets/html/images/h3.png and b/plugins/markitup/markitup/sets/html/images/h3.png differ diff --git a/plugins/markitup/markitup/sets/html/images/h4.png b/plugins/markitup/markitup/sets/html/images/h4.png index fa8344a..e58ed16 100644 Binary files a/plugins/markitup/markitup/sets/html/images/h4.png and b/plugins/markitup/markitup/sets/html/images/h4.png differ diff --git a/plugins/markitup/markitup/sets/html/images/h5.png b/plugins/markitup/markitup/sets/html/images/h5.png index 553a36e..7fb9ec6 100644 Binary files a/plugins/markitup/markitup/sets/html/images/h5.png and b/plugins/markitup/markitup/sets/html/images/h5.png differ diff --git a/plugins/markitup/markitup/sets/html/images/h6.png b/plugins/markitup/markitup/sets/html/images/h6.png index 3a4884c..513fe86 100644 Binary files a/plugins/markitup/markitup/sets/html/images/h6.png and b/plugins/markitup/markitup/sets/html/images/h6.png differ diff --git a/plugins/markitup/markitup/sets/html/images/italic.png b/plugins/markitup/markitup/sets/html/images/italic.png index 1b90087..d458a51 100644 Binary files a/plugins/markitup/markitup/sets/html/images/italic.png and b/plugins/markitup/markitup/sets/html/images/italic.png differ diff --git a/plugins/markitup/markitup/sets/html/images/link.png b/plugins/markitup/markitup/sets/html/images/link.png index a1c4093..31da1cf 100644 Binary files a/plugins/markitup/markitup/sets/html/images/link.png and b/plugins/markitup/markitup/sets/html/images/link.png differ diff --git a/plugins/markitup/markitup/sets/html/images/paragraph.png b/plugins/markitup/markitup/sets/html/images/paragraph.png index f9341ce..a5fb1dd 100644 Binary files a/plugins/markitup/markitup/sets/html/images/paragraph.png and b/plugins/markitup/markitup/sets/html/images/paragraph.png differ diff --git a/plugins/markitup/markitup/sets/html/images/preview.png b/plugins/markitup/markitup/sets/html/images/preview.png index bf265d8..b29c73a 100644 Binary files a/plugins/markitup/markitup/sets/html/images/preview.png and b/plugins/markitup/markitup/sets/html/images/preview.png differ diff --git a/plugins/markitup/markitup/sets/html/images/stroke.png b/plugins/markitup/markitup/sets/html/images/stroke.png index 7e96556..c910b59 100644 Binary files a/plugins/markitup/markitup/sets/html/images/stroke.png and b/plugins/markitup/markitup/sets/html/images/stroke.png differ diff --git a/plugins/markitup/markitup/skins/simple/images/handle.png b/plugins/markitup/markitup/skins/simple/images/handle.png index 708cca5..cd6f335 100644 Binary files a/plugins/markitup/markitup/skins/simple/images/handle.png and b/plugins/markitup/markitup/skins/simple/images/handle.png differ diff --git a/plugins/markitup/markitup/skins/simple/images/submenu.png b/plugins/markitup/markitup/skins/simple/images/submenu.png index d2ff09a..93a3b4f 100644 Binary files a/plugins/markitup/markitup/skins/simple/images/submenu.png and b/plugins/markitup/markitup/skins/simple/images/submenu.png differ diff --git a/public/assets/img/chocolat/close.gif b/public/assets/img/chocolat/close.gif index 77933f7..72250cc 100644 Binary files a/public/assets/img/chocolat/close.gif and b/public/assets/img/chocolat/close.gif differ diff --git a/public/assets/img/chocolat/closew.gif b/public/assets/img/chocolat/closew.gif index 30df8c2..7de11a3 100644 Binary files a/public/assets/img/chocolat/closew.gif and b/public/assets/img/chocolat/closew.gif differ diff --git a/public/assets/img/chocolat/left.gif b/public/assets/img/chocolat/left.gif index 51f6ad6..1b69c0d 100644 Binary files a/public/assets/img/chocolat/left.gif and b/public/assets/img/chocolat/left.gif differ diff --git a/public/assets/img/chocolat/leftw.gif b/public/assets/img/chocolat/leftw.gif index bd831a6..9a3b840 100644 Binary files a/public/assets/img/chocolat/leftw.gif and b/public/assets/img/chocolat/leftw.gif differ diff --git a/public/assets/img/chocolat/loading.gif b/public/assets/img/chocolat/loading.gif index c0bb352..fb04711 100644 Binary files a/public/assets/img/chocolat/loading.gif and b/public/assets/img/chocolat/loading.gif differ diff --git a/public/assets/img/chocolat/loadingw.gif b/public/assets/img/chocolat/loadingw.gif index 50695c0..78855c0 100644 Binary files a/public/assets/img/chocolat/loadingw.gif and b/public/assets/img/chocolat/loadingw.gif differ diff --git a/public/assets/img/chocolat/right.gif b/public/assets/img/chocolat/right.gif index 9c6f329..4f54797 100644 Binary files a/public/assets/img/chocolat/right.gif and b/public/assets/img/chocolat/right.gif differ diff --git a/public/assets/img/chocolat/rightw.gif b/public/assets/img/chocolat/rightw.gif index dda82ad..3045e8d 100644 Binary files a/public/assets/img/chocolat/rightw.gif and b/public/assets/img/chocolat/rightw.gif differ diff --git a/public/assets/img/flags/es.png b/public/assets/img/flags/es.png index df2315f..78bbe37 100644 Binary files a/public/assets/img/flags/es.png and b/public/assets/img/flags/es.png differ diff --git a/public/assets/img/flags/fa.png b/public/assets/img/flags/fa.png index 5388dfb..1295adf 100644 Binary files a/public/assets/img/flags/fa.png and b/public/assets/img/flags/fa.png differ diff --git a/public/assets/img/flags/fr.png b/public/assets/img/flags/fr.png index b18c5ff..1e9013c 100644 Binary files a/public/assets/img/flags/fr.png and b/public/assets/img/flags/fr.png differ diff --git a/public/assets/img/flags/it.png b/public/assets/img/flags/it.png index 42d1677..3e14039 100644 Binary files a/public/assets/img/flags/it.png and b/public/assets/img/flags/it.png differ diff --git a/public/assets/img/flags/pl.png b/public/assets/img/flags/pl.png index e30222e..6de128a 100644 Binary files a/public/assets/img/flags/pl.png and b/public/assets/img/flags/pl.png differ diff --git a/public/assets/img/flags/ru.png b/public/assets/img/flags/ru.png index 0d74832..2c477de 100644 Binary files a/public/assets/img/flags/ru.png and b/public/assets/img/flags/ru.png differ diff --git a/public/assets/img/glyphicons-halflings-white.png b/public/assets/img/glyphicons-halflings-white.png index 3bf6484..9e40952 100644 Binary files a/public/assets/img/glyphicons-halflings-white.png and b/public/assets/img/glyphicons-halflings-white.png differ diff --git a/public/assets/img/glyphicons-halflings.png b/public/assets/img/glyphicons-halflings.png index a996999..5b67ffd 100644 Binary files a/public/assets/img/glyphicons-halflings.png and b/public/assets/img/glyphicons-halflings.png differ diff --git a/public/assets/img/monstra-logo-256px.png b/public/assets/img/monstra-logo-256px.png index 49771f4..d6a59f0 100644 Binary files a/public/assets/img/monstra-logo-256px.png and b/public/assets/img/monstra-logo-256px.png differ diff --git a/public/assets/img/monstra-logo.png b/public/assets/img/monstra-logo.png index 039f4aa..3093c4a 100644 Binary files a/public/assets/img/monstra-logo.png and b/public/assets/img/monstra-logo.png differ diff --git a/public/themes/default/css/default.css b/public/themes/default/css/default.css index 77cb62c..3a8d18d 100644 --- a/public/themes/default/css/default.css +++ b/public/themes/default/css/default.css @@ -29,7 +29,7 @@ body { .label, .input-group-addon, code { - border-radius: 0px; + border-radius: 0; } .badge, .label { diff --git a/public/themes/default/header.chunk.php b/public/themes/default/header.chunk.php index e74bda3..a121f44 100644 --- a/public/themes/default/header.chunk.php +++ b/public/themes/default/header.chunk.php @@ -26,12 +26,12 @@ - + - +
- 'btn btn-small')); ?> - + 'btn btn-primary')); ?> + +
'btn btn-actions btn-small btn-actions-default', 'onclick' => "return confirmDelete('".__('Delete script: :name', 'themes', array(':name' => basename($script, '.js')))."')")); + array('class' => 'btn btn-actions btn-danger btn-actions-default', 'onclick' => "return confirmDelete('".__('Delete script: :name', 'themes', array(':name' => basename($script, '.js')))."')")); ?> -