spina-template 0.4.0 → 0.4.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 26fff9535145d7485b344977ccaaae2747701617
4
- data.tar.gz: 111e9b7eb6c51be306dd38338c50e3b66b0cbb65
3
+ metadata.gz: 54725e71cfae24fd443eba22d636e2348524d714
4
+ data.tar.gz: deec2a5f8adac21c6bb36beec28a1dc20086e7f9
5
5
  SHA512:
6
- metadata.gz: bf3a534909c44227639bda666b04e5ecf43d40412db4e6deb1203dfada0b467636f6d5f54bd4c64c359bd38bc7b46ed40141a724269410ae92e99d49636c1bac
7
- data.tar.gz: 9b08e8d6447151bb3add59c3ef72089d277705145c0e44c23f7a47eb8f954e3a12d36422bb74206694f3daf05b865da52452e6d55d20ff592a55991cc834fbf8
6
+ metadata.gz: 56c49bf7ab848e2bce69e6498ba1492414851703a420016ec7ddb7efdc0c0afbcfb239d6db5d24c68ba06a6ff42f7a9c45e9c6168b3d8310da812e5f52ee25aa
7
+ data.tar.gz: d7d671d3d67e99457bae7d8969d8db749051f755f098b9f3f92ca4e0cb3eaab8a0c646dab79dc93e6f8175fd0d7968f3998ad6840414cfc9e9d813739bac222f
@@ -30,12 +30,14 @@ $(document).on 'page:restore', -> NProgress.remove()
30
30
  # Clickable TR's
31
31
  $(document).on 'click', '.table-clickable tbody tr', (e) ->
32
32
  $row = $(this).closest('tr')
33
- checkbox = $row.find('input[type="checkbox"]:first, input[type="radio"]:first')
33
+ $row.find('a.table-link:first')[0].click()
34
+
35
+ $(document).on 'click', '.table-clickable tbody tr td', (e) ->
36
+ checkbox = $(this).find('input[type="checkbox"]:first, input[type="radio"]:first')
34
37
 
35
38
  if checkbox.length > 0
36
39
  checkbox.prop("checked", !checkbox.prop("checked"))
37
- else
38
- $row.find('a.table-link:first')[0].click()
40
+ e.stopPropagation()
39
41
 
40
42
  $(document).on 'click', '.table-clickable tbody .table-link', (e) ->
41
43
  e.stopPropagation()
@@ -343,7 +343,6 @@ header#header
343
343
  z-index: 10
344
344
 
345
345
  #header_actions
346
- height: 100%
347
346
  float: right
348
347
  position: absolute
349
348
  right: 20px
@@ -380,6 +379,10 @@ section#main
380
379
  display: inline-block
381
380
  font-size: 24px
382
381
 
382
+ .button
383
+ margin-left: 12px
384
+ vertical-align: middle
385
+
383
386
  a
384
387
  color: #999
385
388
 
@@ -77,8 +77,9 @@ button, input[type="submit"], input[type="button"]
77
77
  margin-right: 8px
78
78
  margin-top: -2px
79
79
 
80
- &.icon-only:before
81
- margin-right: 0
80
+ &.icon-only
81
+ &:before, i.icon
82
+ margin-right: 0
82
83
 
83
84
  &.icon-mini:before
84
85
  margin-right: 4px
@@ -343,7 +344,6 @@ button, input[type="submit"], input[type="button"]
343
344
  background: lighten($primary-color, 40%)
344
345
  border: 1px solid lighten($primary-color, 30%)
345
346
  color: $primary-color
346
- text-transform: lowercase
347
347
 
348
348
  &:hover
349
349
  background: $primary-color
@@ -84,6 +84,9 @@
84
84
  position: relative
85
85
  @include flex(1)
86
86
 
87
+ .switch
88
+ margin: 10px
89
+
87
90
  #{$all-text-inputs}, textarea, .text-input
88
91
  background: none
89
92
  border: none
@@ -113,7 +116,7 @@
113
116
  height: 50px
114
117
 
115
118
  .sidebar-form-images
116
- margin: 25px 0
119
+ margin-top: 25px
117
120
 
118
121
  &:after
119
122
  clear: both
@@ -127,19 +130,90 @@
127
130
  display: inline-block
128
131
  margin-bottom: 10px
129
132
  margin-right: 10px
133
+ position: relative
130
134
  width: 100px
131
135
 
132
- img
136
+ > img
133
137
  border-radius: 2px
134
138
  display: block
135
139
  width: 100%
136
140
 
141
+ .sidebar-form-image-overlay
142
+ background: -webkit-linear-gradient(top, rgba(0, 0, 0, 0), rgba(0, 0, 0, .5))
143
+ content: " "
144
+ display: block
145
+ height: 25%
146
+ left: 0
147
+ opacity: 0
148
+ position: absolute
149
+ top: 75%
150
+ width: 100%
151
+ @include transition(opacity .2s ease)
152
+
153
+ &:hover .sidebar-form-image-overlay
154
+ opacity: 1
155
+
137
156
  &:first-child
138
157
  width: 320px
139
158
 
140
159
  &:nth-child(3n + 1)
141
160
  margin-right: 0
142
161
 
