alchemy_cms 4.0.0.rc2 → 4.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (66) hide show
  1. checksums.yaml +4 -4
  2. data/.codeclimate.yml +1 -1
  3. data/.travis.yml +2 -2
  4. data/CHANGELOG.md +18 -0
  5. data/Gemfile +2 -1
  6. data/README.md +4 -11
  7. data/alchemy_cms.gemspec +3 -3
  8. data/app/assets/stylesheets/alchemy/_extends.scss +1 -2
  9. data/app/assets/stylesheets/alchemy/_mixins.scss +0 -8
  10. data/app/assets/stylesheets/alchemy/_variables.scss +2 -0
  11. data/app/assets/stylesheets/alchemy/archive.scss +23 -52
  12. data/app/assets/stylesheets/alchemy/base.scss +10 -8
  13. data/app/assets/stylesheets/alchemy/buttons.scss +3 -4
  14. data/app/assets/stylesheets/alchemy/dashboard.scss +0 -2
  15. data/app/assets/stylesheets/alchemy/dialogs.scss +13 -14
  16. data/app/assets/stylesheets/alchemy/elements.scss +41 -51
  17. data/app/assets/stylesheets/alchemy/forms.scss +0 -3
  18. data/app/assets/stylesheets/alchemy/frame.scss +0 -3
  19. data/app/assets/stylesheets/alchemy/image_library.scss +0 -3
  20. data/app/assets/stylesheets/alchemy/jquery.datetimepicker.scss +0 -2
  21. data/app/assets/stylesheets/alchemy/lists.scss +1 -0
  22. data/app/assets/stylesheets/alchemy/navigation.scss +1 -4
  23. data/app/assets/stylesheets/alchemy/pagination.scss +1 -3
  24. data/app/assets/stylesheets/alchemy/selects.scss +2 -2
  25. data/app/assets/stylesheets/alchemy/sitemap.scss +1 -1
  26. data/app/assets/stylesheets/alchemy/upload.scss +0 -1
  27. data/app/assets/stylesheets/tinymce/skins/alchemy/skin.min.css.scss +0 -2
  28. data/app/helpers/alchemy/elements_helper.rb +12 -2
  29. data/app/models/alchemy/essence_picture.rb +28 -10
  30. data/app/models/alchemy/essence_picture_view.rb +1 -1
  31. data/app/models/alchemy/picture/transformations.rb +2 -3
  32. data/app/models/alchemy/picture/url.rb +10 -2
  33. data/app/views/alchemy/admin/contents/create.js.erb +1 -3
  34. data/app/views/alchemy/admin/essence_pictures/crop.html.erb +4 -3
  35. data/app/views/alchemy/essences/_essence_file_editor.html.erb +1 -1
  36. data/app/views/alchemy/essences/shared/_essence_picture_tools.html.erb +1 -1
  37. data/config/brakeman.ignore +5 -5
  38. data/config/locales/alchemy.de.yml +2 -2
  39. data/config/locales/alchemy.en.yml +2 -2
  40. data/config/locales/alchemy.es.yml +1 -1
  41. data/config/locales/alchemy.fr.yml +1 -1
  42. data/config/locales/alchemy.it.yml +1 -1
  43. data/config/locales/alchemy.nl.yml +1 -1
  44. data/config/locales/alchemy.ru.yml +1 -1
  45. data/db/migrate/20160422195310_add_image_file_format_to_alchemy_pictures.rb +0 -12
  46. data/lib/alchemy/errors.rb +6 -1
  47. data/lib/alchemy/logger.rb +1 -1
  48. data/lib/alchemy/permissions.rb +0 -7
  49. data/lib/alchemy/tasks/tidy.rb +130 -0
  50. data/lib/alchemy/test_support/factories/attachment_factory.rb +2 -2
  51. data/lib/alchemy/test_support/factories/cell_factory.rb +3 -3
  52. data/lib/alchemy/test_support/factories/content_factory.rb +2 -2
  53. data/lib/alchemy/test_support/factories/dummy_user_factory.rb +2 -2
  54. data/lib/alchemy/test_support/factories/element_factory.rb +2 -2
  55. data/lib/alchemy/test_support/factories/essence_file_factory.rb +2 -2
  56. data/lib/alchemy/test_support/factories/essence_picture_factory.rb +2 -2
  57. data/lib/alchemy/test_support/factories/essence_text_factory.rb +2 -2
  58. data/lib/alchemy/test_support/factories/language_factory.rb +2 -2
  59. data/lib/alchemy/test_support/factories/page_factory.rb +4 -4
  60. data/lib/alchemy/test_support/factories/picture_factory.rb +2 -2
  61. data/lib/alchemy/test_support/factories/site_factory.rb +2 -2
  62. data/lib/alchemy/upgrader/three_point_four.rb +25 -0
  63. data/lib/alchemy/version.rb +1 -1
  64. data/lib/tasks/alchemy/tidy.rake +1 -129
  65. data/lib/tasks/alchemy/upgrade.rake +9 -1
  66. metadata +22 -9
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 2602c152298a64524d0219dae9612ddd13bb7909
4
- data.tar.gz: ff1579cc4c0db34cfa5d1620426bba1622a72739
3
+ metadata.gz: 32cd97a2d51613e7b97f0a369d52fdcea5390b1f
4
+ data.tar.gz: aa26582f94ed95c780a07773ce7f40c1cca1e391
5
5
  SHA512:
