diff options
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/admin/records.coffee | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/application.js | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/admin.css.scss | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/admin/layout.scss | 8 | ||||
| -rw-r--r-- | app/assets/stylesheets/main/records.scss | 2 | 
5 files changed, 14 insertions, 0 deletions
| diff --git a/app/assets/javascripts/admin/records.coffee b/app/assets/javascripts/admin/records.coffee index 3a1ed51..7a11ce1 100644 --- a/app/assets/javascripts/admin/records.coffee +++ b/app/assets/javascripts/admin/records.coffee | |||
| @@ -23,3 +23,5 @@ $(document).on "turbolinks:load", -> | |||
| 23 | create_record_toggle($(this).prop("checked")) | 23 | create_record_toggle($(this).prop("checked")) | 
| 24 | $(".published-field input[type=checkbox]").change -> | 24 | $(".published-field input[type=checkbox]").change -> | 
| 25 | published_field_toggle($(this).prop("checked")) | 25 | published_field_toggle($(this).prop("checked")) | 
| 26 | $("input[type=tags]").each -> | ||
| 27 | tagsInput(this) | ||
| diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index f902906..a81b3b2 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js | |||
| @@ -14,4 +14,5 @@ | |||
| 14 | //= require jquery_ujs | 14 | //= require jquery_ujs | 
| 15 | //= require turbolinks | 15 | //= require turbolinks | 
| 16 | //= require ckeditor/init | 16 | //= require ckeditor/init | 
| 17 | //= require tags-input | ||
| 17 | //= require_tree ./admin | 18 | //= require_tree ./admin | 
| diff --git a/app/assets/stylesheets/admin.css.scss b/app/assets/stylesheets/admin.css.scss index 5235c4b..95d1ed0 100644 --- a/app/assets/stylesheets/admin.css.scss +++ b/app/assets/stylesheets/admin.css.scss | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | /* | 1 | /* | 
| 2 | *= require normalize-rails | 2 | *= require normalize-rails | 
| 3 | *= require tags-input | ||
| 3 | *= require_tree ./admin | 4 | *= require_tree ./admin | 
| 4 | */ | 5 | */ | 
| diff --git a/app/assets/stylesheets/admin/layout.scss b/app/assets/stylesheets/admin/layout.scss index b825c25..220dcd5 100644 --- a/app/assets/stylesheets/admin/layout.scss +++ b/app/assets/stylesheets/admin/layout.scss | |||
| @@ -196,6 +196,14 @@ body { | |||
| 196 | } | 196 | } | 
| 197 | } | 197 | } | 
| 198 | 198 | ||
| 199 | .tags-field { | ||
| 200 | label { | ||
| 201 | font-size: .75em; | ||
| 202 | display: block; | ||
| 203 | margin-bottom: 0.5em; | ||
| 204 | } | ||
| 205 | } | ||
| 206 | |||
| 199 | .record-description-field { | 207 | .record-description-field { | 
| 200 | display: none; | 208 | display: none; | 
| 201 | margin-top: 1em; | 209 | margin-top: 1em; | 
| diff --git a/app/assets/stylesheets/main/records.scss b/app/assets/stylesheets/main/records.scss index f57dded..350fb16 100644 --- a/app/assets/stylesheets/main/records.scss +++ b/app/assets/stylesheets/main/records.scss | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | .tags { | 31 | .tags { | 
| 32 | margin: .25em; | 32 | margin: .25em; | 
| 33 | display: flex; | 33 | display: flex; | 
| 34 | flex-wrap: wrap; | ||
| 34 | padding-left: 0; | 35 | padding-left: 0; | 
| 35 | 36 | ||
| 36 | li { | 37 | li { | 
| @@ -58,6 +59,7 @@ | |||
| 58 | } | 59 | } | 
| 59 | } | 60 | } | 
| 60 | 61 | ||
| 62 | &.entry-tag { | ||
| 61 | & + li { | 63 | & + li { | 
| 62 | margin-left: 1em; | 64 | margin-left: 1em; | 
| 63 | } | 65 | } | 