162
+ a
163
+ opacity: .5
164
+ padding: 6px
165
+ position: relative
166
+ z-index: 1
167
+ @include transition(opacity .2s ease)
168
+
169
+ a img:first-child
170
+ display: block
171
+
172
+ a img:last-child
173
+ display: none
174
+
175
+ input[type="checkbox"]:checked + a img:first-child
176
+ display: none
177
+
178
+ input[type="checkbox"]:checked + a img:last-child
179
+ display: block
180
+
181
+ input[type="checkbox"]:checked + a
182
+ opacity: 1
183
+
184
+ &:first-child a
185
+ padding: 10px
186
+
187
+ &:hover a
188
+ opacity: 1
189
+
190
+ &:not(:first-child) a img
191
+ height: 75%
192
+ width: 75%
193
+
194
+ .sidebar-form-image-dropzone
195
+ background: #ededf2
196
+ border: 1px solid #c3c3c3
197
+ border-radius: 3px
198
+ box-shadow: inset 0 1px 2px rgba(0, 0, 0, .15)
199
+ color: #666
200
+ cursor: pointer
201
+ font-size: 13px
202
+ margin-bottom: 25px
203
+ padding: 12px
204
+ width: 100%
205
+
206
+ &:hover
207
+ background: shade(#ededf2, 2.5%)
208
+
209
+ &::-webkit-file-upload-button
210
+ background: none
211
+ border: none
212
+ color: #666
213
+ cursor: pointer
214
+ font-size: 13px
215
+ font-weight: 500
216
+
143
217
  // Form groups
144
218
  .form-group
145
219
  margin-bottom: 20px
@@ -733,7 +807,7 @@ input.datepicker
733
807
  vertical-align: middle
734
808
 
735
809
  .media_picker:hover .image
736
- @include box-shadow(0 0 20px rgba(0, 0, 0, .2))
810
+ box-shadow: 0 0 20px rgba(0, 0, 0, .2)
737
811
 
738
812
  ul.sortable-grid
739
813
  margin: -8px
@@ -750,7 +824,7 @@ ul.sortable-grid
750
824
  @include transition(box-shadow .3s ease)
751
825
 
752
826
  &:hover
753
- @include box-shadow(0 0 20px rgba(0, 0, 0, .2))
827
+ box-shadow: 0 0 20px rgba(0, 0, 0, .2)
754
828
 
755
829
  .sortable-placeholder
756
830
  background: #f5f5f5
@@ -113,7 +113,7 @@
113
113
  display: block
114
114
 
115
115
  .item:not(.item-uploader):hover
116
- @include box-shadow(0 0 20px rgba(0, 0, 0, .4))
116
+ box-shadow: 0 0 20px rgba(0, 0, 0, .4)
117
117
 
118
118
  .item.selected:before
119
119
  content: " "
@@ -82,10 +82,6 @@ table.table
82
82
  display: block
83
83
  margin: -12px -16px -13px -16px
84
84
  padding: 13px 16px 12px 16px
85
- @include transition(background .1s ease)
86
-
87
- &:not(.table-column-sorted):hover
88
- background: #f9f9f9
89
85
 
90
86
  th .table-column-sorted
91
87
  background: #fff
@@ -219,6 +215,19 @@ tr:hover .progress
219
215
  & .progress-label
220
216
  color: $success-color
221
217
 
218
+ .progress-bar-danger
219
+ & .progress-bar
220
+ border-color: $danger-color
221
+
222
+ & .progress-bar-divider
223
+ border-color: $danger-color
224
+
225
+ & .progress-bar-inner
226
+ background: tint($danger-color, 60%)
227
+
228
+ & .progress-label
229
+ color: $danger-color
230
+
222
231
  // Clickable tables
223
232
 
224
233
  .table-clickable
@@ -98,6 +98,25 @@
98
98
  top: 3px
99
99
  z-index: 5
100
100
 
101
+ .wizard-step.error
102
+ .wizard-step-circle:before
103
+ color: #fff
104
+ font-size: 12px
105
+ height: 46px
106
+ line-height: 46px
107
+ text-align: center
108
+ position: absolute
109
+ width: 46px
110
+ z-index: 4
111
+ @extend .icon-cross, .icon
112
+
113
+ .wizard-step-circle:after
114
+ background: $danger-color
115
+ z-index: 3
116
+
117
+ .wizard-step-label
118
+ color: $danger-color
119
+
101
120
  .wizard-step.current
102
121
  .wizard-step-label
103
122
  color: $primary-color
@@ -1,5 +1,5 @@
1
1
  module Spina
2
2
  module Template
3
- VERSION = "0.4.0"
3
+ VERSION = "0.4.1"
4
4
  end
5
5
  end
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
19
19
  spec.add_development_dependency "bundler", "~> 1.3"
20
20
  spec.add_development_dependency "rake"
21
21
 
22
- spec.add_dependency "bourbon", "~> 3.2"
22
+ spec.add_dependency "bourbon", "~> 4.2"
23
23
  spec.add_dependency "neat", "~> 1.5"
24
24
  spec.add_dependency "coffee-rails"
25
25
  spec.add_dependency 'jquery-fileupload-rails'
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spina-template
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.0
4
+ version: 0.4.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Bram Jetten
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-08-05 00:00:00.000000000 Z
11
+ date: 2017-01-22 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -44,14 +44,14 @@ dependencies:
44
44
  requirements:
45
45
  - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: '3.2'
47
+ version: '4.2'
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - "~>"
53
53
  - !ruby/object:Gem::Version
54
- version: '3.2'
54
+ version: '4.2'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: neat
57
57
  requirement: !ruby/object:Gem::Requirement
@@ -253,7 +253,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
253
253
  version: '0'
254
254
  requirements: []
255
255
  rubyforge_project:
256
- rubygems_version: 2.5.1
256
+ rubygems_version: 2.5.2
257
257
  signing_key:
258
258
  specification_version: 4
259
259
  summary: Spina