promethee 1.2.11 → 1.2.12

Sign up to get free protection for your applications and to get access to all the features.
Files changed (13) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/stylesheets/promethee-edit.sass +16 -1
  3. data/app/assets/stylesheets/promethee-edit/_write.sass +39 -12
  4. data/app/views/promethee/components/cover/_edit.write.html.erb +5 -6
  5. data/app/views/promethee/components/details/_edit.write.html.erb +1 -2
  6. data/app/views/promethee/components/image/_edit.write.html.erb +1 -2
  7. data/app/views/promethee/components/slider/_edit.write.html.erb +1 -2
  8. data/app/views/promethee/components/text/_edit.inspect.html.erb +11 -0
  9. data/app/views/promethee/components/text/_edit.write.html.erb +3 -8
  10. data/app/views/promethee/components/video/_edit.write.html.erb +2 -3
  11. data/app/views/promethee/edit/_write.html.erb +3 -3
  12. data/lib/promethee/rails/version.rb +1 -1
  13. metadata +1 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 3bc6e7e46a57adf832342f980573c36cec466e15
4
- data.tar.gz: 10d76475188394cbba79a590c88824609324f537
3
+ metadata.gz: 0a67fa2e44cb8519aeb41dfebc101b7899457128
4
+ data.tar.gz: fdf5d4030bba979e7ae8bdb710006226410eb67b
5
5
  SHA512:
6
- metadata.gz: 8554e774476302193cc2e9f5e3f61305aa88552f85176fed9114b1c25f83d9adfddc22d88e53afb764a4a7774e29448785989705810691f8f4875bfb18aa1d71
7
- data.tar.gz: fc7486db03d6f354fcf23021d1a27be3bf93a953ee484a7bd5eaa93d47d88c48c7338857ec61dd076ae691e7cf6b5cf9f276d3386321c9fe0d0dcbe769e718e5
6
+ metadata.gz: 7b981196e15ff8be91c1035c677f031d7df3e05510cfb76c6a400f19aa05e822c018f6f422e2b52b0dafeb536fa549430a4468a8d8426aeb7b73de5e1e46e899
7
+ data.tar.gz: 16f4a019c4f889bf17a36fb77cf5e8812ede8e8cbd739cb0800e51ed83abb24953eb502984938de09f94e3913a08add0382b0b85afe2f1a5e814dca0aad23cc7
data/app/assets/stylesheets/promethee-edit.sass CHANGED
@@ -42,7 +42,22 @@ $promethee-color: #ff9900 !default
42
42
  fill: white
43
43
 
44
44
  &__button
45
- color: white
45
+ background: white
46
+ padding: 10px 15px
47
+ box-sizing: border-box
48
+ display: inline-block
49
+ font-size: 12px
50
+ color: #253742
51
+ text-align: center
52
+ line-height: normal
53
+ border-radius: 20px
54
+ cursor: pointer
55
+
56
+ &--squared
57
+ min-width: 20px
58
+ height: 20px
59
+ padding: 0 0 0 1px
60
+ line-height: 20px
46
61
 
47
62
  &__wrapper
48
63
  padding: 10px
data/app/assets/stylesheets/promethee-edit/_write.sass CHANGED
@@ -1,35 +1,58 @@
1
1
  .promethee-edit__write
2
-
2
+
3
3
  .promethee-edit__toolbar
4
4
  background: #253742
5
- padding: 10px
5
+ height: 36px
6
+ padding: 0 8px
6
7
  font-size: 11px
7
8
  text-transform: uppercase
8
9
  color: white
10
+ line-height: 36px
9
11
  text-align: center
10
12
  &, *
11
13
  user-select: none
12
14
 
15
+ &--transparent
16
+ background: none
17
+ width: 100%
18
+ opacity: 0
19
+ z-index: 2
20
+ position: absolute
21
+ transition: .2s
22
+ transform: translateX(20px)
23
+
24
+ .promethee-edit__component:hover
25
+ > .promethee-edit__toolbar--transparent, > * > .promethee-edit__toolbar--transparent
26
+ opacity: 1
27
+ transform: translateX(0)
28
+
13
29
  .promethee-edit__inspect
14
30
  background: #fff
15
31
  width: 300px
16
32
  top: 15px
17
- right: 0
33
+ right: 15px
18
34
  bottom: 15px
19
35
  z-index: 1000
20
36
  position: fixed
21
- border-left: 1px solid #253742
22
- border-bottom: 1px solid #253742
37
+ display: flex
38
+ flex-direction: column
39
+ border: 1px solid #253742
23
40
  &-header
24
41
  background: #253742
25
- padding: 15px
42
+ height: 36px
43
+ padding: 0 8px
26
44
  color: white
