alchemy_cms 4.2.4 → 4.3.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/FUNDING.yml +4 -0
- data/.travis.yml +8 -6
- data/CHANGELOG.md +15 -10
- data/Gemfile +2 -10
- data/README.md +11 -4
- data/Rakefile +3 -2
- data/alchemy_cms.gemspec +11 -2
- data/app/assets/javascripts/alchemy/alchemy.dialog.js.coffee +3 -3
- data/app/assets/javascripts/alchemy/alchemy.elements_window.js.coffee +1 -1
- data/app/assets/stylesheets/alchemy/buttons.scss +15 -2
- data/app/assets/stylesheets/alchemy/elements.scss +4 -0
- data/app/assets/stylesheets/alchemy/form_fields.scss +1 -0
- data/app/assets/stylesheets/alchemy/forms.scss +1 -0
- data/app/assets/stylesheets/alchemy/frame.scss +9 -29
- data/app/assets/stylesheets/alchemy/navigation.scss +30 -6
- data/app/assets/stylesheets/alchemy/preview_window.scss +4 -0
- data/app/controllers/alchemy/admin/elements_controller.rb +2 -2
- data/app/controllers/alchemy/pages_controller.rb +9 -4
- data/app/helpers/alchemy/elements_helper.rb +2 -2
- data/app/models/alchemy/element.rb +9 -4
- data/app/models/alchemy/page/page_elements.rb +17 -25
- data/app/models/alchemy/page/page_scopes.rb +1 -1
- data/app/models/alchemy/picture.rb +0 -21
- data/app/views/alchemy/admin/elements/_element.html.erb +2 -1
- data/app/views/alchemy/admin/pages/edit.html.erb +10 -10
- data/lib/alchemy/on_page_layout.rb +1 -1
- data/lib/alchemy/test_support/factories.rb +3 -1
- data/lib/alchemy/test_support/factories/attachment_factory.rb +2 -0
- data/lib/alchemy/test_support/factories/content_factory.rb +5 -0
- data/lib/alchemy/test_support/factories/dummy_user_factory.rb +2 -0
- data/lib/alchemy/test_support/factories/element_factory.rb +3 -0
- data/lib/alchemy/test_support/factories/essence_file_factory.rb +2 -0
- data/lib/alchemy/test_support/factories/essence_picture_factory.rb +2 -0
- data/lib/alchemy/test_support/factories/essence_text_factory.rb +2 -0
- data/lib/alchemy/test_support/factories/language_factory.rb +2 -0
- data/lib/alchemy/test_support/factories/page_factory.rb +2 -0
- data/lib/alchemy/test_support/factories/picture_factory.rb +2 -0
- data/lib/alchemy/test_support/factories/site_factory.rb +2 -0
- data/lib/alchemy/test_support/shared_uploader_examples.rb +1 -1
- data/lib/alchemy/upgrader/tasks/cells_migration.rb +2 -4
- data/lib/alchemy/upgrader/tasks/cells_upgrader.rb +2 -3
- data/lib/alchemy/upgrader/tasks/picture_gallery_upgrader.rb +4 -4
- data/lib/alchemy/version.rb +5 -1
- data/lib/alchemy_cms.rb +0 -1
- data/lib/rails/generators/alchemy/elements/templates/view.html.erb +1 -1
- data/lib/rails/generators/alchemy/elements/templates/view.html.haml +1 -1
- data/lib/rails/generators/alchemy/elements/templates/view.html.slim +1 -1
- data/vendor/assets/javascripts/fileupload/jquery.fileupload-process.js +5 -2
- data/vendor/assets/javascripts/fileupload/jquery.fileupload-validate.js +5 -2
- data/vendor/assets/javascripts/fileupload/jquery.fileupload.js +28 -8
- data/vendor/assets/javascripts/fileupload/jquery.iframe-transport.js +11 -4
- metadata +129 -12
- data/.teatro.yml +0 -8
- data/lib/alchemy/picture_attributes.rb +0 -28
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 6793e9729b0c34e11be7a3e2d3f7ff0349487160e4475dd996f7f9f7fcb934e2
|
4
|
+
data.tar.gz: ce5abeb95c686969111f5416119044f48e4b14567a06c304c273834b23bf7ebb
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 3b491617ba28d0076d0a9dfbfac6eccc4dcd6d10e10d50a3491b5b5c24c3a46e0ede45ce7541e59fc6be118a6833ba89c73db39c885e454892d0e5509215c134
|
7
|
+
data.tar.gz: 2707ac47411012a25a279fdd9fefeffdaffa1109f17870468d9995d5291c35e96ed4103f457986ba3dbccf23f6f8aba34ebe5476ca9d166ca5c4dd357b6c1065
|
data/.github/FUNDING.yml
ADDED
data/.travis.yml
CHANGED
@@ -1,16 +1,18 @@
|
|
1
1
|
language: ruby
|
2
|
-
dist:
|
2
|
+
dist: bionic
|
3
3
|
sudo: false
|
4
|
+
services:
|
5
|
+
- mysql
|
4
6
|
addons:
|
7
|
+
postgresql: "10"
|
5
8
|
apt:
|
6
9
|
packages:
|
7
10
|
- chromium-chromedriver
|
8
11
|
cache:
|
9
12
|
bundler: true
|
10
13
|
rvm:
|
11
|
-
- 2.
|
12
|
-
- 2.
|
13
|
-
- 2.6.0
|
14
|
+
- 2.5.5
|
15
|
+
- 2.6.3
|
14
16
|
before_install:
|
15
17
|
- gem install bundler
|
16
18
|
before_script:
|
@@ -19,8 +21,8 @@ before_script:
|
|
19
21
|
script: bundle exec rspec
|
20
22
|
after_success: bundle exec codeclimate-test-reporter
|
21
23
|
env:
|
22
|
-
- DB=mysql
|
23
|
-
- DB=postgresql
|
24
|
+
- DB=mysql
|
25
|
+
- DB=postgresql
|
24
26
|
notifications:
|
25
27
|
slack:
|
26
28
|
secure: QzOFw1Ph69pzwWBFgtIVkOnjbcRxB9HPRQ+RYjK+2tg+fsbiTJ+wYgHcZL49tPYcLAls4kymkFWzWBF3PCAXJMfKgUCqXzdQ2FuJC/JoVRTLll4wDnZFPG33jsm5tVznmycZ3ma4+ZWfJQ+C+elEBOba6v1kG9eGIy6sH2cvXfE=
|
data/CHANGELOG.md
CHANGED
@@ -1,13 +1,15 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
-
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
-
|
8
|
-
-
|
9
|
-
-
|
10
|
-
-
|
1
|
+
# 4.3.0 (2019-08-23)
|
2
|
+
|
3
|
+
- Add Rails 6 support [#1616](https://github.com/AlchemyCMS/alchemy_cms/pull/1616) ([tvdeyen](https://github.com/tvdeyen))
|
4
|
+
- Use media_type over content_type in specs [#1615](https://github.com/AlchemyCMS/alchemy_cms/pull/1615) ([tvdeyen](https://github.com/tvdeyen))
|
5
|
+
- Remove unused Picture#security_token method [#1614](https://github.com/AlchemyCMS/alchemy_cms/pull/1614) ([tvdeyen](https://github.com/tvdeyen))
|
6
|
+
- rspec-rails 4 [#1613](https://github.com/AlchemyCMS/alchemy_cms/pull/1613) ([tvdeyen](https://github.com/tvdeyen))
|
7
|
+
- Update Dummy test app to Rails 5.2 [#1612](https://github.com/AlchemyCMS/alchemy_cms/pull/1612) ([tvdeyen](https://github.com/tvdeyen))
|
8
|
+
- add default styling for number inputs [#1598](https://github.com/AlchemyCMS/alchemy_cms/pull/1598) ([alexanderadam](https://github.com/alexanderadam))
|
9
|
+
- Upgrade responders to version 3.0.0 [#1593](https://github.com/AlchemyCMS/alchemy_cms/pull/1593) ([depfu](https://github.com/apps/depfu))
|
10
|
+
- Update jquery fileupload plugin [#1592](https://github.com/AlchemyCMS/alchemy_cms/pull/1592) ([tvdeyen](https://github.com/tvdeyen))
|
11
|
+
- Only return visible elements from Pages elements relations [#1590](https://github.com/AlchemyCMS/alchemy_cms/pull/1590) ([tvdeyen](https://github.com/tvdeyen))
|
12
|
+
- Only return visible elements from Elements nested_elements relation [#1589](https://github.com/AlchemyCMS/alchemy_cms/pull/1589) ([tvdeyen](https://github.com/tvdeyen))
|
11
13
|
|
12
14
|
## 4.2.2 (2019-08-13)
|
13
15
|
|
@@ -53,6 +55,7 @@
|
|
53
55
|
- Use Flatpickr as Datepicker [#1533](https://github.com/AlchemyCMS/alchemy_cms/pull/1533) ([mamhoff](https://github.com/mamhoff))
|
54
56
|
- Use system tests over feature specs [#1528](https://github.com/AlchemyCMS/alchemy_cms/pull/1528) ([tvdeyen](https://github.com/tvdeyen))
|
55
57
|
- Flexible width for admin navigation entry labels [#1527](https://github.com/AlchemyCMS/alchemy_cms/pull/1527) ([tvdeyen](https://github.com/tvdeyen))
|
58
|
+
- Render new page when there is a flash message [#1525](https://github.com/AlchemyCMS/alchemy_cms/pull/1525) ([jedrekdomanski](https://github.com/jedrekdomanski))
|
56
59
|
- Responsive elements window and sidebar [#1519](https://github.com/AlchemyCMS/alchemy_cms/pull/1519) ([tvdeyen](https://github.com/tvdeyen))
|
57
60
|
- Change element eye icon on public state [#1517](https://github.com/AlchemyCMS/alchemy_cms/pull/1517) ([oniram88](https://github.com/oniram88))
|
58
61
|
- Maximize element window if Tinymce is fullscreen [#1515](https://github.com/AlchemyCMS/alchemy_cms/pull/1515) ([tvdeyen](https://github.com/tvdeyen))
|
@@ -60,6 +63,7 @@
|
|
60
63
|
- Feature: Autogenerate nestable elements [#1513](https://github.com/AlchemyCMS/alchemy_cms/pull/1513) ([tvdeyen](https://github.com/tvdeyen))
|
61
64
|
- Allow "data" key for module navigations [#1512](https://github.com/AlchemyCMS/alchemy_cms/pull/1512) ([mamhoff](https://github.com/mamhoff))
|
62
65
|
- Allow to define layout for page previews [#1500](https://github.com/AlchemyCMS/alchemy_cms/pull/1500) ([westonganger](https://github.com/westonganger))
|
66
|
+
- Disable page publish/view page buttons according to published_at [#1498](https://github.com/AlchemyCMS/alchemy_cms/pull/1498) ([westonganger](https://github.com/westonganger))
|
63
67
|
- Fix capitalization for login/logout/leave [#1497](https://github.com/AlchemyCMS/alchemy_cms/pull/1497) ([westonganger](https://github.com/westonganger))
|
64
68
|
- Verify controller keys within `register_module` [#1495](https://github.com/AlchemyCMS/alchemy_cms/pull/1495) ([westonganger](https://github.com/westonganger))
|
65
69
|
- Update bundled Tinymce to 4.8.3 [#1491](https://github.com/AlchemyCMS/alchemy_cms/pull/1491) ([tvdeyen](https://github.com/tvdeyen))
|
@@ -519,3 +523,4 @@ No changes
|
|
519
523
|
## 3.0.0 (2014-07-03)
|
520
524
|
|
521
525
|
[Release Notes](https://github.com/AlchemyCMS/alchemy_cms/releases/tag/v3.0.0)
|
526
|
+
|
data/Gemfile
CHANGED
@@ -2,12 +2,12 @@ source 'https://rubygems.org'
|
|
2
2
|
|
3
3
|
gemspec
|
4
4
|
|
5
|
-
gem 'rails', '~>
|
5
|
+
gem 'rails', '~> 6.0.0'
|
6
6
|
|
7
7
|
# Profiling
|
8
8
|
gem 'rack-mini-profiler', group: :development, require: false
|
9
9
|
|
10
|
-
gem 'sqlite3', '~> 1.
|
10
|
+
gem 'sqlite3', '~> 1.4.1' if ENV['DB'].nil? || ENV['DB'] == 'sqlite'
|
11
11
|
gem 'mysql2', '~> 0.5.1' if ENV['DB'] == 'mysql'
|
12
12
|
gem 'pg', '~> 1.0' if ENV['DB'] == 'postgresql'
|
13
13
|
gem 'sassc-rails'
|
@@ -31,14 +31,6 @@ group :development, :test do
|
|
31
31
|
gem 'dotenv', '~> 2.2'
|
32
32
|
gem 'github_fast_changelog', require: false
|
33
33
|
end
|
34
|
-
gem 'capybara', '~> 3.0'
|
35
|
-
gem 'capybara-screenshot', '~> 1.0'
|
36
|
-
gem 'factory_bot_rails', '~> 5.0'
|
37
|
-
gem 'selenium-webdriver', '~> 3.8'
|
38
|
-
gem 'rspec-activemodel-mocks', '~> 1.0'
|
39
|
-
gem 'rspec-rails', '~> 3.7'
|
40
|
-
gem 'shoulda-matchers', '~> 4.0'
|
41
|
-
gem 'rails-controller-testing', '~> 1.0'
|
42
34
|
end
|
43
35
|
|
44
36
|
# We need this if we want to start the dummy app in production, ie on Teatro.io
|
data/README.md
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
# AlchemyCMS
|
2
2
|
|
3
3
|
[![Gem Version](https://badge.fury.io/rb/alchemy_cms.svg)](http://badge.fury.io/rb/alchemy_cms)
|
4
|
-
[![Build Status](https://travis-ci.org/AlchemyCMS/alchemy_cms.svg?branch=
|
4
|
+
[![Build Status](https://travis-ci.org/AlchemyCMS/alchemy_cms.svg?branch=master)](https://travis-ci.org/AlchemyCMS/alchemy_cms)
|
5
5
|
[![Maintainability](https://api.codeclimate.com/v1/badges/196c56c56568ed24a697/maintainability)](https://codeclimate.com/github/AlchemyCMS/alchemy_cms/maintainability)
|
6
6
|
[![Test Coverage](https://api.codeclimate.com/v1/badges/196c56c56568ed24a697/test_coverage)](https://codeclimate.com/github/AlchemyCMS/alchemy_cms/test_coverage)
|
7
7
|
[![Depfu](https://badges.depfu.com/badges/ebe56d2dd7b7044a8ae700cc81212a8e/overview.svg)](https://depfu.com/github/AlchemyCMS/alchemy_cms?project_id=4600)
|
@@ -18,6 +18,9 @@ Alchemy is an open source CMS engine written in Ruby on Rails.
|
|
18
18
|
|
19
19
|
Read more about Alchemy on the [website](https://alchemy-cms.com) and in the [guidelines](https://guides.alchemy-cms.com).
|
20
20
|
|
21
|
+
**CAUTION: This master branch is a development branch that *can* contain bugs. For productive environments you should use the [current Ruby gem version](https://rubygems.org/gems/alchemy_cms), or the [latest stable branch (4.2-stable)](https://github.com/AlchemyCMS/alchemy_cms/tree/4.2-stable).**
|
22
|
+
|
23
|
+
|
21
24
|
## ✅ Features
|
22
25
|
|
23
26
|
- Flexible templating that separates content from markup
|
@@ -48,7 +51,7 @@ or visit the existing demo at https://alchemy-demo.herokuapp.com
|
|
48
51
|
|
49
52
|
## 🚂 Rails Version
|
50
53
|
|
51
|
-
**This version of
|
54
|
+
**This version of AlchemyCMS runs with all versions of Rails 5 and Rails 6**
|
52
55
|
|
53
56
|
* For a Rails 4.2 compatible version use the [`3.6-stable` branch](https://github.com/AlchemyCMS/alchemy_cms/tree/3.6-stable).
|
54
57
|
* For a Rails 4.0/4.1 compatible version use the [`3.1-stable` branch](https://github.com/AlchemyCMS/alchemy_cms/tree/3.1-stable).
|
@@ -80,9 +83,11 @@ For a Ruby 1.8.7 compatible version use the [`2.3-stable` branch](https://github
|
|
80
83
|
Put this into your `Gemfile`:
|
81
84
|
|
82
85
|
```ruby
|
83
|
-
gem 'alchemy_cms', github: 'AlchemyCMS/alchemy_cms', branch: '
|
86
|
+
gem 'alchemy_cms', github: 'AlchemyCMS/alchemy_cms', branch: 'master'
|
84
87
|
```
|
85
88
|
|
89
|
+
**NOTE:** You normally want to use a stable branch, like `4.1-stable`.
|
90
|
+
|
86
91
|
#### 2. Update your bundle:
|
87
92
|
|
88
93
|
```bash
|
@@ -99,9 +104,11 @@ the Devise based user model that Alchemy provides and was extracted [into its ow
|
|
99
104
|
If you don't have your own user class, you can use the Alchemy user model. Just add the following gem into your `Gemfile`:
|
100
105
|
|
101
106
|
```ruby
|
102
|
-
gem 'alchemy-devise', github: 'AlchemyCMS/alchemy-devise', branch: '
|
107
|
+
gem 'alchemy-devise', github: 'AlchemyCMS/alchemy-devise', branch: 'master'
|
103
108
|
```
|
104
109
|
|
110
|
+
**NOTE:** You normally want to use a stable branch, like `4.1-stable`.
|
111
|
+
|
105
112
|
Then run:
|
106
113
|
|
107
114
|
```bash
|
data/Rakefile
CHANGED
@@ -42,6 +42,7 @@ namespace :alchemy do
|
|
42
42
|
system <<-BASH
|
43
43
|
cd spec/dummy
|
44
44
|
export RAILS_ENV=test
|
45
|
+
bin/rake db:create
|
45
46
|
bin/rake db:environment:set
|
46
47
|
bin/rake db:migrate:reset
|
47
48
|
cd -
|
@@ -50,12 +51,12 @@ BASH
|
|
50
51
|
end
|
51
52
|
|
52
53
|
namespace :changelog do
|
53
|
-
desc "Update changelog"
|
54
|
+
desc "Update CHANGELOG from GitHub (Set GITHUB_ACCESS_TOKEN and PREVIOUS_VERSION to a version you want to write changelog changes for)"
|
54
55
|
task :update do
|
55
56
|
original_file = './CHANGELOG.md'
|
56
57
|
new_file = original_file + '.new'
|
57
58
|
backup = original_file + '.old'
|
58
|
-
changes = `git rev-list v#{ENV['PREVIOUS_VERSION']}
|
59
|
+
changes = `git rev-list v#{ENV['PREVIOUS_VERSION']}..HEAD | bundle exec github_fast_changelog AlchemyCMS/alchemy_cms`
|
59
60
|
File.open(new_file, 'w') do |fo|
|
60
61
|
fo.puts changes
|
61
62
|
File.foreach(original_file) do |li|
|
data/alchemy_cms.gemspec
CHANGED
@@ -32,14 +32,23 @@ Gem::Specification.new do |gem|
|
|
32
32
|
gem.add_runtime_dependency 'kaminari', ['~> 1.1']
|
33
33
|
gem.add_runtime_dependency 'originator', ['~> 3.1']
|
34
34
|
gem.add_runtime_dependency 'non-stupid-digest-assets', ['~> 1.0.8']
|
35
|
-
gem.add_runtime_dependency 'rails', ['
|
35
|
+
gem.add_runtime_dependency 'rails', ['>= 5.0.0', '< 6.1']
|
36
36
|
gem.add_runtime_dependency 'ransack', ['>= 1.8', '< 3.0']
|
37
37
|
gem.add_runtime_dependency 'request_store', ['~> 1.2']
|
38
|
-
gem.add_runtime_dependency 'responders', ['
|
38
|
+
gem.add_runtime_dependency 'responders', ['>= 2.0', '< 4.0']
|
39
39
|
gem.add_runtime_dependency 'select2-rails', ['>= 3.5.9.1', '< 4.0']
|
40
40
|
gem.add_runtime_dependency 'simple_form', ['~> 4.0']
|
41
41
|
gem.add_runtime_dependency 'turbolinks', ['>= 2.5']
|
42
42
|
|
43
|
+
gem.add_development_dependency 'capybara', ['~> 3.0']
|
44
|
+
gem.add_development_dependency 'capybara-screenshot', ['~> 1.0']
|
45
|
+
gem.add_development_dependency 'factory_bot_rails', ['~> 5.0']
|
46
|
+
gem.add_development_dependency 'rails-controller-testing', ['~> 1.0']
|
47
|
+
gem.add_development_dependency 'rspec-activemodel-mocks', ['~> 1.0']
|
48
|
+
gem.add_development_dependency 'rspec-rails', ['>= 4.0.0.beta2']
|
49
|
+
gem.add_development_dependency 'selenium-webdriver', ['~> 3.8']
|
50
|
+
gem.add_development_dependency 'shoulda-matchers', ['~> 4.0']
|
51
|
+
|
43
52
|
gem.post_install_message = <<-MSG
|
44
53
|
-------------------------------------------------------------
|
45
54
|
Thank you for installing Alchemy CMS
|
@@ -122,7 +122,7 @@ class window.Alchemy.Dialog
|
|
122
122
|
@show_error(xhr, status)
|
123
123
|
|
124
124
|
# Displays an error message
|
125
|
-
show_error: (xhr, status_message) ->
|
125
|
+
show_error: (xhr, status_message, $container = @dialog_body) ->
|
126
126
|
error_type = "warning"
|
127
127
|
switch xhr.status
|
128
128
|
when 0
|
@@ -135,7 +135,7 @@ class window.Alchemy.Dialog
|
|
135
135
|
error_type = "error"
|
136
136
|
if status_message
|
137
137
|
error_header = status_message
|
138
|
-
console.error
|
138
|
+
console.error(xhr.responseText)
|
139
139
|
else
|
140
140
|
error_header = "#{xhr.statusText} (#{xhr.status})"
|
141
141
|
error_body = "Please check log and try again."
|
@@ -143,7 +143,7 @@ class window.Alchemy.Dialog
|
|
143
143
|
$errorDiv.append Alchemy.messageIcon(error_type)
|
144
144
|
$errorDiv.append "<h1>#{error_header}</h1>"
|
145
145
|
$errorDiv.append "<p>#{error_body}</p>"
|
146
|
-
|
146
|
+
$container.html $errorDiv
|
147
147
|
|
148
148
|
# Binds close events on:
|
149
149
|
# - Close button
|
@@ -53,7 +53,7 @@ Alchemy.ElementsWindow =
|
|
53
53
|
if @callback
|
54
54
|
@callback.call()
|
55
55
|
.fail (xhr, status, error) =>
|
56
|
-
Alchemy.
|
56
|
+
Alchemy.Dialog::show_error(xhr, error, @element_area)
|
57
57
|
|
58
58
|
hide: ->
|
59
59
|
@$body.removeClass('elements-window-visible');
|
@@ -33,6 +33,14 @@ button, input[type="submit"], a.button, input.button {
|
|
33
33
|
margin-right: 2 * $default-margin;
|
34
34
|
color: inherit;
|
35
35
|
}
|
36
|
+
|
37
|
+
&[disabled] {
|
38
|
+
cursor: not-allowed;
|
39
|
+
|
40
|
+
& + label {
|
41
|
+
display: none;
|
42
|
+
}
|
43
|
+
}
|
36
44
|
}
|
37
45
|
|
38
46
|
.icon_button {
|
@@ -79,13 +87,18 @@ button, input[type="submit"], a.button, input.button {
|
|
79
87
|
}
|
80
88
|
}
|
81
89
|
|
82
|
-
&.disabled
|
90
|
+
&.disabled,
|
91
|
+
&[disabled] {
|
83
92
|
|
84
93
|
span {
|
85
94
|
opacity: 0.3;
|
86
95
|
cursor: not-allowed;
|
87
96
|
}
|
88
97
|
|
98
|
+
i {
|
99
|
+
opacity: 0.3;
|
100
|
+
}
|
101
|
+
|
89
102
|
&:hover {
|
90
103
|
cursor: not-allowed;
|
91
104
|
}
|
@@ -121,7 +134,7 @@ button.icon_button {
|
|
121
134
|
margin: 0 2*$default-margin;
|
122
135
|
|
123
136
|
&.active, &:active, &:hover {
|
124
|
-
.icon_button {
|
137
|
+
.icon_button:not([disabled]) {
|
125
138
|
background-color: $default-border-color;
|
126
139
|
cursor: pointer;
|
127
140
|
}
|
@@ -42,18 +42,15 @@ div#overlay_text_box {
|
|
42
42
|
}
|
43
43
|
|
44
44
|
#header {
|
45
|
+
display: flex;
|
45
46
|
height: $header-height;
|
46
47
|
line-height: $header-height;
|
47
48
|
background: $header-background;
|
48
49
|
border-bottom: $default-border;
|
49
50
|
position: relative;
|
50
51
|
|
51
|
-
a {
|
52
|
-
|
53
|
-
|
54
|
-
&:hover {
|
55
|
-
text-decoration: none;
|
56
|
-
}
|
52
|
+
a:hover {
|
53
|
+
text-decoration: none;
|
57
54
|
}
|
58
55
|
|
59
56
|
.page_status_and_name {
|
@@ -76,8 +73,13 @@ div#overlay_text_box {
|
|
76
73
|
}
|
77
74
|
|
78
75
|
.page_name {
|
76
|
+
display: inline-block;
|
77
|
+
max-width: 100px;
|
79
78
|
margin-right: $default-margin;
|
80
79
|
line-height: $header-height;
|
80
|
+
white-space: nowrap;
|
81
|
+
overflow: hidden;
|
82
|
+
text-overflow: ellipsis;
|
81
83
|
}
|
82
84
|
}
|
83
85
|
|
@@ -96,12 +98,10 @@ div#overlay_text_box {
|
|
96
98
|
}
|
97
99
|
|
98
100
|
#user_info {
|
99
|
-
position: absolute;
|
100
|
-
top: 0;
|
101
|
-
right: 0;
|
102
101
|
height: $header-height;
|
103
102
|
font-size: $small-font-size;
|
104
103
|
padding-left: 2*$default-padding;
|
104
|
+
margin-left: auto;
|
105
105
|
border-bottom: $default-border;
|
106
106
|
background-color: $header-background;
|
107
107
|
|
@@ -126,23 +126,3 @@ div#overlay_text_box {
|
|
126
126
|
padding-right: 2*$default-padding;
|
127
127
|
}
|
128
128
|
}
|
129
|
-
|
130
|
-
#locked_pages {
|
131
|
-
|
132
|
-
label {
|
133
|
-
float: left;
|
134
|
-
font-size: $small-font-size;
|
135
|
-
line-height: 27px;
|
136
|
-
height: 27px;
|
137
|
-
margin-left: 8px;
|
138
|
-
margin-right: 4px;
|
139
|
-
}
|
140
|
-
|
141
|
-
img {
|
142
|
-
float: left;
|
143
|
-
}
|
144
|
-
|
145
|
-
.subnavi_tab > a {
|
146
|
-
padding-right: 0;
|
147
|
-
}
|
148
|
-
}
|
@@ -209,19 +209,42 @@
|
|
209
209
|
}
|
210
210
|
}
|
211
211
|
|
212
|
+
#locked_pages {
|
213
|
+
display: flex;
|
214
|
+
flex-grow: 1;
|
215
|
+
flex-wrap: nowrap;
|
216
|
+
height: $header-height;
|
217
|
+
|
218
|
+
label {
|
219
|
+
float: left;
|
220
|
+
font-size: $small-font-size;
|
221
|
+
line-height: 27px;
|
222
|
+
height: 27px;
|
223
|
+
margin-left: 8px;
|
224
|
+
margin-right: 4px;
|
225
|
+
}
|
226
|
+
|
227
|
+
img {
|
228
|
+
float: left;
|
229
|
+
}
|
230
|
+
|
231
|
+
.subnavi_tab > a {
|
232
|
+
padding-right: 0;
|
233
|
+
}
|
234
|
+
}
|
235
|
+
|
212
236
|
.locked_page {
|
213
|
-
|
214
|
-
|
237
|
+
display: flex;
|
238
|
+
flex-wrap: nowrap;
|
215
239
|
line-height: $header-height - 1;
|
216
240
|
color: #444;
|
217
241
|
border-right: $default-border;
|
218
242
|
border-bottom: $default-border;
|
219
|
-
padding-right: 24px;
|
220
243
|
|
221
244
|
form {
|
222
|
-
|
223
|
-
|
224
|
-
|
245
|
+
align-self: center;
|
246
|
+
justify-self: flex-end;
|
247
|
+
margin-right: $default-padding;
|
225
248
|
line-height: 1;
|
226
249
|
}
|
227
250
|
|
@@ -231,6 +254,7 @@
|
|
231
254
|
}
|
232
255
|
|
233
256
|
> a {
|
257
|
+
display: flex;
|
234
258
|
cursor: pointer;
|
235
259
|
padding: 0px 8px;
|
236
260
|
|