6
- metadata.gz: 475e535fdb68297c36fe5fa013ede09be2555d03fbc58bdff079d9978f79b6d8ce4c3ec23c4b063e563d647c028eb3762d16a564831c09a8dc2b97c40f2d64b7
7
- data.tar.gz: c86d7978a829bef8c50446e5df3c7fa1e5abcfb7e1d52479603a66d780c27359349b5654ee1cef201ebee8b0b6dafe576427db9a6a1907d7888d2c6277116165
6
+ metadata.gz: b95d61495b2bce7683cecbdea814c08673e8688da61f3a690c9fbb6a1ba6560c031e1980377ef7f7e5fff785d334d9c0c7380f6951d4d214c5e4714ceec86f39
7
+ data.tar.gz: 67022c61db2f6163f64bed4daf2cb5b51001ac424f18581cdf983b5e922db7dfb1c1184a61f819948e9fb8a1643178f1183d8101fda392c7c6db643bd476aede
@@ -10,7 +10,7 @@ engines:
10
10
  enabled: true
11
11
  exclude_paths:
12
12
  - "lib/alchemy/permissions.rb"
13
- - "lib/tasks/alchemy/tidy.rake"
13
+ - "lib/alchemy/tasks/tidy.rb"
14
14
  - "lib/tasks/alchemy/upgrade.rake"
15
15
  config:
16
16
  languages:
@@ -7,8 +7,8 @@ cache:
7
7
  - "travis_phantomjs"
8
8
  rvm:
9
9
  - 2.2.7
10
- - 2.3.4
11
- - 2.4.1
10
+ - 2.3.5
11
+ - 2.4.2
12
12
  before_install:
13
13
  - "phantomjs --version"
14
14
  - "export PATH=$PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH"
@@ -1,5 +1,13 @@
1
1
  # Change Log
2
2
 