27
- &, h5
28
- font-size: 11px
29
- margin: 0
30
- text-transform: uppercase
45
+ flex-grow: 0
46
+ flex-shrink: 0
47
+ line-height: 36px
48
+ text-transform: uppercase
49
+ font-size: 11px
50
+
31
51
  &-content
52
+ flex-grow: 1
53
+ flex-shrink: 1
32
54
  padding: 15px
55
+ overflow: scroll
33
56
 
34
57
  .promethee-edit__adder__button
35
58
  display: block
@@ -38,6 +61,7 @@
38
61
 
39
62
  .promethee-edit__component
40
63
  margin-bottom: 5px
64
+ position: relative
41
65
  &--cover
42
66
  .promethee-edit__cover-content
43
67
  padding: 150px 30px
@@ -54,5 +78,8 @@
54
78
  position: absolute
55
79
  transform: translateY(-50%)
56
80
  font-size: 30px
57
- &-selected--visible
58
- border: 2px solid #253742
81
+ &-selected
82
+ position: relative
83
+ border: 2px solid transparent
84
+ &--visible
85
+ border-color: #253742
data/app/views/promethee/components/cover/_edit.write.html.erb CHANGED
@@ -1,22 +1,21 @@
1
1
  <script type="text/ng-template" id="promethee/components/cover/edit/write">
2
2
  <div ng-controller="CoverController"
3
3
  ng-click="inspect(component, $event)"
4
- class=" promethee-edit__component
4
+ class=" promethee-edit__component
5
5
  promethee-edit__component--cover">
6
6
  <div class="promethee-edit__component-selected" ng-class="{'promethee-edit__component-selected--visible': promethee.inspected === component}">
7
- <div class="promethee-edit__toolbar">
8
- Cover
7
+ <div class="promethee-edit__toolbar promethee-edit__toolbar--transparent">
9
8
  <ng-include src="'promethee/write/toolbar'"></ng-include>
10
9
  </div>
11
10
  <div ng-hide="editing"
12
- class=" promethee-edit__wrapper
11
+ class=" promethee-edit__wrapper
13
12
  promethee-edit__cover-content"
14
13
  ng-bind-html="component.attributes.body | htmlSafe"
15
14
  ng-click="edit()"
16
- style="background-image: url('{{component.attributes.src}}')">
15
+ style="background-image: url('{{component.attributes.src}}')">
17
16
  </div>
18
17
  <div ng-show="editing"
19
- class=" promethee-edit__wrapper
18
+ class=" promethee-edit__wrapper
20
19
  promethee-edit__cover-content"
21
20
  style="background-image: url('{{component.attributes.src}}')">
22
21
  <summernote config="options" ng-model="component.attributes.body"></summernote>
data/app/views/promethee/components/details/_edit.write.html.erb CHANGED
@@ -4,8 +4,7 @@
4
4
  class=" promethee-edit__component
5
5
  promethee-edit__component--details">
6
6
  <div class="promethee-edit__component-selected" ng-class="{'promethee-edit__component-selected--visible': promethee.inspected === component}">
7
- <div class="promethee-edit__toolbar">
8
- Details
7
+ <div class="promethee-edit__toolbar promethee-edit__toolbar--transparent">
9
8
  <ng-include src="'promethee/write/toolbar'"></ng-include>
10
9
  </div>
11
10
  <details>
data/app/views/promethee/components/image/_edit.write.html.erb CHANGED
@@ -4,8 +4,7 @@
4
4
  class=" promethee-edit__component
5
5
  promethee-edit__component--image">
6
6
  <div class="promethee-edit__component-selected" ng-class="{'promethee-edit__component-selected--visible': promethee.inspected === component}">
7
- <div class="promethee-edit__toolbar">
8
- Image
7
+ <div class="promethee-edit__toolbar promethee-edit__toolbar--transparent">
9
8
  <ng-include src="'promethee/write/toolbar'"></ng-include>
10
9
  </div>
11
10
  <figure ng-show="component.attributes.src">
data/app/views/promethee/components/slider/_edit.write.html.erb CHANGED
@@ -5,8 +5,7 @@
5
5
  promethee-edit__component
6
6
  promethee-edit__component--slider">
7
7
  <div class="promethee-edit__component-selected" ng-class="{'promethee-edit__component-selected--visible': promethee.inspected === component}">
8
- <div class="promethee-edit__toolbar">
9
- Slider
8
+ <div class="promethee-edit__toolbar promethee-edit__toolbar--transparent">
10
9
  <ng-include src="'promethee/write/toolbar'"></ng-include>
11
10
  </div>
12
11
 
