From 78c231bef61a1bb66f0704d4b43bf4b79aae0735 Mon Sep 17 00:00:00 2001 From: iagirre Date: Wed, 13 Sep 2017 17:34:58 +0200 Subject: [PATCH 1/5] Added db/schema after migration --- db/schema.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/schema.rb b/db/schema.rb index ba856107c..0b3c30a99 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -974,7 +974,7 @@ ActiveRecord::Schema.define(version: 20170908175149) do t.boolean "email_digest", default: true t.boolean "email_on_direct_message", default: true t.boolean "official_position_badge", default: false - t.datetime "password_changed_at", default: '2017-09-06 18:19:39', null: false + t.datetime "password_changed_at", default: '2017-06-22 11:21:30', null: false t.boolean "created_from_signature", default: false t.integer "failed_email_digests_count", default: 0 t.text "former_users_data_log", default: "" From f1eb535bdec0abf628b72599cad1b606f6d1ade1 Mon Sep 17 00:00:00 2001 From: iagirre Date: Thu, 14 Sep 2017 16:54:49 +0200 Subject: [PATCH 2/5] The arrows of the datepicker for changing the month didn't appear. There was a link for it, but no icons. The CSS file "theme" from jquery-ui was missing. Cambios para hacer commit: modificado: app/assets/stylesheets/application.scss modificado: app/assets/stylesheets/datepicker_overrides.scss nuevo archivo: app/assets/stylesheets/jquery-ui-theme_overrides.scss.erb --- app/assets/stylesheets/application.scss | 2 ++ app/assets/stylesheets/datepicker_overrides.scss | 5 ++++- app/assets/stylesheets/jquery-ui-theme_overrides.scss.erb | 6 ++++++ 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 app/assets/stylesheets/jquery-ui-theme_overrides.scss.erb diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 19c73de32..ea5a5d653 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -14,6 +14,8 @@ @import 'c3'; @import 'annotator.min'; @import 'annotator_overrides'; +@import 'jquery-ui/theme'; +@import 'jquery-ui-theme_overrides'; @import 'jquery-ui/datepicker'; @import 'datepicker_overrides'; @import 'documentable'; diff --git a/app/assets/stylesheets/datepicker_overrides.scss b/app/assets/stylesheets/datepicker_overrides.scss index d4c07802e..2e8518e6f 100644 --- a/app/assets/stylesheets/datepicker_overrides.scss +++ b/app/assets/stylesheets/datepicker_overrides.scss @@ -45,9 +45,12 @@ color: #fff; cursor: pointer; font-weight: normal; - font-size: $small-font-size; line-height: $line-height; top: 0; + position: absolute; + top: 2px; + width: 1.8em; + height: 1.8em; } table { diff --git a/app/assets/stylesheets/jquery-ui-theme_overrides.scss.erb b/app/assets/stylesheets/jquery-ui-theme_overrides.scss.erb new file mode 100644 index 000000000..c3d39a27c --- /dev/null +++ b/app/assets/stylesheets/jquery-ui-theme_overrides.scss.erb @@ -0,0 +1,6 @@ +//Overrides icon color for the jquery-ui theme + +.ui-icon, +.ui-widget-content .ui-icon { + background-image: url(<%= image_path("jquery-ui/ui-icons_ffffff_256x240.png") %>)/*{Make icons white}*/; +} \ No newline at end of file From a7e570ed248d20b900f53e1fb1ef83d76f6439d2 Mon Sep 17 00:00:00 2001 From: iagirre Date: Thu, 14 Sep 2017 17:09:02 +0200 Subject: [PATCH 3/5] Added new line at the end of the file. --- app/assets/stylesheets/jquery-ui-theme_overrides.scss.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/jquery-ui-theme_overrides.scss.erb b/app/assets/stylesheets/jquery-ui-theme_overrides.scss.erb index c3d39a27c..2da19413e 100644 --- a/app/assets/stylesheets/jquery-ui-theme_overrides.scss.erb +++ b/app/assets/stylesheets/jquery-ui-theme_overrides.scss.erb @@ -3,4 +3,4 @@ .ui-icon, .ui-widget-content .ui-icon { background-image: url(<%= image_path("jquery-ui/ui-icons_ffffff_256x240.png") %>)/*{Make icons white}*/; -} \ No newline at end of file +} From 354d07c1a60d1478f901aa5deb9eb168a1766566 Mon Sep 17 00:00:00 2001 From: iagirre Date: Fri, 15 Sep 2017 10:02:18 +0200 Subject: [PATCH 4/5] Changes suggested in the PR https://github.com/consul/consul/pull/1869 made. Use the icons of consul instead of icons from jquery-ui. Cambios para hacer commit: modificado: app/assets/stylesheets/application.scss modificado: app/assets/stylesheets/datepicker_overrides.scss borrado: app/assets/stylesheets/jquery-ui-theme_overrides.scss.erb --- app/assets/stylesheets/application.scss | 2 -- .../stylesheets/datepicker_overrides.scss | 29 +++++++++++-------- .../jquery-ui-theme_overrides.scss.erb | 6 ---- 3 files changed, 17 insertions(+), 20 deletions(-) delete mode 100644 app/assets/stylesheets/jquery-ui-theme_overrides.scss.erb diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index ea5a5d653..19c73de32 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -14,8 +14,6 @@ @import 'c3'; @import 'annotator.min'; @import 'annotator_overrides'; -@import 'jquery-ui/theme'; -@import 'jquery-ui-theme_overrides'; @import 'jquery-ui/datepicker'; @import 'datepicker_overrides'; @import 'documentable'; diff --git a/app/assets/stylesheets/datepicker_overrides.scss b/app/assets/stylesheets/datepicker_overrides.scss index 2e8518e6f..cfa0ce671 100644 --- a/app/assets/stylesheets/datepicker_overrides.scss +++ b/app/assets/stylesheets/datepicker_overrides.scss @@ -32,25 +32,30 @@ padding: 0; z-index: 4 !important; - .ui-datepicker-prev { - left: 12px; - } - - .ui-datepicker-next { - right: 12px; - } - .ui-datepicker-prev, .ui-datepicker-next { color: #fff; cursor: pointer; + font-family: "icons" !important; + font-size: rem-calc(24); font-weight: normal; + height: rem-calc(30); line-height: $line-height; - top: 0; position: absolute; - top: 2px; - width: 1.8em; - height: 1.8em; + width: 4px; + width: rem-calc(30); + + &:hover { + text-decoration: none; + } + } + + .ui-datepicker-prev::after { + content: '\62'; + } + + .ui-datepicker-next::after { + content: '\63'; } table { diff --git a/app/assets/stylesheets/jquery-ui-theme_overrides.scss.erb b/app/assets/stylesheets/jquery-ui-theme_overrides.scss.erb deleted file mode 100644 index 2da19413e..000000000 --- a/app/assets/stylesheets/jquery-ui-theme_overrides.scss.erb +++ /dev/null @@ -1,6 +0,0 @@ -//Overrides icon color for the jquery-ui theme - -.ui-icon, -.ui-widget-content .ui-icon { - background-image: url(<%= image_path("jquery-ui/ui-icons_ffffff_256x240.png") %>)/*{Make icons white}*/; -} From b889d23fe622b5cfed343dc760e03e05f3ee948c Mon Sep 17 00:00:00 2001 From: iagirre Date: Mon, 18 Sep 2017 08:19:47 +0200 Subject: [PATCH 5/5] Fixed width property, changed to top. --- app/assets/stylesheets/datepicker_overrides.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/datepicker_overrides.scss b/app/assets/stylesheets/datepicker_overrides.scss index cfa0ce671..79414ad99 100644 --- a/app/assets/stylesheets/datepicker_overrides.scss +++ b/app/assets/stylesheets/datepicker_overrides.scss @@ -42,7 +42,7 @@ height: rem-calc(30); line-height: $line-height; position: absolute; - width: 4px; + top: 4px; width: rem-calc(30); &:hover {