alchemy_cms 4.1.0.beta → 4.1.0.rc1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/ISSUE_TEMPLATE/Bug_report.md +27 -0
- data/.github/ISSUE_TEMPLATE/Feature_request.md +17 -0
- data/CHANGELOG.md +228 -170
- data/PULL_REQUEST_TEMPLATE.md +14 -0
- data/README.md +10 -0
- data/alchemy_cms.gemspec +1 -1
- data/app/assets/images/alchemy/icon-white.svg +1 -0
- data/app/assets/javascripts/alchemy/admin.js +4 -4
- data/app/assets/javascripts/alchemy/alchemy.buttons.js.coffee +5 -1
- data/app/assets/javascripts/alchemy/alchemy.dragndrop.js.coffee +2 -2
- data/app/assets/javascripts/alchemy/alchemy.element_editors.js.coffee +0 -2
- data/app/assets/javascripts/alchemy/alchemy.link_dialog.js.coffee +3 -2
- data/app/assets/stylesheets/alchemy/_extends.scss +3 -18
- data/app/assets/stylesheets/alchemy/_mixins.scss +32 -16
- data/app/assets/stylesheets/alchemy/_variables.scss +19 -14
- data/app/assets/stylesheets/alchemy/admin.scss +1 -0
- data/app/assets/stylesheets/alchemy/archive.scss +49 -162
- data/app/assets/stylesheets/alchemy/base.scss +4 -4
- data/app/assets/stylesheets/alchemy/buttons.scss +14 -40
- data/app/assets/stylesheets/alchemy/dialogs.scss +1 -2
- data/app/assets/stylesheets/alchemy/elements.scss +49 -33
- data/app/assets/stylesheets/alchemy/form_fields.scss +11 -2
- data/app/assets/stylesheets/alchemy/forms.scss +1 -1
- data/app/assets/stylesheets/alchemy/frame.scss +3 -2
- data/app/assets/stylesheets/alchemy/image_library.scss +19 -13
- data/app/assets/stylesheets/alchemy/jquery.datetimepicker.scss +10 -13
- data/app/assets/stylesheets/alchemy/menubar.scss +8 -6
- data/app/assets/stylesheets/alchemy/navigation.scss +18 -0
- data/app/assets/stylesheets/alchemy/preview_window.scss +1 -1
- data/app/assets/stylesheets/alchemy/search.scss +6 -57
- data/app/assets/stylesheets/alchemy/selects.scss +6 -20
- data/app/assets/stylesheets/alchemy/sitemap.scss +2 -2
- data/app/assets/stylesheets/alchemy/spinner.scss +1 -1
- data/app/assets/stylesheets/alchemy/tables.scss +19 -2
- data/app/assets/stylesheets/alchemy/tags.scss +183 -0
- data/app/assets/stylesheets/alchemy/toolbar.scss +0 -2
- data/app/assets/stylesheets/alchemy/upload.scss +1 -1
- data/app/assets/stylesheets/alchemy/welcome.sass +11 -11
- data/app/assets/stylesheets/tinymce/skins/alchemy/skin.min.css.scss +9 -3
- data/app/controllers/alchemy/admin/dashboard_controller.rb +1 -1
- data/app/controllers/alchemy/admin/elements_controller.rb +4 -1
- data/app/controllers/alchemy/admin/pictures_controller.rb +1 -1
- data/app/controllers/alchemy/pages_controller.rb +1 -1
- data/app/helpers/alchemy/admin/base_helper.rb +1 -1
- data/app/models/alchemy/cell.rb +1 -1
- data/app/models/alchemy/content.rb +2 -2
- data/app/models/alchemy/element.rb +3 -3
- data/app/models/alchemy/essence_file.rb +1 -1
- data/app/models/alchemy/essence_picture.rb +1 -1
- data/app/models/alchemy/folded_page.rb +2 -3
- data/app/models/alchemy/language.rb +1 -1
- data/app/models/alchemy/page.rb +1 -1
- data/app/models/alchemy/picture/transformations.rb +4 -1
- data/app/views/alchemy/admin/elements/index.html.erb +4 -2
- data/app/views/alchemy/admin/elements/new.html.erb +2 -1
- data/app/views/alchemy/admin/pictures/_infos.html.erb +17 -6
- data/app/views/alchemy/admin/uploader/_button.html.erb +2 -2
- data/app/views/alchemy/essences/shared/_essence_picture_tools.html.erb +12 -7
- data/app/views/alchemy/essences/shared/_linkable_essence_tools.html.erb +1 -0
- data/app/views/alchemy/welcome.html.erb +0 -2
- data/config/initializers/assets.rb +1 -0
- data/config/locales/alchemy.en.yml +1 -0
- data/lib/alchemy/tinymce.rb +1 -1
- data/lib/alchemy/version.rb +1 -1
- data/vendor/assets/stylesheets/{jquery.Jcrop.min.css → jquery.Jcrop.min.scss} +1 -1
- metadata +10 -5
@@ -5,8 +5,6 @@
|
|
5
5
|
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
6
6
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
7
7
|
<title>Welcome to AlchemyCMS</title>
|
8
|
-
<link href='https://fonts.googleapis.com/css?family=Bitter' rel='stylesheet' type='text/css'>
|
9
|
-
<link href='https://fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css'>
|
10
8
|
<%= stylesheet_link_tag "alchemy/welcome", media: "all" %>
|
11
9
|
</head>
|
12
10
|
<body>
|
data/lib/alchemy/tinymce.rb
CHANGED
@@ -7,7 +7,7 @@ module Alchemy
|
|
7
7
|
@@plugins = %w(alchemy_link anchor autoresize charmap code directionality fullscreen hr link paste tabfocus table)
|
8
8
|
@@init = {
|
9
9
|
skin: 'alchemy',
|
10
|
-
width: '
|
10
|
+
width: 'auto',
|
11
11
|
resize: true,
|
12
12
|
autoresize_min_height: '105',
|
13
13
|
autoresize_max_height: '480',
|
data/lib/alchemy/version.rb
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
/* jquery.Jcrop.min.css v0.9.10 (build:20120429) */
|
2
2
|
.jcrop-holder{direction:ltr;text-align:left;}
|
3
|
-
.jcrop-vline,.jcrop-hline{background:#FFF url(
|
3
|
+
.jcrop-vline,.jcrop-hline{background:#FFF image-url('Jcrop.gif') top left repeat;font-size:0;position:absolute;}
|
4
4
|
.jcrop-vline{height:100%;width:1px!important;}
|
5
5
|
.jcrop-hline{height:1px!important;width:100%;}
|
6
6
|
.jcrop-vline.right{right:0;}
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: alchemy_cms
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 4.1.0.
|
4
|
+
version: 4.1.0.rc1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Thomas von Deyen
|
@@ -13,7 +13,7 @@ authors:
|
|
13
13
|
autorequire:
|
14
14
|
bindir: bin
|
15
15
|
cert_chain: []
|
16
|
-
date: 2018-
|
16
|
+
date: 2018-05-18 00:00:00.000000000 Z
|
17
17
|
dependencies:
|
18
18
|
- !ruby/object:Gem::Dependency
|
19
19
|
name: active_model_serializers
|
@@ -179,14 +179,14 @@ dependencies:
|
|
179
179
|
requirements:
|
180
180
|
- - "~>"
|
181
181
|
- !ruby/object:Gem::Version
|
182
|
-
version:
|
182
|
+
version: '6.0'
|
183
183
|
type: :runtime
|
184
184
|
prerelease: false
|
185
185
|
version_requirements: !ruby/object:Gem::Requirement
|
186
186
|
requirements:
|
187
187
|
- - "~>"
|
188
188
|
- !ruby/object:Gem::Version
|
189
|
-
version:
|
189
|
+
version: '6.0'
|
190
190
|
- !ruby/object:Gem::Dependency
|
191
191
|
name: kaminari
|
192
192
|
requirement: !ruby/object:Gem::Requirement
|
@@ -348,6 +348,8 @@ extra_rdoc_files: []
|
|
348
348
|
files:
|
349
349
|
- ".codeclimate.yml"
|
350
350
|
- ".editorconfig"
|
351
|
+
- ".github/ISSUE_TEMPLATE/Bug_report.md"
|
352
|
+
- ".github/ISSUE_TEMPLATE/Feature_request.md"
|
351
353
|
- ".gitignore"
|
352
354
|
- ".hound.yml"
|
353
355
|
- ".localeapp/config.rb"
|
@@ -361,12 +363,14 @@ files:
|
|
361
363
|
- CONTRIBUTING.md
|
362
364
|
- Gemfile
|
363
365
|
- LICENSE
|
366
|
+
- PULL_REQUEST_TEMPLATE.md
|
364
367
|
- README.md
|
365
368
|
- Rakefile
|
366
369
|
- alchemy_cms.gemspec
|
367
370
|
- app/assets/images/alchemy/alchemy-logo.png
|
368
371
|
- app/assets/images/alchemy/alchemy-logo.svg
|
369
372
|
- app/assets/images/alchemy/favicon.ico
|
373
|
+
- app/assets/images/alchemy/icon-white.svg
|
370
374
|
- app/assets/images/alchemy/icon.svg
|
371
375
|
- app/assets/images/alchemy/lupe.cur
|
372
376
|
- app/assets/javascripts/alchemy/admin.js
|
@@ -446,6 +450,7 @@ files:
|
|
446
450
|
- app/assets/stylesheets/alchemy/sitemap.scss
|
447
451
|
- app/assets/stylesheets/alchemy/spinner.scss
|
448
452
|
- app/assets/stylesheets/alchemy/tables.scss
|
453
|
+
- app/assets/stylesheets/alchemy/tags.scss
|
449
454
|
- app/assets/stylesheets/alchemy/toolbar.scss
|
450
455
|
- app/assets/stylesheets/alchemy/trash.scss
|
451
456
|
- app/assets/stylesheets/alchemy/upload.scss
|
@@ -936,7 +941,7 @@ files:
|
|
936
941
|
- vendor/assets/stylesheets/fontawesome/fa-regular.scss
|
937
942
|
- vendor/assets/stylesheets/fontawesome/fa-solid.scss
|
938
943
|
- vendor/assets/stylesheets/fontawesome/fontawesome.scss
|
939
|
-
- vendor/assets/stylesheets/jquery.Jcrop.min.
|
944
|
+
- vendor/assets/stylesheets/jquery.Jcrop.min.scss
|
940
945
|
homepage: https://alchemy-cms.com
|
941
946
|
licenses:
|
942
947
|
- BSD New
|