data/app/views/promethee/components/text/_edit.inspect.html.erb CHANGED
@@ -1,4 +1,15 @@
1
1
  <script type="text/ng-template" id="promethee/components/text/edit/inspect">
2
+ <div class="form-group">
3
+ <summernote config="{
4
+ toolbar: [
5
+ ['headline', ['style']],
6
+ ['style', ['bold', 'italic']],
7
+ ['alignment', ['ul', 'ol', 'paragraph']],
8
+ ['code', ['codeview']]
9
+ ]
10
+ }" ng-model="promethee.inspected.attributes.body"></summernote>
11
+ </div>
12
+
2
13
  {{promethee.inspected.attributes.body | textContentFromHTML: 'distinctParagraphs' | numberOfWords}} words<br>
3
14
  {{promethee.inspected.attributes.body | textContentFromHTML | numberOfCharacters}} characters
4
15
  </script>
data/app/views/promethee/components/text/_edit.write.html.erb CHANGED
@@ -4,16 +4,11 @@
4
4
  class=" promethee-edit__component
5
5
  promethee-edit__component--text">
6
6
  <div class="promethee-edit__component-selected" ng-class="{'promethee-edit__component-selected--visible': promethee.inspected === component}">
7
- <div class="promethee-edit__toolbar">
8
- Text
7
+ <div class="promethee-edit__toolbar promethee-edit__toolbar--transparent">
9
8
  <ng-include src="'promethee/write/toolbar'"></ng-include>
10
9
  </div>
11
- <div ng-show="promethee.inspected === component">
12
- <summernote config="options" ng-model="component.attributes.body"></summernote>
13
- </div>
14
- <div ng-hide="promethee.inspected === component">
15
- <div class="promethee-edit__wrapper" ng-bind-html="component.attributes.body | htmlSafe"></div>
16
- </div>
10
+
11
+ <div class="promethee-edit__wrapper" ng-bind-html="component.attributes.body | htmlSafe"></div>
17
12
  </div>
18
13
  </div>
19
14
  </script>
data/app/views/promethee/components/video/_edit.write.html.erb CHANGED
@@ -1,11 +1,10 @@
1
1
  <script type="text/ng-template" id="promethee/components/video/edit/write">
2
2
  <div ng-controller="VideoController"
3
3
  ng-click="inspect(component, $event)"
4
- class=" promethee-edit__component
4
+ class=" promethee-edit__component
5
5
  promethee-edit__component--video">
6
6
  <div class="promethee-edit__component-selected" ng-class="{'promethee-edit__component-selected--visible': promethee.inspected === component}">
7
- <div class="promethee-edit__toolbar">
8
- Video
7
+ <div class="promethee-edit__toolbar promethee-edit__toolbar--transparent">
9
8
  <ng-include src="'promethee/write/toolbar'"></ng-include>
10
9
  </div>
11
10
  <div class="embed-responsive embed-responsive-16by9">
data/app/views/promethee/edit/_write.html.erb CHANGED
@@ -37,9 +37,9 @@ promethee.controller('AdderController', ['$scope', '$rootScope', 'definitions',
37
37
  <div class="promethee-edit__inspect" ng-show="promethee.inspected">
38
38
  <div class="promethee-edit__inspect-header">
39
39
  <div class="pull-right">
40
- <span ng-click="promethee.inspected = null"><%= fa_icon :times %></span>
40
+ <span class="promethee-edit__button promethee-edit__button--squared" ng-click="promethee.inspected = null"><%= fa_icon :times %></span>
41
41
  </div>
42
- <h5>{{promethee.inspected.type}}</h5>
42
+ {{promethee.inspected.type}}
43
43
  </div>
44
44
  <div class="promethee-edit__inspect-content">
45
45
  <ng-include ng-if="promethee.inspected" src="'promethee/components/' + promethee.inspected.type + '/edit/inspect'"></ng-include>
@@ -61,7 +61,7 @@ promethee.controller('AdderController', ['$scope', '$rootScope', 'definitions',
61
61
 
62
62
  <script type="text/ng-template" id="promethee/write/toolbar">
63
63
  <div class="pull-right">
64
- <span ng-click="remove(component, components)" class="promethee-edit__button"><%= fa_icon :times %></span>
64
+ <span ng-click="remove(component, components)" class="promethee-edit__button promethee-edit__button--squared"><%= fa_icon :times %></span>
65
65
  </div>
66
66
  </script>
67
67
 
data/lib/promethee/rails/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Promethee
2
2
  module Rails
3
- VERSION = '1.2.11'
3
+ VERSION = '1.2.12'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: promethee
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.11
4
+ version: 1.2.12
5
5
  platform: ruby
6
6
  authors:
7
7
  - Julien Dargelos