3
+ ## 4.0.0 (2017-11-06)
4
+
5
+ * Fixes image cropping issues [#1320](https://github.com/AlchemyCMS/alchemy_cms/pull/1320) and [#1321](https://github.com/AlchemyCMS/alchemy_cms/pull/1321) by [tvdeyen](https://github.com/tvdeyen)
6
+ This includes the change that images will not be cropped anymore unless `crop: true` is explicitly given in either the contents settings or passed via options to `render_essence`. The former behavior of implicitly cropping only because crop values (`crop_from` or `crop_size`) were present on the `EssencePicture` database record was erroneous and confusing.
7
+ * Allow Dragonfly 1.1 and above [#1314](https://github.com/AlchemyCMS/alchemy_cms/pull/1314) by [tvdeyen](https://github.com/tvdeyen)
8
+ * Added Rails 5.1 support [#1310](https://github.com/AlchemyCMS/alchemy_cms/pull/1310) by [tvdeyen](https://github.com/tvdeyen)
9
+ * Always use `border-box` box model for all CSS components in the admin [#1309](https://github.com/AlchemyCMS/alchemy_cms/pull/1309) by [tvdeyen](https://github.com/tvdeyen)
10
+
3
11
  ## 4.0.0.rc2 (2017-08-18)
4
12
 
5
13
  * Removed deprecated `:image_size` option from `EssencePicture`
@@ -36,6 +44,16 @@
36
44
 
37
45
  * Rails 5
38
46
 
47
+ ## 3.6.3 (2017-10-24)
48
+
49
+ * Remove `:display` cancan alias [#1318](https://github.com/AlchemyCMS/alchemy_cms/pull/1318) by [tvdeyen](https://github.com/tvdeyen)
50
+
51
+ ## 3.6.2 (2017-09-01)
52
+
53
+ * Handle custom errors in `Alchemy::Picture#url` [#1305](https://github.com/AlchemyCMS/alchemy_cms/pull/1305) by [tvdeyen](https://github.com/tvdeyen)
54
+ * Do not move elements in tidy cells task [#1303](https://github.com/AlchemyCMS/alchemy_cms/pull/1303) by [tvdeyen](https://github.com/tvdeyen)
55
+ * Add a store image file format rake task [#1302](https://github.com/AlchemyCMS/alchemy_cms/pull/1302) by [tvdeyen](https://github.com/tvdeyen)
56
+
39
57
  ## 3.6.1 (2017-08-16)
40
58
 
41
59
  * Do not ask `systempage?` everytime we load the page definition [#1239](https://github.com/AlchemyCMS/alchemy_cms/pull/1283) by [tvdeyen](https://github.com/tvdeyen)
data/Gemfile CHANGED
@@ -27,10 +27,11 @@ group :development, :test do
27
27
  gem 'spring'
28
28
  gem 'spring-commands-rspec'
29
29
  gem 'rubocop', require: false
30
+ gem 'listen'
30
31
  end
31
32
  gem 'capybara', '~> 2.4'
32
33
  gem 'database_cleaner', '~> 1.3'
33
- gem 'factory_girl_rails', '~> 4.5'
34
+ gem 'factory_bot_rails', '~> 4.5'
34
35
  gem 'poltergeist', '~> 1.10'
35
36
  gem 'rspec-activemodel-mocks', '~> 1.0'
36
37
  gem 'rspec-rails', '~> 3.0'
data/README.md CHANGED
@@ -1,12 +1,9 @@
1
1
  [![Gem Version](https://badge.fury.io/rb/alchemy_cms.svg)](http://badge.fury.io/rb/alchemy_cms)
2
- [![Build Status](https://travis-ci.org/AlchemyCMS/alchemy_cms.svg?branch=master)](https://travis-ci.org/AlchemyCMS/alchemy_cms)
2
+ [![Build Status](https://travis-ci.org/AlchemyCMS/alchemy_cms.svg?branch=4.0-stable)](https://travis-ci.org/AlchemyCMS/alchemy_cms)
3
3
  [![Code Climate](https://codeclimate.com/github/AlchemyCMS/alchemy_cms.svg)](https://codeclimate.com/github/AlchemyCMS/alchemy_cms)
4
4
  [![Test Coverage](https://codeclimate.com/github/AlchemyCMS/alchemy_cms/badges/coverage.svg)](https://codeclimate.com/github/AlchemyCMS/alchemy_cms)
5
5
  [![Slack Status](http://slack.alchemy-cms.com/badge.svg)](http://slack.alchemy-cms.com)
6
6
 
7
- **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 (3.6-stable)](https://github.com/AlchemyCMS/alchemy_cms/tree/3.6-stable).**
8
-
9
-
10
7
  ## About
11
8
 
12
9
  ![Alchemy CMS](app/assets/images/alchemy/alchemy-logo.png)
@@ -34,7 +31,7 @@ Read more about Alchemy on the [website](https://alchemy-cms.com) and in the [gu
34
31
 
35
32
  ## Rails Version
36
33
 
37
- **This version of Alchemy CMS runs with Rails 5.0 only**
34
+ **This version of Alchemy CMS runs with Rails 5 only**
38
35
 
39
36
  * For a Rails 4.2 compatible version use the [`3.6-stable` branch](https://github.com/AlchemyCMS/alchemy_cms/tree/3.6-stable).
40
37
  * 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).
@@ -64,11 +61,9 @@ For a Ruby 1.8.7 compatible version use the [`2.3-stable` branch](https://github
64
61
  Put this into your `Gemfile`:
65
62
 
66
63
  ```ruby
67
- gem 'alchemy_cms', github: 'AlchemyCMS/alchemy_cms', branch: 'master'
64
+ gem 'alchemy_cms', github: 'AlchemyCMS/alchemy_cms', branch: '4.0-stable'
68
65
  ```
69
66
 
70
- **NOTE:** You normally want to use a stable branch, like `3.6-stable`.
71
-
72
67
  If you want to use Russian translation and have better i18n support, you should put:
73
68
 
74
69
  ```ruby
@@ -93,11 +88,9 @@ the Devise based user model that Alchemy provides and was extracted [into its ow
93
88
  If you don't have your own user class, you can use the Alchemy user model. Just add the following gem into your `Gemfile`:
94
89
 
95
90
  ```ruby
96
- gem 'alchemy-devise', github: 'AlchemyCMS/alchemy-devise', branch: 'master'
91
+ gem 'alchemy-devise', github: 'AlchemyCMS/alchemy-devise', branch: '4.0-stable'
97
92
  ```
98
93
 
99
- **NOTE:** You normally want to use a stable branch, like `3.6-stable`.
100
-
101
94
  Then run:
102
95
 
103
96
  ```shell
@@ -25,15 +25,15 @@ Gem::Specification.new do |gem|
25
25
  gem.add_runtime_dependency 'bourbon', ['~> 4.2']
26
26
  gem.add_runtime_dependency 'cancancan', ['~> 1.9']
27
27
  gem.add_runtime_dependency 'coffee-rails', ['~> 4.0']
28
- gem.add_runtime_dependency 'dragonfly', ['~> 1.0.7']
28
+ gem.add_runtime_dependency 'dragonfly', ['~> 1.0', '>= 1.0.7']
29
29
  gem.add_runtime_dependency 'dragonfly_svg', ['~> 0.0.4']
30
30
  gem.add_runtime_dependency 'handlebars_assets', ['~> 0.23']
31
31
  gem.add_runtime_dependency 'jquery-rails', ['~> 4.0']
32
32
  gem.add_runtime_dependency 'jquery-ui-rails', ['~> 5.0.0']
33
33
  gem.add_runtime_dependency 'kaminari', ['~> 0.15']
34
- gem.add_runtime_dependency 'originator', ['~> 3.0']
34
+ gem.add_runtime_dependency 'originator', ['~> 3.1']
35
35
  gem.add_runtime_dependency 'non-stupid-digest-assets', ['~> 1.0.8']
36
- gem.add_runtime_dependency 'rails', ['~> 5.0.0']
36
+ gem.add_runtime_dependency 'rails', ['~> 5.0', '< 6.0']
37
37
  gem.add_runtime_dependency 'ransack', ['~> 1.4']
38
38
  gem.add_runtime_dependency 'request_store', ['~> 1.2']
39
39
  gem.add_runtime_dependency 'responders', ['~> 2.0']
@@ -33,7 +33,6 @@
33
33
  }
34
34
 
35
35
  %default-input-style {
36
- box-sizing: border-box;
37
36
  @extend %rounded-border;
38
37
  box-shadow: inset 0px 1px 1px $medium-gray;
39
38
  font: $default-font-style;
@@ -66,5 +65,5 @@
66
65
  %gradiated-toolbar {
67
66
  background: $toolbar-bg-color;
68
67
  padding: 8px 4px;
69
- height: $default-form-field-height;
68
+ height: $toolbar-height;
70
69
  }
@@ -74,7 +74,6 @@
74
74
  }
75
75
 
76
76
  @mixin form-label {
77
- @extend .border-box-sizing;
78
77
  width: $form-left-width;
79
78
  padding-right: 2*$default-padding;
80
79
  padding-top: $default-padding + 1;
@@ -105,7 +104,6 @@
105
104
  min-height: $default-form-field-height;
106
105
  background: white;
107
106
  @extend %rounded-border;
108
- @extend .border-box-sizing;
109
107
  }
110
108
 
111
109
  @mixin form-hint($background-color: $light_yellow, $border-color: $medium-gray) {
@@ -146,12 +144,6 @@
146
144
  box-shadow: $shadow;
147
145
  }
148
146
 
149
- @mixin box-sizing($box-sizing-type: content-box) {
150
- -webkit-box-sizing: $box-sizing-type;
151
- -moz-box-sizing: $box-sizing-type;
152
- box-sizing: $box-sizing-type;
153
- }
154
-
155
147
  @mixin tag-base($margin: 2*$default-margin 0, $padding: $default-padding 4*$default-padding $default-padding 6*$default-padding) {
156
148
  padding: $padding;
157
149
  margin: $margin;
@@ -70,6 +70,8 @@ $main-menu-active-bg-color: $light-blue !default;
70
70
  $main-menu-text-color: #222 !default;
71
71
  $main-menu-entry-max-width: 100px !default;
72
72
  $toolbar-bg-color: $medium-gray !default;
73
+ $toolbar-height: 46px !default;
74
+ $element-toolbar-height: 37px !default;
73
75
  $header-height: 29px !default;
74
76
  $text-shadow-light: rgba($white, 0.5) 0 0 4px !default;
75
77
  $transition-duration: 200ms !default;
@@ -23,6 +23,7 @@ div#image_assign_filter_and_image_sizing {
23
23
  border: 1px solid #c0c0c0;
24
24
  position: relative;
25
25
  @extend %rounded-border;
26
+ width: 170px;
26
27
 
27
28
  img {
28
29
  width: auto;
@@ -38,28 +39,20 @@ div#image_assign_filter_and_image_sizing {
38
39
  }
39
40
 
40
41
  .picture_name {
41
- height: 14px;
42
42
  display: block;
43
+ width: 100%;
43
44
  text-align: center;
44
45
  white-space: nowrap;
45
46
  overflow: hidden;
46
- position: absolute;
47
- bottom: 1px;
47
+ bottom: 0;
48
48
  left: 0;
49
49
  font-family: "Courier New", Courier, mono;
50
- line-height: 11px;
51
- padding: 2px 0;
52
- margin-right: 4px;
53
- margin-left: 4px;
50
+ line-height: 16px;
51
+ padding: $default-padding 0 0;
54
52
  }
55
53
 
56
54
  &.small {
57
- width: 80px;
58
- height: 80px;
59
-
60
- .picture_name {
61
- width: 80px;
62
- }
55
+ width: 90px;
63
56
 
64
57
  .thumbnail_background {
65
58
  width: 80px;
@@ -67,27 +60,8 @@ div#image_assign_filter_and_image_sizing {
67
60
  }
68
61
  }
69
62
 
70
- &.medium {
71
- width: 160px;
72
- height: 140px;
73
-
74
- .picture_name {
75
- width: 160px;
76
- }
77
-
78
- .thumbnail_background {
79
- width: 160px;
80
- height: 120px;
81
- }
82
- }
83
-
84
63
  &.large {
85
- width: 240px;
86
- height: 200px;
87
-
88
- .picture_name {
89
- width: 240px;
90
- }
64
+ width: 250px;
91
65
 
92
66
  .thumbnail_background {
93
67
  width: 240px;
@@ -106,11 +80,11 @@ div#image_assign_filter_and_image_sizing {
106
80
  #pictures {
107
81
  margin-right: 232px;
108
82
  padding-bottom: 60px;
83
+ overflow: hidden;
109
84
 
110
85
  .picture_thumbnail {
111
- margin: 0 8px 8px 0;
112
- display: inline-block;
113
- float: none;
86
+ margin: 0 2*$default-margin 2*$default-margin 0;
87
+ float: left;
114
88
 
115
89
  .thumbnail_background {
116
90
  @include zoom-in;
@@ -129,12 +103,12 @@ div.assign_image_list_image {
129
103
  }
130
104
 
131
105
  .picture_tool {
132
- width: 16px;
133
- height: 16px;
106
+ width: 20px;
107
+ height: 20px;
134
108
  position: absolute;
135
109
  background-color: white;
136
- top: 3px;
137
- padding: 1px;
110
+ top: $default-padding;
111
+ padding: $default-padding/2;
138
112
  z-index: 10;
139
113
  display: none;
140
114
 
@@ -147,7 +121,7 @@ div.assign_image_list_image {
147
121
  }
148
122
 
149
123
  &.select {
150
- left: 4px;
124
+ left: $default-padding;
151
125
 
152
126
  input {
153
127
  margin: 0;
@@ -156,7 +130,7 @@ div.assign_image_list_image {
156
130
  }
157
131
 
158
132
  &.delete {
159
- right: 4px;
133
+ right: $default-padding;
160
134
 
161
135
  a {
162
136
  background: image-url('alchemy/icons.png') no-repeat -63px -72px;
@@ -172,7 +146,6 @@ div.assign_image_list_image {
172
146
  }
173
147
 
174
148
  div#library_sidebar {
175
- box-sizing: border-box;
176
149
  position: fixed;
177
150
  border-left: 1px solid $default-border-color;
178
151
  top: 0;
@@ -201,7 +174,6 @@ div#filter_bar {
201
174
  }
202
175
 
203
176
  .tag-list {
204
- box-sizing: border-box;
205
177
  height: 100%;
206
178
  padding-bottom: 138px;
207
179
 
@@ -237,7 +209,6 @@ div#filter_bar {
237
209
  }
238
210
 
239
211
  ul {
240
- box-sizing: border-box;
241
212
  list-style-type: none;
242
213
  padding: 0;
243
214
  margin: 40px 0 4px 0;
@@ -277,7 +248,7 @@ div#filter_bar {
277
248
 
278
249
  #assign_image_list, #assign_file_list {
279
250
  position: relative;
280
- height: 519px;
251
+ height: 535px;
281
252
  }
282
253
 
283
254
  #assign_image_list {
@@ -328,7 +299,7 @@ div#filter_bar {
328
299
  display: block;
329
300
  line-height: 25px;
330
301
  text-decoration: none;
331
- padding: 0px 4px 2px 4px;
302
+ padding: 2px $default-padding;
332
303
  }
333
304
 
334
305
  .icon {
@@ -339,12 +310,12 @@ div#filter_bar {
339
310
  }
340
311
 
341
312
  .picture_tags {
342
- box-sizing: border-box;
343
- width: 50%;
344
- max-height: 100%;
313
+ overflow: hidden;
345
314
  position: absolute;
346
- top: 16px;
347
- left: 0;
315
+ top: 22px;
316
+ left: $default-padding;
317
+ width: 50%;
318
+ max-height: 80%;
348
319
  padding: $default-padding;
349
320
  pointer-events: none;
350
321
  display: none;
@@ -1,4 +1,5 @@
1
1
  html {
2
+ box-sizing: border-box;
2
3
  height: 100%;
3
4
 
4
5
  &.turbolinks-progress-bar::before,
@@ -8,6 +9,12 @@ html {
8
9
  }
9
10
  }
10
11
 
12
+ *,
13
+ *::before,
14
+ *::after {
15
+ box-sizing: inherit;
16
+ }
17
+
11
18
  noscript {
12
19
  position: fixed;
13
20
  top: 0;
@@ -44,7 +51,7 @@ body {
44
51
 
45
52
  h1 {
46
53
  padding: 0;
47
- margin: 8px;
54
+ margin: 2*$default-margin;
48
55
  font-weight: bold;
49
56
  font-size: $default-font-size;
50
57
 
@@ -62,7 +69,7 @@ h1 {
62
69
 
63
70
  h2 {
64
71
  margin: $default-margin 0;
65
- padding-bottom: 5px;
72
+ padding-bottom: $default-padding;
66
73
  clear: both;
67
74
  font-weight: bold;
68
75
  font-size: $default-font-size;
@@ -70,7 +77,7 @@ h2 {
70
77
 
71
78
  h3 {
72
79
  margin: $default-margin 0;
73
- padding-bottom: 5px;
80
+ padding-bottom: $default-padding;
74
81
  font-size: $default-font-size;
75
82
  font-weight: bold;
76
83
  }
@@ -160,10 +167,6 @@ kbd {
160
167
  user-select: none;
161
168
  }
162
169
 
163
- .border-box-sizing {
164
- box-sizing: border-box;
165
- }
166
-
167
170
  span.updated_at {
168
171
  float: right;
169
172
  }
@@ -507,7 +510,6 @@ div.browse {
507
510
  }
508
511
 
509
512
  #alchemy_preview_window {
510
- box-sizing: border-box;
511
513
  position: absolute;
512
514
  left: $main-menu-width;
513
515
  top: 75px;
@@ -17,9 +17,9 @@ button, input[type="submit"], a.button, input.button {
17
17
  padding: 6px 18px 6px 6px;
18
18
 
19
19
  span.icon {
20
- margin-top: -5px;
21
- padding-right: 0.25em;
22
- height: 15px;
20
+ margin-top: -$default-margin;
21
+ margin-right: $default-margin;
22
+ height: 14px;
23
23
  }
24
24
  }
25
25
 
@@ -43,7 +43,6 @@ button, input[type="submit"], a.button, input.button {
43
43
  }
44
44
 
45
45
  .icon_button {
46
- box-sizing: border-box;
47
46
  width: 27px;
48
47
  height: 27px;
49
48
  line-height: 21px;