From dfa6d6a017e0e8656e1049cd0d0c9881d087af9f Mon Sep 17 00:00:00 2001 From: Bruno Perles Date: Fri, 6 Nov 2015 15:04:49 +0100 Subject: Move all .css.scss to .scss --- app/assets/stylesheets/application.css.scss.erb | 52 ------- app/assets/stylesheets/application.scss.erb | 52 +++++++ app/assets/stylesheets/main/access_links.css.scss | 26 ---- app/assets/stylesheets/main/access_links.scss | 26 ++++ app/assets/stylesheets/main/access_points.css.scss | 88 ----------- app/assets/stylesheets/main/access_points.scss | 88 +++++++++++ app/assets/stylesheets/main/api_keys.css.scss | 11 -- app/assets/stylesheets/main/api_keys.scss | 11 ++ app/assets/stylesheets/main/calendar.css.scss | 113 -------------- app/assets/stylesheets/main/calendar.scss | 113 ++++++++++++++ app/assets/stylesheets/main/companies.css.scss | 16 -- app/assets/stylesheets/main/companies.scss | 16 ++ .../main/compliance_check_tasks.css.scss | 4 - .../stylesheets/main/compliance_check_tasks.scss | 4 + .../stylesheets/main/compliance_checks.css.scss | 173 --------------------- app/assets/stylesheets/main/compliance_checks.scss | 173 +++++++++++++++++++++ .../stylesheets/main/connection_links.css.scss | 41 ----- app/assets/stylesheets/main/connection_links.scss | 41 +++++ app/assets/stylesheets/main/errors.css.scss | 15 -- app/assets/stylesheets/main/errors.scss | 15 ++ app/assets/stylesheets/main/export_tasks.css.scss | 13 -- app/assets/stylesheets/main/export_tasks.scss | 13 ++ app/assets/stylesheets/main/exports.css.scss | 26 ---- app/assets/stylesheets/main/exports.scss | 26 ++++ .../stylesheets/main/group_of_lines.css.scss | 23 --- app/assets/stylesheets/main/group_of_lines.scss | 23 +++ app/assets/stylesheets/main/help.css.scss | 173 --------------------- app/assets/stylesheets/main/help.scss | 173 +++++++++++++++++++++ app/assets/stylesheets/main/import_tasks.css.scss | 13 -- app/assets/stylesheets/main/import_tasks.scss | 13 ++ app/assets/stylesheets/main/imports.css.scss | 52 ------- app/assets/stylesheets/main/imports.scss | 52 +++++++ .../stylesheets/main/journey_patterns.css.scss | 55 ------- app/assets/stylesheets/main/journey_patterns.scss | 55 +++++++ app/assets/stylesheets/main/layout.css.scss | 145 ----------------- app/assets/stylesheets/main/layout.scss | 145 +++++++++++++++++ app/assets/stylesheets/main/lines.css.scss | 107 ------------- app/assets/stylesheets/main/lines.scss | 107 +++++++++++++ app/assets/stylesheets/main/networks.css.scss | 15 -- app/assets/stylesheets/main/networks.scss | 15 ++ app/assets/stylesheets/main/organisations.css.scss | 8 - app/assets/stylesheets/main/organisations.scss | 8 + app/assets/stylesheets/main/referentials.css.scss | 48 ------ app/assets/stylesheets/main/referentials.scss | 48 ++++++ app/assets/stylesheets/main/routes.css.scss | 48 ------ app/assets/stylesheets/main/routes.scss | 48 ++++++ .../stylesheets/main/rule_parameter_sets.css.scss | 51 ------ .../stylesheets/main/rule_parameter_sets.scss | 51 ++++++ app/assets/stylesheets/main/simple_form.css.scss | 7 - app/assets/stylesheets/main/simple_form.scss | 7 + app/assets/stylesheets/main/stop_areas.css.scss | 172 -------------------- app/assets/stylesheets/main/stop_areas.scss | 172 ++++++++++++++++++++ app/assets/stylesheets/main/stop_points.css.scss | 35 ----- app/assets/stylesheets/main/stop_points.scss | 35 +++++ app/assets/stylesheets/main/subscriptions.css.scss | 8 - app/assets/stylesheets/main/subscriptions.scss | 8 + .../main/time_table_combinations.css.scss | 14 -- .../stylesheets/main/time_table_combinations.scss | 14 ++ app/assets/stylesheets/main/time_tables.css.scss | 160 ------------------- app/assets/stylesheets/main/time_tables.scss | 160 +++++++++++++++++++ app/assets/stylesheets/main/timebands.css.scss | 0 app/assets/stylesheets/main/timebands.scss | 0 app/assets/stylesheets/main/users.css.scss | 7 - app/assets/stylesheets/main/users.scss | 7 + .../main/vehicle_journey_imports.css.scss | 4 - .../stylesheets/main/vehicle_journey_imports.scss | 4 + .../stylesheets/main/vehicle_journeys.css.scss | 153 ------------------ app/assets/stylesheets/main/vehicle_journeys.scss | 153 ++++++++++++++++++ .../stylesheets/main/vehicle_translation.css.scss | 15 -- .../stylesheets/main/vehicle_translation.scss | 15 ++ app/assets/stylesheets/main/welcome.css.scss | 3 - app/assets/stylesheets/main/welcome.scss | 3 + app/assets/stylesheets/modules/devise.css.scss | 88 ----------- app/assets/stylesheets/modules/devise.scss | 88 +++++++++++ app/assets/stylesheets/modules/icons.css.scss | 90 ----------- app/assets/stylesheets/modules/icons.scss | 90 +++++++++++ app/assets/stylesheets/modules/index_item.css.scss | 93 ----------- app/assets/stylesheets/modules/index_item.scss | 93 +++++++++++ .../stylesheets/modules/job_status_colors.css.scss | 4 - .../stylesheets/modules/job_status_colors.scss | 4 + .../stylesheets/modules/job_status_title.css.scss | 9 -- .../stylesheets/modules/job_status_title.scss | 9 ++ app/assets/stylesheets/modules/links.css.scss | 9 -- app/assets/stylesheets/modules/links.scss | 9 ++ .../stylesheets/modules/progress_bars.css.scss | 27 ---- app/assets/stylesheets/modules/progress_bars.scss | 27 ++++ app/assets/stylesheets/modules/search.css.scss | 19 --- app/assets/stylesheets/modules/search.scss | 19 +++ app/assets/stylesheets/partials/footer.css.scss | 15 -- app/assets/stylesheets/partials/footer.scss | 15 ++ app/assets/stylesheets/partials/header.css.scss | 48 ------ app/assets/stylesheets/partials/header.scss | 48 ++++++ app/assets/stylesheets/partials/ie_report.css.scss | 35 ----- app/assets/stylesheets/partials/ie_report.scss | 35 +++++ .../stylesheets/vendor/bootstrap_changes.css.scss | 58 ------- .../stylesheets/vendor/bootstrap_changes.scss | 58 +++++++ .../stylesheets/vendor/formtastic_changes.css.scss | 42 ----- .../stylesheets/vendor/formtastic_changes.scss | 42 +++++ app/assets/stylesheets/vendor/map_layers.css.scss | 10 -- app/assets/stylesheets/vendor/map_layers.scss | 10 ++ app/assets/stylesheets/vendor/pagination.css.scss | 34 ---- app/assets/stylesheets/vendor/pagination.scss | 34 ++++ app/assets/stylesheets/vendor/simple_form.css.scss | 11 -- app/assets/stylesheets/vendor/simple_form.scss | 11 ++ app/assets/stylesheets/vendor/typeahead.css.scss | 49 ------ app/assets/stylesheets/vendor/typeahead.scss | 49 ++++++ 106 files changed, 2535 insertions(+), 2535 deletions(-) delete mode 100644 app/assets/stylesheets/application.css.scss.erb create mode 100644 app/assets/stylesheets/application.scss.erb delete mode 100644 app/assets/stylesheets/main/access_links.css.scss create mode 100644 app/assets/stylesheets/main/access_links.scss delete mode 100644 app/assets/stylesheets/main/access_points.css.scss create mode 100644 app/assets/stylesheets/main/access_points.scss delete mode 100644 app/assets/stylesheets/main/api_keys.css.scss create mode 100644 app/assets/stylesheets/main/api_keys.scss delete mode 100644 app/assets/stylesheets/main/calendar.css.scss create mode 100644 app/assets/stylesheets/main/calendar.scss delete mode 100644 app/assets/stylesheets/main/companies.css.scss create mode 100644 app/assets/stylesheets/main/companies.scss delete mode 100644 app/assets/stylesheets/main/compliance_check_tasks.css.scss create mode 100644 app/assets/stylesheets/main/compliance_check_tasks.scss delete mode 100644 app/assets/stylesheets/main/compliance_checks.css.scss create mode 100644 app/assets/stylesheets/main/compliance_checks.scss delete mode 100644 app/assets/stylesheets/main/connection_links.css.scss create mode 100644 app/assets/stylesheets/main/connection_links.scss delete mode 100644 app/assets/stylesheets/main/errors.css.scss create mode 100644 app/assets/stylesheets/main/errors.scss delete mode 100644 app/assets/stylesheets/main/export_tasks.css.scss create mode 100644 app/assets/stylesheets/main/export_tasks.scss delete mode 100644 app/assets/stylesheets/main/exports.css.scss create mode 100644 app/assets/stylesheets/main/exports.scss delete mode 100644 app/assets/stylesheets/main/group_of_lines.css.scss create mode 100644 app/assets/stylesheets/main/group_of_lines.scss delete mode 100644 app/assets/stylesheets/main/help.css.scss create mode 100644 app/assets/stylesheets/main/help.scss delete mode 100644 app/assets/stylesheets/main/import_tasks.css.scss create mode 100644 app/assets/stylesheets/main/import_tasks.scss delete mode 100644 app/assets/stylesheets/main/imports.css.scss create mode 100644 app/assets/stylesheets/main/imports.scss delete mode 100644 app/assets/stylesheets/main/journey_patterns.css.scss create mode 100644 app/assets/stylesheets/main/journey_patterns.scss delete mode 100644 app/assets/stylesheets/main/layout.css.scss create mode 100644 app/assets/stylesheets/main/layout.scss delete mode 100644 app/assets/stylesheets/main/lines.css.scss create mode 100644 app/assets/stylesheets/main/lines.scss delete mode 100644 app/assets/stylesheets/main/networks.css.scss create mode 100644 app/assets/stylesheets/main/networks.scss delete mode 100644 app/assets/stylesheets/main/organisations.css.scss create mode 100644 app/assets/stylesheets/main/organisations.scss delete mode 100644 app/assets/stylesheets/main/referentials.css.scss create mode 100644 app/assets/stylesheets/main/referentials.scss delete mode 100644 app/assets/stylesheets/main/routes.css.scss create mode 100644 app/assets/stylesheets/main/routes.scss delete mode 100644 app/assets/stylesheets/main/rule_parameter_sets.css.scss create mode 100644 app/assets/stylesheets/main/rule_parameter_sets.scss delete mode 100644 app/assets/stylesheets/main/simple_form.css.scss create mode 100644 app/assets/stylesheets/main/simple_form.scss delete mode 100644 app/assets/stylesheets/main/stop_areas.css.scss create mode 100644 app/assets/stylesheets/main/stop_areas.scss delete mode 100644 app/assets/stylesheets/main/stop_points.css.scss create mode 100644 app/assets/stylesheets/main/stop_points.scss delete mode 100644 app/assets/stylesheets/main/subscriptions.css.scss create mode 100644 app/assets/stylesheets/main/subscriptions.scss delete mode 100644 app/assets/stylesheets/main/time_table_combinations.css.scss create mode 100644 app/assets/stylesheets/main/time_table_combinations.scss delete mode 100644 app/assets/stylesheets/main/time_tables.css.scss create mode 100644 app/assets/stylesheets/main/time_tables.scss delete mode 100644 app/assets/stylesheets/main/timebands.css.scss create mode 100644 app/assets/stylesheets/main/timebands.scss delete mode 100644 app/assets/stylesheets/main/users.css.scss create mode 100644 app/assets/stylesheets/main/users.scss delete mode 100644 app/assets/stylesheets/main/vehicle_journey_imports.css.scss create mode 100644 app/assets/stylesheets/main/vehicle_journey_imports.scss delete mode 100644 app/assets/stylesheets/main/vehicle_journeys.css.scss create mode 100644 app/assets/stylesheets/main/vehicle_journeys.scss delete mode 100644 app/assets/stylesheets/main/vehicle_translation.css.scss create mode 100644 app/assets/stylesheets/main/vehicle_translation.scss delete mode 100644 app/assets/stylesheets/main/welcome.css.scss create mode 100644 app/assets/stylesheets/main/welcome.scss delete mode 100644 app/assets/stylesheets/modules/devise.css.scss create mode 100644 app/assets/stylesheets/modules/devise.scss delete mode 100644 app/assets/stylesheets/modules/icons.css.scss create mode 100644 app/assets/stylesheets/modules/icons.scss delete mode 100644 app/assets/stylesheets/modules/index_item.css.scss create mode 100644 app/assets/stylesheets/modules/index_item.scss delete mode 100644 app/assets/stylesheets/modules/job_status_colors.css.scss create mode 100644 app/assets/stylesheets/modules/job_status_colors.scss delete mode 100644 app/assets/stylesheets/modules/job_status_title.css.scss create mode 100644 app/assets/stylesheets/modules/job_status_title.scss delete mode 100644 app/assets/stylesheets/modules/links.css.scss create mode 100644 app/assets/stylesheets/modules/links.scss delete mode 100644 app/assets/stylesheets/modules/progress_bars.css.scss create mode 100644 app/assets/stylesheets/modules/progress_bars.scss delete mode 100644 app/assets/stylesheets/modules/search.css.scss create mode 100644 app/assets/stylesheets/modules/search.scss delete mode 100644 app/assets/stylesheets/partials/footer.css.scss create mode 100644 app/assets/stylesheets/partials/footer.scss delete mode 100644 app/assets/stylesheets/partials/header.css.scss create mode 100644 app/assets/stylesheets/partials/header.scss delete mode 100644 app/assets/stylesheets/partials/ie_report.css.scss create mode 100644 app/assets/stylesheets/partials/ie_report.scss delete mode 100644 app/assets/stylesheets/vendor/bootstrap_changes.css.scss create mode 100644 app/assets/stylesheets/vendor/bootstrap_changes.scss delete mode 100644 app/assets/stylesheets/vendor/formtastic_changes.css.scss create mode 100644 app/assets/stylesheets/vendor/formtastic_changes.scss delete mode 100644 app/assets/stylesheets/vendor/map_layers.css.scss create mode 100644 app/assets/stylesheets/vendor/map_layers.scss delete mode 100644 app/assets/stylesheets/vendor/pagination.css.scss create mode 100644 app/assets/stylesheets/vendor/pagination.scss delete mode 100644 app/assets/stylesheets/vendor/simple_form.css.scss create mode 100644 app/assets/stylesheets/vendor/simple_form.scss delete mode 100644 app/assets/stylesheets/vendor/typeahead.css.scss create mode 100644 app/assets/stylesheets/vendor/typeahead.scss diff --git a/app/assets/stylesheets/application.css.scss.erb b/app/assets/stylesheets/application.css.scss.erb deleted file mode 100644 index 770e3c82b..000000000 --- a/app/assets/stylesheets/application.css.scss.erb +++ /dev/null @@ -1,52 +0,0 @@ -// First import journal variables -$brand-primary: <%= ChouetteIhm::Application.config.company_theme %>; -$navbar-default-bg: $brand-primary; -$navbar-default-link-color: white; -$body-bg: #eee; - -// Then bootstrap itself -@import "bootstrap-sass-official/_bootstrap-sprockets.scss"; -@import "bootstrap-sass-official"; - -// Whatever application styles you have go last -// Modules and Variables -@import "modules/search"; -@import "modules/index_item"; -@import "modules/icons"; -@import "modules/devise"; -@import "modules/progress_bars"; - -// Partials -@import "partials/base"; -@import "partials/header"; -@import "partials/footer"; - -// Third-party -@import "tagmanager/tagmanager"; -@import "font-awesome-sprockets"; -@import "font-awesome"; -@import "jquery.ui.all"; -@import "morrisjs"; -@import "formtastic"; -@import 'eonasdan-bootstrap-datetimepicker'; -@import 'footable'; - -@import "vendor/openlayers_style"; -@import "vendor/openlayers_ie6-style"; -@import "vendor/openlayers_google"; -@import "vendor/openlayers_framedCloud"; -@import "vendor/formtastic_changes"; -@import "vendor/pagination"; -@import "vendor/map_layers"; -@import "vendor/token-input"; -@import "vendor/typeahead"; -@import "vendor/bootstrap_changes"; -@import "vendor/simple_form"; - -// Main css -@import "main/*"; - -// Hack to make li simple -li{ - list-style: none; -} diff --git a/app/assets/stylesheets/application.scss.erb b/app/assets/stylesheets/application.scss.erb new file mode 100644 index 000000000..770e3c82b --- /dev/null +++ b/app/assets/stylesheets/application.scss.erb @@ -0,0 +1,52 @@ +// First import journal variables +$brand-primary: <%= ChouetteIhm::Application.config.company_theme %>; +$navbar-default-bg: $brand-primary; +$navbar-default-link-color: white; +$body-bg: #eee; + +// Then bootstrap itself +@import "bootstrap-sass-official/_bootstrap-sprockets.scss"; +@import "bootstrap-sass-official"; + +// Whatever application styles you have go last +// Modules and Variables +@import "modules/search"; +@import "modules/index_item"; +@import "modules/icons"; +@import "modules/devise"; +@import "modules/progress_bars"; + +// Partials +@import "partials/base"; +@import "partials/header"; +@import "partials/footer"; + +// Third-party +@import "tagmanager/tagmanager"; +@import "font-awesome-sprockets"; +@import "font-awesome"; +@import "jquery.ui.all"; +@import "morrisjs"; +@import "formtastic"; +@import 'eonasdan-bootstrap-datetimepicker'; +@import 'footable'; + +@import "vendor/openlayers_style"; +@import "vendor/openlayers_ie6-style"; +@import "vendor/openlayers_google"; +@import "vendor/openlayers_framedCloud"; +@import "vendor/formtastic_changes"; +@import "vendor/pagination"; +@import "vendor/map_layers"; +@import "vendor/token-input"; +@import "vendor/typeahead"; +@import "vendor/bootstrap_changes"; +@import "vendor/simple_form"; + +// Main css +@import "main/*"; + +// Hack to make li simple +li{ + list-style: none; +} diff --git a/app/assets/stylesheets/main/access_links.css.scss b/app/assets/stylesheets/main/access_links.css.scss deleted file mode 100644 index 1511b06a0..000000000 --- a/app/assets/stylesheets/main/access_links.css.scss +++ /dev/null @@ -1,26 +0,0 @@ -// Place all the styles related to the lines controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ - -#workspace.access_links.show -{ - - .summary p label { - font-weight: bold; - } - .duration { - padding-left: 10px; - } - -} - -#workspace.access_links.edit,#workspace.access_links.new,#workspace.access_links.create,#workspace.access_links.update -{ - .time_select ol { - padding: 0 0 0 40%; - width: 100%; - } -} - - - diff --git a/app/assets/stylesheets/main/access_links.scss b/app/assets/stylesheets/main/access_links.scss new file mode 100644 index 000000000..1511b06a0 --- /dev/null +++ b/app/assets/stylesheets/main/access_links.scss @@ -0,0 +1,26 @@ +// Place all the styles related to the lines controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ + +#workspace.access_links.show +{ + + .summary p label { + font-weight: bold; + } + .duration { + padding-left: 10px; + } + +} + +#workspace.access_links.edit,#workspace.access_links.new,#workspace.access_links.create,#workspace.access_links.update +{ + .time_select ol { + padding: 0 0 0 40%; + width: 100%; + } +} + + + diff --git a/app/assets/stylesheets/main/access_points.css.scss b/app/assets/stylesheets/main/access_points.css.scss deleted file mode 100644 index af6a09ee7..000000000 --- a/app/assets/stylesheets/main/access_points.css.scss +++ /dev/null @@ -1,88 +0,0 @@ -// Place all the styles related to the lines controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ - -#workspace.access_points.index -{ -} - -#workspace.access_points.edit,#workspace.access_points.new,#workspace.access_points.create,#workspace.access_points.update -{ - .time_select ol { - padding: 0 0 0 40%; - width: 100%; - } -} - -#workspace.access_points.edit { - legend { padding-bottom: 20px; } -} - -#workspace.access_points.show -{ - .geo_data { - padding-left:15px; - } - - .summary{ - - p label { - font-weight: bold; - } - } - - .access_link_pairs { - - table{ - border: 0px; - border-collapse: separate; - border-spacing: 3px; - } - - .link { - border: 2px solid black; - } - - .access_point{ - padding: 3px 15px 0px 3px; - height: 25px; - * { vertical-align:middle; } - span { margin-left: 7px; } - img { margin: 0px 5px 0px 5px;} - } - - .stop_area{ - padding: 3px 15px 0px 3px; - height: 25px; - * { vertical-align:middle; } - span { margin-left: 7px; } - img { margin: 0px 5px 0px 5px;} - } - - .info { - font-size: 10px; - color: #777; - font-weight: normal; - padding-top: 10px; - padding-left: 45px; - padding-right: 3px; - padding-bottom: 3px; - } - } - -} - - -#sidebar ul.selection li { - a { - line-height: 27px; - - img{ - height: 25px; - width: 25px; - vertical-align: middle; - } - } -} - - diff --git a/app/assets/stylesheets/main/access_points.scss b/app/assets/stylesheets/main/access_points.scss new file mode 100644 index 000000000..af6a09ee7 --- /dev/null +++ b/app/assets/stylesheets/main/access_points.scss @@ -0,0 +1,88 @@ +// Place all the styles related to the lines controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ + +#workspace.access_points.index +{ +} + +#workspace.access_points.edit,#workspace.access_points.new,#workspace.access_points.create,#workspace.access_points.update +{ + .time_select ol { + padding: 0 0 0 40%; + width: 100%; + } +} + +#workspace.access_points.edit { + legend { padding-bottom: 20px; } +} + +#workspace.access_points.show +{ + .geo_data { + padding-left:15px; + } + + .summary{ + + p label { + font-weight: bold; + } + } + + .access_link_pairs { + + table{ + border: 0px; + border-collapse: separate; + border-spacing: 3px; + } + + .link { + border: 2px solid black; + } + + .access_point{ + padding: 3px 15px 0px 3px; + height: 25px; + * { vertical-align:middle; } + span { margin-left: 7px; } + img { margin: 0px 5px 0px 5px;} + } + + .stop_area{ + padding: 3px 15px 0px 3px; + height: 25px; + * { vertical-align:middle; } + span { margin-left: 7px; } + img { margin: 0px 5px 0px 5px;} + } + + .info { + font-size: 10px; + color: #777; + font-weight: normal; + padding-top: 10px; + padding-left: 45px; + padding-right: 3px; + padding-bottom: 3px; + } + } + +} + + +#sidebar ul.selection li { + a { + line-height: 27px; + + img{ + height: 25px; + width: 25px; + vertical-align: middle; + } + } +} + + diff --git a/app/assets/stylesheets/main/api_keys.css.scss b/app/assets/stylesheets/main/api_keys.css.scss deleted file mode 100644 index 61dff90b8..000000000 --- a/app/assets/stylesheets/main/api_keys.css.scss +++ /dev/null @@ -1,11 +0,0 @@ -// Place all the styles related to the routes controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ - -#workspace.api_keys.show -{ - .summary p label { - font-weight: bold; - } -} - diff --git a/app/assets/stylesheets/main/api_keys.scss b/app/assets/stylesheets/main/api_keys.scss new file mode 100644 index 000000000..61dff90b8 --- /dev/null +++ b/app/assets/stylesheets/main/api_keys.scss @@ -0,0 +1,11 @@ +// Place all the styles related to the routes controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ + +#workspace.api_keys.show +{ + .summary p label { + font-weight: bold; + } +} + diff --git a/app/assets/stylesheets/main/calendar.css.scss b/app/assets/stylesheets/main/calendar.css.scss deleted file mode 100644 index b8c04b6f4..000000000 --- a/app/assets/stylesheets/main/calendar.css.scss +++ /dev/null @@ -1,113 +0,0 @@ -/* - A grey based theme, inspired by Blinksale and their ColorBurn widget. http://firewheeldesign.com - - AUTHOR: Geoffrey Grosenbach http://nubyonrails.com - - Colors: - dk: 787888 - lt: 4f4f5b - lter: a8a8a8 - white: ffffff -*/ - -$selected_period_color: #ffbd2b; -$selected_date_color: #8fc861; -$excluded_date_color: #ff8f85; -$overlap_date_color: #c082f4; - -.year_choice{ - font-size: 16px; - font-weight: bold; - margin: 10px 0 0 0; - text-align: center; - - .year{ - text-align: center; - - } - -} - -.calendar_helper{ - padding: auto; -} - -.calendar { - font-size: 10px; - color: white; - text-align: center; - margin-left: 15px; - display: inline-table; -} - -thead tr { - color: black; -} - -th.monthName { - font-size: 12px; - font-weight: bold; - text-align: center; - padding-top: 1em; - padding-bottom: 0.7em; - color: black; -} - -.dayName th { - text-align: center; - padding-top: 0.6em; - padding-bottom: 0.3em; - background-color: #303030; - color: white; - border-bottom: 1px solid white; -} - -.otherMonth { - color: #999999; - background-color: #4f4f5b; - padding: 0.7em; - border-right: 1px solid #111111; - border-bottom: 1px solid #111111; -} - -.day { - background-color: #333333; -} - -.day, .specialDay { - border-bottom: 1px solid #111111; - padding: 0.7em; - border-right: 1px solid #111111; - border-bottom: 1px solid #111111; -} - -.specialDay { background-color: #a8a8a8 !important; } - -.selected_period { background-color: $selected_period_color !important; } - -.selected_date { background-color: $selected_date_color !important; } - -.excluded_date { background-color: $excluded_date_color !important; } - -.overlaped_date { background-color: $overlap_date_color !important; } - -.specialDay, .selected_period, .selected_date, .overlaped_date, .excluded_date { - a, a:visited, a:hover { - color: white; - text-decoration: none; - } -} - -.specialDay a:hover, selected_period a:hover, selected_date a:hover, excluded_date a:hover, overlaped_date a:hover{ - color: black; - } - -.weekendDay { - background-color: #787888; -} -.today { - background-color: white; - color: black; -} - - diff --git a/app/assets/stylesheets/main/calendar.scss b/app/assets/stylesheets/main/calendar.scss new file mode 100644 index 000000000..b8c04b6f4 --- /dev/null +++ b/app/assets/stylesheets/main/calendar.scss @@ -0,0 +1,113 @@ +/* + A grey based theme, inspired by Blinksale and their ColorBurn widget. http://firewheeldesign.com + + AUTHOR: Geoffrey Grosenbach http://nubyonrails.com + + Colors: + dk: 787888 + lt: 4f4f5b + lter: a8a8a8 + white: ffffff +*/ + +$selected_period_color: #ffbd2b; +$selected_date_color: #8fc861; +$excluded_date_color: #ff8f85; +$overlap_date_color: #c082f4; + +.year_choice{ + font-size: 16px; + font-weight: bold; + margin: 10px 0 0 0; + text-align: center; + + .year{ + text-align: center; + + } + +} + +.calendar_helper{ + padding: auto; +} + +.calendar { + font-size: 10px; + color: white; + text-align: center; + margin-left: 15px; + display: inline-table; +} + +thead tr { + color: black; +} + +th.monthName { + font-size: 12px; + font-weight: bold; + text-align: center; + padding-top: 1em; + padding-bottom: 0.7em; + color: black; +} + +.dayName th { + text-align: center; + padding-top: 0.6em; + padding-bottom: 0.3em; + background-color: #303030; + color: white; + border-bottom: 1px solid white; +} + +.otherMonth { + color: #999999; + background-color: #4f4f5b; + padding: 0.7em; + border-right: 1px solid #111111; + border-bottom: 1px solid #111111; +} + +.day { + background-color: #333333; +} + +.day, .specialDay { + border-bottom: 1px solid #111111; + padding: 0.7em; + border-right: 1px solid #111111; + border-bottom: 1px solid #111111; +} + +.specialDay { background-color: #a8a8a8 !important; } + +.selected_period { background-color: $selected_period_color !important; } + +.selected_date { background-color: $selected_date_color !important; } + +.excluded_date { background-color: $excluded_date_color !important; } + +.overlaped_date { background-color: $overlap_date_color !important; } + +.specialDay, .selected_period, .selected_date, .overlaped_date, .excluded_date { + a, a:visited, a:hover { + color: white; + text-decoration: none; + } +} + +.specialDay a:hover, selected_period a:hover, selected_date a:hover, excluded_date a:hover, overlaped_date a:hover{ + color: black; + } + +.weekendDay { + background-color: #787888; +} +.today { + background-color: white; + color: black; +} + + diff --git a/app/assets/stylesheets/main/companies.css.scss b/app/assets/stylesheets/main/companies.css.scss deleted file mode 100644 index 481b2ee7b..000000000 --- a/app/assets/stylesheets/main/companies.css.scss +++ /dev/null @@ -1,16 +0,0 @@ -// Place all the styles related to the lines controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ - -#workspace.companies.index -{ -} - -#workspace.companies.show -{ - .summary p label { - font-weight: bold; - } -} - - diff --git a/app/assets/stylesheets/main/companies.scss b/app/assets/stylesheets/main/companies.scss new file mode 100644 index 000000000..481b2ee7b --- /dev/null +++ b/app/assets/stylesheets/main/companies.scss @@ -0,0 +1,16 @@ +// Place all the styles related to the lines controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ + +#workspace.companies.index +{ +} + +#workspace.companies.show +{ + .summary p label { + font-weight: bold; + } +} + + diff --git a/app/assets/stylesheets/main/compliance_check_tasks.css.scss b/app/assets/stylesheets/main/compliance_check_tasks.css.scss deleted file mode 100644 index 64c6a2f94..000000000 --- a/app/assets/stylesheets/main/compliance_check_tasks.css.scss +++ /dev/null @@ -1,4 +0,0 @@ -#workspace.compliance_check_tasks.new, #workspace.compliance_check_tasks.create -{ - -} diff --git a/app/assets/stylesheets/main/compliance_check_tasks.scss b/app/assets/stylesheets/main/compliance_check_tasks.scss new file mode 100644 index 000000000..64c6a2f94 --- /dev/null +++ b/app/assets/stylesheets/main/compliance_check_tasks.scss @@ -0,0 +1,4 @@ +#workspace.compliance_check_tasks.new, #workspace.compliance_check_tasks.create +{ + +} diff --git a/app/assets/stylesheets/main/compliance_checks.css.scss b/app/assets/stylesheets/main/compliance_checks.css.scss deleted file mode 100644 index d31dfab62..000000000 --- a/app/assets/stylesheets/main/compliance_checks.css.scss +++ /dev/null @@ -1,173 +0,0 @@ -#workspace.compliance_checks.index -{ -} - -#workspace.compliance_checks.show { - @import "../modules/job_status_colors"; - @import "../modules/job_status_title"; - @import "../partials/ie_report"; - @import "../modules/links"; -} - -#validation_success{ - margin-top: 15px; -} - -#workspace.compliance_checks.report, #workspace.imports.compliance_check{ - @import "../modules/job_status_colors"; - @import "../modules/job_status_title"; - @import "../modules/links"; - - .status { - margin-left: 10px; - } - - .order{ - margin-bottom: 10px; - padding: 5px; - border-top: 1px solid #e4e4e4; - border-bottom: 1px solid #e4e4e4; - } - - .status_ok_error { color: #8fc861; } - .status_nok_error { color: #e22b1b; } - .status_uncheck_error { color: #898e7f; } - - .status_ok_warning { color: #8fc861; } - .status_nok_warning { color: #ffbd2b; } - .status_uncheck_warning { color: #898e7f; } - - .resume { - &:after{ - content: " "; - display: block; - height: 0; - clear: both; - visibility: hidden; - } - - .col1 { - float: left; - width: 45%; - } - - .col2 { - margin-left: 10px; - float: left; - width: 45%; - } - - .graph { height: 200px; } - - .caption { - text-align :center; - font-weight: bold; - } - } - - .report{ - .table { margin-top: 20px; } - dl.inline { - width: 100%; - overflow: hidden; - } - dl.inline dt { - float: left; - clear: left; - width: 35%; - padding-top: 5px; - border-top: 1px solid #eee; - -ms-word-break: break-all; - word-break: break-all; - word-break: break-word; - -webkit-hyphens: auto; - -moz-hyphens: auto; - -ms-hyphens: auto; - hyphens: auto; - } - dl.inline dd { - float: left; - width: 65%; - padding-top: 10px; - border-top: 1px solid #eee; - } - } - - .severity__improvment, .severity_warning, .severity_error { - border: 1px solid; - margin: 10px 0px; - padding:10px 10px 10px 10px; - background-repeat: no-repeat; - background-position: 10px center;-moz-border-radius:.5em; - -webkit-border-radius:.5em; - border-radius:.5em; - height: 100%; - - &:after{ - content: " "; - display: block; - height: 0; - clear: both; - visibility: hidden; - } - - .status_icon { - float: left; - width: 20%; - height: auto; - - img { - vertical-align: middle; - width: 48px; - height: 48px; - } - } - - .status_text{ - float: left; - width: 70%; - - .code{ - font-size: 12px; - font-weight: bold; - } - - .severity { - font-size: 10px; - } - - .explanation{ - display: none; - font-size: 12px; - margin: 5px 0 0 0; - } - - .attributes{ - font-size: 10px; - font-weight: bold; - margin: 5px 0 0px 0; - } - } - - } - - .severity_improvment { - color: black; - background-color: #c5cf4c; - } - - .severity_warning { - color: black; - background-color: #f1dd30; - } - - .severity_error { - color: black; - background-color: #ff9a0c; - } - - .file_error{ - font-size: 14px; - color: #898e7f; - } -} diff --git a/app/assets/stylesheets/main/compliance_checks.scss b/app/assets/stylesheets/main/compliance_checks.scss new file mode 100644 index 000000000..d31dfab62 --- /dev/null +++ b/app/assets/stylesheets/main/compliance_checks.scss @@ -0,0 +1,173 @@ +#workspace.compliance_checks.index +{ +} + +#workspace.compliance_checks.show { + @import "../modules/job_status_colors"; + @import "../modules/job_status_title"; + @import "../partials/ie_report"; + @import "../modules/links"; +} + +#validation_success{ + margin-top: 15px; +} + +#workspace.compliance_checks.report, #workspace.imports.compliance_check{ + @import "../modules/job_status_colors"; + @import "../modules/job_status_title"; + @import "../modules/links"; + + .status { + margin-left: 10px; + } + + .order{ + margin-bottom: 10px; + padding: 5px; + border-top: 1px solid #e4e4e4; + border-bottom: 1px solid #e4e4e4; + } + + .status_ok_error { color: #8fc861; } + .status_nok_error { color: #e22b1b; } + .status_uncheck_error { color: #898e7f; } + + .status_ok_warning { color: #8fc861; } + .status_nok_warning { color: #ffbd2b; } + .status_uncheck_warning { color: #898e7f; } + + .resume { + &:after{ + content: " "; + display: block; + height: 0; + clear: both; + visibility: hidden; + } + + .col1 { + float: left; + width: 45%; + } + + .col2 { + margin-left: 10px; + float: left; + width: 45%; + } + + .graph { height: 200px; } + + .caption { + text-align :center; + font-weight: bold; + } + } + + .report{ + .table { margin-top: 20px; } + dl.inline { + width: 100%; + overflow: hidden; + } + dl.inline dt { + float: left; + clear: left; + width: 35%; + padding-top: 5px; + border-top: 1px solid #eee; + -ms-word-break: break-all; + word-break: break-all; + word-break: break-word; + -webkit-hyphens: auto; + -moz-hyphens: auto; + -ms-hyphens: auto; + hyphens: auto; + } + dl.inline dd { + float: left; + width: 65%; + padding-top: 10px; + border-top: 1px solid #eee; + } + } + + .severity__improvment, .severity_warning, .severity_error { + border: 1px solid; + margin: 10px 0px; + padding:10px 10px 10px 10px; + background-repeat: no-repeat; + background-position: 10px center;-moz-border-radius:.5em; + -webkit-border-radius:.5em; + border-radius:.5em; + height: 100%; + + &:after{ + content: " "; + display: block; + height: 0; + clear: both; + visibility: hidden; + } + + .status_icon { + float: left; + width: 20%; + height: auto; + + img { + vertical-align: middle; + width: 48px; + height: 48px; + } + } + + .status_text{ + float: left; + width: 70%; + + .code{ + font-size: 12px; + font-weight: bold; + } + + .severity { + font-size: 10px; + } + + .explanation{ + display: none; + font-size: 12px; + margin: 5px 0 0 0; + } + + .attributes{ + font-size: 10px; + font-weight: bold; + margin: 5px 0 0px 0; + } + } + + } + + .severity_improvment { + color: black; + background-color: #c5cf4c; + } + + .severity_warning { + color: black; + background-color: #f1dd30; + } + + .severity_error { + color: black; + background-color: #ff9a0c; + } + + .file_error{ + font-size: 14px; + color: #898e7f; + } +} diff --git a/app/assets/stylesheets/main/connection_links.css.scss b/app/assets/stylesheets/main/connection_links.css.scss deleted file mode 100644 index 5e5186ccf..000000000 --- a/app/assets/stylesheets/main/connection_links.css.scss +++ /dev/null @@ -1,41 +0,0 @@ -// Place all the styles related to the lines controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ - -#workspace.connection_links.index -{ -} - - -#workspace.connection_links.show -{ - - .summary p label { - font-weight: bold; - } - .duration { - padding-left: 10px; - } - -} - -#workspace.connection_links.select_departure -{ - .token-input-list{ - display: inline-block; - } -} - -#workspace.connection_links.select_arrival -{ - .token-input-list{ - display: inline-block; - } -} - -#workspace.connection_links.edit,#workspace.connection_links.new,#workspace.connection_links.create,#workspace.connection_links.update{ - legend { border: 0px; } - - panel{ margin-left: 25%; } -} - diff --git a/app/assets/stylesheets/main/connection_links.scss b/app/assets/stylesheets/main/connection_links.scss new file mode 100644 index 000000000..5e5186ccf --- /dev/null +++ b/app/assets/stylesheets/main/connection_links.scss @@ -0,0 +1,41 @@ +// Place all the styles related to the lines controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ + +#workspace.connection_links.index +{ +} + + +#workspace.connection_links.show +{ + + .summary p label { + font-weight: bold; + } + .duration { + padding-left: 10px; + } + +} + +#workspace.connection_links.select_departure +{ + .token-input-list{ + display: inline-block; + } +} + +#workspace.connection_links.select_arrival +{ + .token-input-list{ + display: inline-block; + } +} + +#workspace.connection_links.edit,#workspace.connection_links.new,#workspace.connection_links.create,#workspace.connection_links.update{ + legend { border: 0px; } + + panel{ margin-left: 25%; } +} + diff --git a/app/assets/stylesheets/main/errors.css.scss b/app/assets/stylesheets/main/errors.css.scss deleted file mode 100644 index b314da37a..000000000 --- a/app/assets/stylesheets/main/errors.css.scss +++ /dev/null @@ -1,15 +0,0 @@ -#workspace.errors { - - body {text-align: center; } - div.error { - width: 45em; - padding:1em; - margin: 2em auto 0 auto; - border: 1px solid #ccc; - border-right-color: #999; - border-bottom-color: #999; - } - h2 { font-size: 100%; color: #f00; line-height: 1.5em; font-weight: bold} - a,a:visited { text-decoration: underline; color: blue} - -} diff --git a/app/assets/stylesheets/main/errors.scss b/app/assets/stylesheets/main/errors.scss new file mode 100644 index 000000000..b314da37a --- /dev/null +++ b/app/assets/stylesheets/main/errors.scss @@ -0,0 +1,15 @@ +#workspace.errors { + + body {text-align: center; } + div.error { + width: 45em; + padding:1em; + margin: 2em auto 0 auto; + border: 1px solid #ccc; + border-right-color: #999; + border-bottom-color: #999; + } + h2 { font-size: 100%; color: #f00; line-height: 1.5em; font-weight: bold} + a,a:visited { text-decoration: underline; color: blue} + +} diff --git a/app/assets/stylesheets/main/export_tasks.css.scss b/app/assets/stylesheets/main/export_tasks.css.scss deleted file mode 100644 index 5c04b8ea0..000000000 --- a/app/assets/stylesheets/main/export_tasks.css.scss +++ /dev/null @@ -1,13 +0,0 @@ -#workspace.export_tasks.new, #workspace.export_tasks.create { - .nav{ - margin: 30px 0 10px 0; - } - - .highlight { - padding: 9px 14px; - margin-bottom: 14px; - background-color: #f7f7f9; - border: 1px solid #e1e1e8; - border-radius: 4px; - } -} diff --git a/app/assets/stylesheets/main/export_tasks.scss b/app/assets/stylesheets/main/export_tasks.scss new file mode 100644 index 000000000..5c04b8ea0 --- /dev/null +++ b/app/assets/stylesheets/main/export_tasks.scss @@ -0,0 +1,13 @@ +#workspace.export_tasks.new, #workspace.export_tasks.create { + .nav{ + margin: 30px 0 10px 0; + } + + .highlight { + padding: 9px 14px; + margin-bottom: 14px; + background-color: #f7f7f9; + border: 1px solid #e1e1e8; + border-radius: 4px; + } +} diff --git a/app/assets/stylesheets/main/exports.css.scss b/app/assets/stylesheets/main/exports.css.scss deleted file mode 100644 index d2ee1cb86..000000000 --- a/app/assets/stylesheets/main/exports.css.scss +++ /dev/null @@ -1,26 +0,0 @@ -// Place all the styles related to the Exports controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ - -#workspace.exports.index -{ - .panel.export { - .panel-footer { - .history { - margin-top: 5px; - } - } - } -} - -#workspace.exports.show { - @import "../partials/ie_report"; - @import "../modules/job_status_colors"; - @import "../modules/job_status_title"; - @import "../modules/links"; - - .export-attributes { - font-size: 1.7em; - margin-top: 20px; - } -} diff --git a/app/assets/stylesheets/main/exports.scss b/app/assets/stylesheets/main/exports.scss new file mode 100644 index 000000000..d2ee1cb86 --- /dev/null +++ b/app/assets/stylesheets/main/exports.scss @@ -0,0 +1,26 @@ +// Place all the styles related to the Exports controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ + +#workspace.exports.index +{ + .panel.export { + .panel-footer { + .history { + margin-top: 5px; + } + } + } +} + +#workspace.exports.show { + @import "../partials/ie_report"; + @import "../modules/job_status_colors"; + @import "../modules/job_status_title"; + @import "../modules/links"; + + .export-attributes { + font-size: 1.7em; + margin-top: 20px; + } +} diff --git a/app/assets/stylesheets/main/group_of_lines.css.scss b/app/assets/stylesheets/main/group_of_lines.css.scss deleted file mode 100644 index 7e8b7590d..000000000 --- a/app/assets/stylesheets/main/group_of_lines.css.scss +++ /dev/null @@ -1,23 +0,0 @@ -// Place all the styles related to the lines controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ - -#workspace.group_of_lines.index -{ -} - -#workspace.group_of_lines.show -{ - .summary p label { - font-weight: bold; - } - .lines_detail div.page_info { - margin-top: 0px; - } - - .lines { - margin-top: 10px; - } - -} - diff --git a/app/assets/stylesheets/main/group_of_lines.scss b/app/assets/stylesheets/main/group_of_lines.scss new file mode 100644 index 000000000..7e8b7590d --- /dev/null +++ b/app/assets/stylesheets/main/group_of_lines.scss @@ -0,0 +1,23 @@ +// Place all the styles related to the lines controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ + +#workspace.group_of_lines.index +{ +} + +#workspace.group_of_lines.show +{ + .summary p label { + font-weight: bold; + } + .lines_detail div.page_info { + margin-top: 0px; + } + + .lines { + margin-top: 10px; + } + +} + diff --git a/app/assets/stylesheets/main/help.css.scss b/app/assets/stylesheets/main/help.css.scss deleted file mode 100644 index ebffedc92..000000000 --- a/app/assets/stylesheets/main/help.css.scss +++ /dev/null @@ -1,173 +0,0 @@ -#workspace.help { - -ul li { - list-style: circle; - margin: 7px 0 7px 20px; -} -ol ul li { - list-style: circle; - margin: 7px 0 7px 20px; -} - - -ol { - list-style: none; - margin: 7px 0 7px 20px; - padding: 0; - counter-reset: num; -} - -ol li:before { - content: counter(num) '. '; - counter-increment: num; -} - -ol ol li:before { - content: counters(num, '.') ' '; -} - -em { - font-style: italic; -} - -strong { - font-weight: bold; -} - -cite { - font-style: italic; -} - -p.attr_data { - font-style: italic; - text-decoration: underline; -} - -p.olnext { - margin: -7px 0 0 40px !important; -} - -p.ddnext { - margin: 0 0 0 30px !important; -} - -p.note { - margin-left: 20px !important; - font-weight: bold; -} - -p.border_image { - text-align: center; -} - -p.border_image img { - border-style:solid; - border-width:1px; - border-color: rgb(187,187,187); -} - - -table { - width: 100%; -} - -table td { - padding: 3px 5px; - width: 30%; -} - -dt { - font-style:italic; - margin: 5px 0; -} - -dd { - padding-left: 10px; -} - - - table.meta { - width:50%; - } - table.meta th { - border-width:1px; - border-style:solid; - border-color:black; - } - table.meta td { - border-width:1px; - border-style:solid; - border-color:black; - } - -} -#sidebarhelp.help { -h2 { - font-size: 17px; -} - -h3 { - font-size: 15px; -} - -h4 { - font-weight: bold; - padding: 7px 0; -} - -ul li { - list-style: circle; - margin: 7px 0 7px 20px; -} - -ol { - list-style: none; - margin: 7px 0 7px 20px; - padding: 0; - counter-reset: num; -} - -ol li:before { - content: counter(num) '. '; - counter-increment: num; -} - -ol ol li:before { - content: counters(num, '.') ' '; -} - -em { - font-style: italic; -} - -strong { - font-weight: bold; -} - -cite { - font-style: italic; -} - -p.attr_data { - font-style: italic; - text-decoration: underline; -} - -table { - width: 100%; -} - -table td { - padding: 3px 5px; - width: 30%; -} - -dt { - font-style:italic; - margin: 5px 0; -} - -dd { - padding-left: 10px; -} -} diff --git a/app/assets/stylesheets/main/help.scss b/app/assets/stylesheets/main/help.scss new file mode 100644 index 000000000..ebffedc92 --- /dev/null +++ b/app/assets/stylesheets/main/help.scss @@ -0,0 +1,173 @@ +#workspace.help { + +ul li { + list-style: circle; + margin: 7px 0 7px 20px; +} +ol ul li { + list-style: circle; + margin: 7px 0 7px 20px; +} + + +ol { + list-style: none; + margin: 7px 0 7px 20px; + padding: 0; + counter-reset: num; +} + +ol li:before { + content: counter(num) '. '; + counter-increment: num; +} + +ol ol li:before { + content: counters(num, '.') ' '; +} + +em { + font-style: italic; +} + +strong { + font-weight: bold; +} + +cite { + font-style: italic; +} + +p.attr_data { + font-style: italic; + text-decoration: underline; +} + +p.olnext { + margin: -7px 0 0 40px !important; +} + +p.ddnext { + margin: 0 0 0 30px !important; +} + +p.note { + margin-left: 20px !important; + font-weight: bold; +} + +p.border_image { + text-align: center; +} + +p.border_image img { + border-style:solid; + border-width:1px; + border-color: rgb(187,187,187); +} + + +table { + width: 100%; +} + +table td { + padding: 3px 5px; + width: 30%; +} + +dt { + font-style:italic; + margin: 5px 0; +} + +dd { + padding-left: 10px; +} + + + table.meta { + width:50%; + } + table.meta th { + border-width:1px; + border-style:solid; + border-color:black; + } + table.meta td { + border-width:1px; + border-style:solid; + border-color:black; + } + +} +#sidebarhelp.help { +h2 { + font-size: 17px; +} + +h3 { + font-size: 15px; +} + +h4 { + font-weight: bold; + padding: 7px 0; +} + +ul li { + list-style: circle; + margin: 7px 0 7px 20px; +} + +ol { + list-style: none; + margin: 7px 0 7px 20px; + padding: 0; + counter-reset: num; +} + +ol li:before { + content: counter(num) '. '; + counter-increment: num; +} + +ol ol li:before { + content: counters(num, '.') ' '; +} + +em { + font-style: italic; +} + +strong { + font-weight: bold; +} + +cite { + font-style: italic; +} + +p.attr_data { + font-style: italic; + text-decoration: underline; +} + +table { + width: 100%; +} + +table td { + padding: 3px 5px; + width: 30%; +} + +dt { + font-style:italic; + margin: 5px 0; +} + +dd { + padding-left: 10px; +} +} diff --git a/app/assets/stylesheets/main/import_tasks.css.scss b/app/assets/stylesheets/main/import_tasks.css.scss deleted file mode 100644 index 3a0d48ddf..000000000 --- a/app/assets/stylesheets/main/import_tasks.css.scss +++ /dev/null @@ -1,13 +0,0 @@ -#workspace.import_tasks.new, #workspace.import_tasks.create { - .nav{ - margin: 30px 0 10px 0; - } - - .highlight { - padding: 9px 14px; - margin-bottom: 14px; - background-color: #f7f7f9; - border: 1px solid #e1e1e8; - border-radius: 4px; - } -} diff --git a/app/assets/stylesheets/main/import_tasks.scss b/app/assets/stylesheets/main/import_tasks.scss new file mode 100644 index 000000000..3a0d48ddf --- /dev/null +++ b/app/assets/stylesheets/main/import_tasks.scss @@ -0,0 +1,13 @@ +#workspace.import_tasks.new, #workspace.import_tasks.create { + .nav{ + margin: 30px 0 10px 0; + } + + .highlight { + padding: 9px 14px; + margin-bottom: 14px; + background-color: #f7f7f9; + border: 1px solid #e1e1e8; + border-radius: 4px; + } +} diff --git a/app/assets/stylesheets/main/imports.css.scss b/app/assets/stylesheets/main/imports.css.scss deleted file mode 100644 index 32a20d1c4..000000000 --- a/app/assets/stylesheets/main/imports.css.scss +++ /dev/null @@ -1,52 +0,0 @@ -#workspace.imports.index { - .panel.import { - .panel-footer { - min-height: 5.5em; - - .save-mode { - color: $brand-info; - .fa-lg { - font-size: 1em; - } - .fa-ban { - opacity: 0.6; - } - } - - .history { - margin-top: 5px; - } - } - } -} - -#workspace.imports.index, #workspace.imports.show { - .import-attributes { - .save-mode, .format { - display: inline-block; - } - - .save-mode { - color: $brand-info; - .fa-ban { - opacity: 0.6; - } - .fa-stack { - font-size: 0.9em; - } - margin-left: 0.3em; - } - } -} - -#workspace.imports.show { - @import "../partials/ie_report"; - @import "../modules/job_status_colors"; - @import "../modules/job_status_title"; - @import "../modules/links"; - - .import-attributes { - font-size: 1.7em; - margin-top: 20px; - } -} diff --git a/app/assets/stylesheets/main/imports.scss b/app/assets/stylesheets/main/imports.scss new file mode 100644 index 000000000..32a20d1c4 --- /dev/null +++ b/app/assets/stylesheets/main/imports.scss @@ -0,0 +1,52 @@ +#workspace.imports.index { + .panel.import { + .panel-footer { + min-height: 5.5em; + + .save-mode { + color: $brand-info; + .fa-lg { + font-size: 1em; + } + .fa-ban { + opacity: 0.6; + } + } + + .history { + margin-top: 5px; + } + } + } +} + +#workspace.imports.index, #workspace.imports.show { + .import-attributes { + .save-mode, .format { + display: inline-block; + } + + .save-mode { + color: $brand-info; + .fa-ban { + opacity: 0.6; + } + .fa-stack { + font-size: 0.9em; + } + margin-left: 0.3em; + } + } +} + +#workspace.imports.show { + @import "../partials/ie_report"; + @import "../modules/job_status_colors"; + @import "../modules/job_status_title"; + @import "../modules/links"; + + .import-attributes { + font-size: 1.7em; + margin-top: 20px; + } +} diff --git a/app/assets/stylesheets/main/journey_patterns.css.scss b/app/assets/stylesheets/main/journey_patterns.css.scss deleted file mode 100644 index 07ed52b9e..000000000 --- a/app/assets/stylesheets/main/journey_patterns.css.scss +++ /dev/null @@ -1,55 +0,0 @@ -// Place all the styles related to the routes controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ - -#workspace.journey_patterns.edit, #workspace.journey_patterns.new, #workspace.journey_patterns.create, #workspace.journey_patterns.update -{ - #route_color{ width: 100px; - color: white; - font-weight: bold;} - #journey_pattern_stop_point_ids_input fieldset .choices-group { - margin-top: 25px; - } -} - -#workspace.journey_patterns.show -{ - .journey_pattern_color{ color: white; - font-weight: bold; - padding: 0 5px 0 5px;} - - .summary p label { - font-weight: bold; - } - - .stop_points_detail div.page_info { - margin-top: 0px; - } - - .stop_points { - margin-top: 20px; - } - - .journey_pattern_stop_points { - clear: both; - margin: 0px; - padding: 0px; - } - - .stop_point { - - .position { - width: 25px; - height: 20px; - float: left; - background-color: #61970B; - font-weight: bold; - color: white; - margin-right: 10px; - padding-left: 4px; - } - } - -} - - diff --git a/app/assets/stylesheets/main/journey_patterns.scss b/app/assets/stylesheets/main/journey_patterns.scss new file mode 100644 index 000000000..07ed52b9e --- /dev/null +++ b/app/assets/stylesheets/main/journey_patterns.scss @@ -0,0 +1,55 @@ +// Place all the styles related to the routes controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ + +#workspace.journey_patterns.edit, #workspace.journey_patterns.new, #workspace.journey_patterns.create, #workspace.journey_patterns.update +{ + #route_color{ width: 100px; + color: white; + font-weight: bold;} + #journey_pattern_stop_point_ids_input fieldset .choices-group { + margin-top: 25px; + } +} + +#workspace.journey_patterns.show +{ + .journey_pattern_color{ color: white; + font-weight: bold; + padding: 0 5px 0 5px;} + + .summary p label { + font-weight: bold; + } + + .stop_points_detail div.page_info { + margin-top: 0px; + } + + .stop_points { + margin-top: 20px; + } + + .journey_pattern_stop_points { + clear: both; + margin: 0px; + padding: 0px; + } + + .stop_point { + + .position { + width: 25px; + height: 20px; + float: left; + background-color: #61970B; + font-weight: bold; + color: white; + margin-right: 10px; + padding-left: 4px; + } + } + +} + + diff --git a/app/assets/stylesheets/main/layout.css.scss b/app/assets/stylesheets/main/layout.css.scss deleted file mode 100644 index aac5846c5..000000000 --- a/app/assets/stylesheets/main/layout.css.scss +++ /dev/null @@ -1,145 +0,0 @@ -body { - padding-top: 50px; -} - -h1{ color: white;} - -h1, .h1, h2, .h2, h3, .h3 { - margin-bottom: 20px; -} - -label.label{ - color: black; - font-size: 100%; -} - -ol.breadcrumb{ - margin-top: 10px; -} - -.ce-hide { - display: none; -} - -#middle{ - min-height: 500px; - -webkit-box-shadow: 0 0 5px 2px rgba(0, 0, 0, .2); - box-shadow: 0 0 5px 2px rgba(0, 0, 0, .2); - padding-top: 10px; - padding-bottom: 10px; - margin-top: 20px; - margin-bottom: 20px; - background: white; - - .main_actions{ - text-align: right; - } - - .alert{ margin-top: 15px ; } - - #sidebar{ - height: 100%; - padding-top: 20px; - border-left: 1px solid $gray-lighter; - - label { - color: #555555; - font-weight: normal; - font-size: 12px; - } - - a { - color: #666; - } - - .actions { - margin-bottom: 20px; - - li{ - margin-bottom: 5px; - } - } - - p { - font-size: 12px; - } - - fieldset.history_tag{ - - legend{ - font-size: 14px; - margin-bottom: 10px; - } - - font-size: 12px; - color: $gray-light; - } - - fieldset - { - border-color: white; - - p{ - margin-top: 5px; - label{ font-size: 12px;} - span{ - font-style: oblique; - font-size:12px; - } - } - } - - ol { - padding: 0px; - - li { - list-style: none; - } - } - - ul { - padding: 0px; - - li { - list-style: none; - } - } - - ul.selection li { - a { - padding-left: 20px; - } - a.current { - text-decoration: none; - color: black !important; - background: url(image-path('icons/accept.png')) no-repeat; - } - a.all { - background-image: none; - } - } - - div#compact_form { - form { - border-bottom: 1px solid #BBB; - fieldset { - padding: 0; - border: 0; - li { - padding: 0; - label { padding-left: 20px; - width: 70%;} - input { width: 20px; } - } - } - fieldset.actions { - margin-bottom: 0; - padding-left: 20px; - } - fieldset.inputs { - padding-top: 16px; - } - } - } - } -} diff --git a/app/assets/stylesheets/main/layout.scss b/app/assets/stylesheets/main/layout.scss new file mode 100644 index 000000000..aac5846c5 --- /dev/null +++ b/app/assets/stylesheets/main/layout.scss @@ -0,0 +1,145 @@ +body { + padding-top: 50px; +} + +h1{ color: white;} + +h1, .h1, h2, .h2, h3, .h3 { + margin-bottom: 20px; +} + +label.label{ + color: black; + font-size: 100%; +} + +ol.breadcrumb{ + margin-top: 10px; +} + +.ce-hide { + display: none; +} + +#middle{ + min-height: 500px; + -webkit-box-shadow: 0 0 5px 2px rgba(0, 0, 0, .2); + box-shadow: 0 0 5px 2px rgba(0, 0, 0, .2); + padding-top: 10px; + padding-bottom: 10px; + margin-top: 20px; + margin-bottom: 20px; + background: white; + + .main_actions{ + text-align: right; + } + + .alert{ margin-top: 15px ; } + + #sidebar{ + height: 100%; + padding-top: 20px; + border-left: 1px solid $gray-lighter; + + label { + color: #555555; + font-weight: normal; + font-size: 12px; + } + + a { + color: #666; + } + + .actions { + margin-bottom: 20px; + + li{ + margin-bottom: 5px; + } + } + + p { + font-size: 12px; + } + + fieldset.history_tag{ + + legend{ + font-size: 14px; + margin-bottom: 10px; + } + + font-size: 12px; + color: $gray-light; + } + + fieldset + { + border-color: white; + + p{ + margin-top: 5px; + label{ font-size: 12px;} + span{ + font-style: oblique; + font-size:12px; + } + } + } + + ol { + padding: 0px; + + li { + list-style: none; + } + } + + ul { + padding: 0px; + + li { + list-style: none; + } + } + + ul.selection li { + a { + padding-left: 20px; + } + a.current { + text-decoration: none; + color: black !important; + background: url(image-path('icons/accept.png')) no-repeat; + } + a.all { + background-image: none; + } + } + + div#compact_form { + form { + border-bottom: 1px solid #BBB; + fieldset { + padding: 0; + border: 0; + li { + padding: 0; + label { padding-left: 20px; + width: 70%;} + input { width: 20px; } + } + } + fieldset.actions { + margin-bottom: 0; + padding-left: 20px; + } + fieldset.inputs { + padding-top: 16px; + } + } + } + } +} diff --git a/app/assets/stylesheets/main/lines.css.scss b/app/assets/stylesheets/main/lines.css.scss deleted file mode 100644 index e114a2338..000000000 --- a/app/assets/stylesheets/main/lines.css.scss +++ /dev/null @@ -1,107 +0,0 @@ -// Place all the styles related to the lines controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ - -#workspace.lines.index -{ - input[type="checkbox"].multiple_selection{ - vertical-align: middle; - } - - #search { - - label{ - margin-bottom: 0px; - } - - input[type="checkbox"]{ - margin-left: 3px; - } - - } -} - -#workspace.lines.edit, #workspace.lines.new, #workspace.lines.create, #workspace.lines.update -{ - #line_color_old{ width: 100px; - color: white; - font-weight: bold;} - - .nested-fields.footnote, .add_footnote{ - @extend .col-md-offset-3; - } - - .footnotes_block{ - margin-bottom: 30px; - } -} - -#workspace.lines.show -{ - .summary p - { - label { - font-weight: bold; - } - .color - { - padding: 3px 15px 3px 15px; - } - } - - .group_of_line { - - .position { - width: 25px; - height: 20px; - float: left; - background-color: #61970B; - font-weight: bold; - color: white; - margin-right: 10px; - padding-left: 4px; - } - .color { - background-color: white; - width: 64px; - height: 64px; - float: left; - margin-right: 10px; - border: 1px solid #999; - - a { - text-decoration: none; - } - } - - .name a { - display: inline; - } - } -} - -.ce-LineBlock-header-list { - display: table; - width: 100%; - margin: 0; - padding: 0; - > li { - display: table-cell; - vertical-align: middle; - > input { - margin-top: 0; - } - &:first-child { - width: 37px; - } - &:last-child { - text-align: right; - width: 73px; - } - } -} -.ce-LineBlock-header-title { - padding: 0 !important; - line-height: 12px; - font-size: 13px; -} diff --git a/app/assets/stylesheets/main/lines.scss b/app/assets/stylesheets/main/lines.scss new file mode 100644 index 000000000..e114a2338 --- /dev/null +++ b/app/assets/stylesheets/main/lines.scss @@ -0,0 +1,107 @@ +// Place all the styles related to the lines controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ + +#workspace.lines.index +{ + input[type="checkbox"].multiple_selection{ + vertical-align: middle; + } + + #search { + + label{ + margin-bottom: 0px; + } + + input[type="checkbox"]{ + margin-left: 3px; + } + + } +} + +#workspace.lines.edit, #workspace.lines.new, #workspace.lines.create, #workspace.lines.update +{ + #line_color_old{ width: 100px; + color: white; + font-weight: bold;} + + .nested-fields.footnote, .add_footnote{ + @extend .col-md-offset-3; + } + + .footnotes_block{ + margin-bottom: 30px; + } +} + +#workspace.lines.show +{ + .summary p + { + label { + font-weight: bold; + } + .color + { + padding: 3px 15px 3px 15px; + } + } + + .group_of_line { + + .position { + width: 25px; + height: 20px; + float: left; + background-color: #61970B; + font-weight: bold; + color: white; + margin-right: 10px; + padding-left: 4px; + } + .color { + background-color: white; + width: 64px; + height: 64px; + float: left; + margin-right: 10px; + border: 1px solid #999; + + a { + text-decoration: none; + } + } + + .name a { + display: inline; + } + } +} + +.ce-LineBlock-header-list { + display: table; + width: 100%; + margin: 0; + padding: 0; + > li { + display: table-cell; + vertical-align: middle; + > input { + margin-top: 0; + } + &:first-child { + width: 37px; + } + &:last-child { + text-align: right; + width: 73px; + } + } +} +.ce-LineBlock-header-title { + padding: 0 !important; + line-height: 12px; + font-size: 13px; +} diff --git a/app/assets/stylesheets/main/networks.css.scss b/app/assets/stylesheets/main/networks.css.scss deleted file mode 100644 index c8533699e..000000000 --- a/app/assets/stylesheets/main/networks.css.scss +++ /dev/null @@ -1,15 +0,0 @@ -// Place all the styles related to the lines controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ - -#workspace.networks.index -{ -} - -#workspace.networks.show -{ - .summary p label { - font-weight: bold; - } -} - diff --git a/app/assets/stylesheets/main/networks.scss b/app/assets/stylesheets/main/networks.scss new file mode 100644 index 000000000..c8533699e --- /dev/null +++ b/app/assets/stylesheets/main/networks.scss @@ -0,0 +1,15 @@ +// Place all the styles related to the lines controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ + +#workspace.networks.index +{ +} + +#workspace.networks.show +{ + .summary p label { + font-weight: bold; + } +} + diff --git a/app/assets/stylesheets/main/organisations.css.scss b/app/assets/stylesheets/main/organisations.css.scss deleted file mode 100644 index b3ef5b5f4..000000000 --- a/app/assets/stylesheets/main/organisations.css.scss +++ /dev/null @@ -1,8 +0,0 @@ -// Place all the styles related to the lines controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ - -#workspace.organisations.show -{ -} - diff --git a/app/assets/stylesheets/main/organisations.scss b/app/assets/stylesheets/main/organisations.scss new file mode 100644 index 000000000..b3ef5b5f4 --- /dev/null +++ b/app/assets/stylesheets/main/organisations.scss @@ -0,0 +1,8 @@ +// Place all the styles related to the lines controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ + +#workspace.organisations.show +{ +} + diff --git a/app/assets/stylesheets/main/referentials.css.scss b/app/assets/stylesheets/main/referentials.css.scss deleted file mode 100644 index 8b6ae4b66..000000000 --- a/app/assets/stylesheets/main/referentials.css.scss +++ /dev/null @@ -1,48 +0,0 @@ -// Place all the styles related to the referentials controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ - -#workspace.referentials.index -{ -} - -#workspace.referentials.show -{ - .summary p label { - font-weight: bold; - } - - .panel{ - font-size:12px; - width: 75%; - - .panel-heading{ font-weight: bold;} - - li.list-group-item { - padding: 5px 15px; - } - } - -} -#sidebar div#clean_up { - form { - fieldset { - li{ - margin-bottom: 0px; - } - - li.date { - - input{ - width: 125px; - font-size: 12px; - height: 25px - } - label{ - width: 35%; - } - } - } - - } -} diff --git a/app/assets/stylesheets/main/referentials.scss b/app/assets/stylesheets/main/referentials.scss new file mode 100644 index 000000000..8b6ae4b66 --- /dev/null +++ b/app/assets/stylesheets/main/referentials.scss @@ -0,0 +1,48 @@ +// Place all the styles related to the referentials controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ + +#workspace.referentials.index +{ +} + +#workspace.referentials.show +{ + .summary p label { + font-weight: bold; + } + + .panel{ + font-size:12px; + width: 75%; + + .panel-heading{ font-weight: bold;} + + li.list-group-item { + padding: 5px 15px; + } + } + +} +#sidebar div#clean_up { + form { + fieldset { + li{ + margin-bottom: 0px; + } + + li.date { + + input{ + width: 125px; + font-size: 12px; + height: 25px + } + label{ + width: 35%; + } + } + } + + } +} diff --git a/app/assets/stylesheets/main/routes.css.scss b/app/assets/stylesheets/main/routes.css.scss deleted file mode 100644 index 7714c13a3..000000000 --- a/app/assets/stylesheets/main/routes.css.scss +++ /dev/null @@ -1,48 +0,0 @@ -// Place all the styles related to the routes controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ - -#workspace.lines.show -{ -} - -#workspace.routes.edit, #workspace.routes.new, #workspace.routes.create, #workspace.routes.update -{ - #route_color{ width: 100px; - color: white; - font-weight: bold;} - - #stop_points .nested-fields { - ol { - margin-left: 25%; - .handle { margin-left: 5px;} - - .search_stop_area { - margin-bottom: 0px !important; - } - - div.resize{ - height: 40px; - line-height: 40px; - font-size: 16px; - } - } - } - - #stop_points .links { - margin: 10px 0 15px 25%; - } -} - -#workspace.routes.edit_boarding_alighting{ - - .stop_area{ - padding-top: 7px; - } - -} - -#workspace.routes.show -{ -} - diff --git a/app/assets/stylesheets/main/routes.scss b/app/assets/stylesheets/main/routes.scss new file mode 100644 index 000000000..7714c13a3 --- /dev/null +++ b/app/assets/stylesheets/main/routes.scss @@ -0,0 +1,48 @@ +// Place all the styles related to the routes controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ + +#workspace.lines.show +{ +} + +#workspace.routes.edit, #workspace.routes.new, #workspace.routes.create, #workspace.routes.update +{ + #route_color{ width: 100px; + color: white; + font-weight: bold;} + + #stop_points .nested-fields { + ol { + margin-left: 25%; + .handle { margin-left: 5px;} + + .search_stop_area { + margin-bottom: 0px !important; + } + + div.resize{ + height: 40px; + line-height: 40px; + font-size: 16px; + } + } + } + + #stop_points .links { + margin: 10px 0 15px 25%; + } +} + +#workspace.routes.edit_boarding_alighting{ + + .stop_area{ + padding-top: 7px; + } + +} + +#workspace.routes.show +{ +} + diff --git a/app/assets/stylesheets/main/rule_parameter_sets.css.scss b/app/assets/stylesheets/main/rule_parameter_sets.css.scss deleted file mode 100644 index 7df394190..000000000 --- a/app/assets/stylesheets/main/rule_parameter_sets.css.scss +++ /dev/null @@ -1,51 +0,0 @@ -// Place all the styles related to the rule_parameter_sets controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ - -#workspace.rule_parameter_sets.index -{ -} - -#workspace.rule_parameter_sets.show, #workspace.compliance_check_tasks.rule_parameter_set -{ - .summary label { - font-weight: bold; - } - - div.attributes_group { - margin: 15px 0 15px 0; - - .title { font-weight: bold; } - - .columns{ - margin-left: 10px; - - div { - display: inline-block; - - &.two_columns { width: 45%; } - &.three_columns { width: 30%; } - &.four_columns { width: 23%; } - - label { - color: #616161; - } - - .value { margin-left: 5px; } - } - } - } - - div.rule_parameter_by_mode { - margin: 20px 0 0 0 !important; - - .mode_specific { - display: none; - margin: 0 0 0 10px; - - p label { color: #616161; } - } - } -} - - diff --git a/app/assets/stylesheets/main/rule_parameter_sets.scss b/app/assets/stylesheets/main/rule_parameter_sets.scss new file mode 100644 index 000000000..7df394190 --- /dev/null +++ b/app/assets/stylesheets/main/rule_parameter_sets.scss @@ -0,0 +1,51 @@ +// Place all the styles related to the rule_parameter_sets controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ + +#workspace.rule_parameter_sets.index +{ +} + +#workspace.rule_parameter_sets.show, #workspace.compliance_check_tasks.rule_parameter_set +{ + .summary label { + font-weight: bold; + } + + div.attributes_group { + margin: 15px 0 15px 0; + + .title { font-weight: bold; } + + .columns{ + margin-left: 10px; + + div { + display: inline-block; + + &.two_columns { width: 45%; } + &.three_columns { width: 30%; } + &.four_columns { width: 23%; } + + label { + color: #616161; + } + + .value { margin-left: 5px; } + } + } + } + + div.rule_parameter_by_mode { + margin: 20px 0 0 0 !important; + + .mode_specific { + display: none; + margin: 0 0 0 10px; + + p label { color: #616161; } + } + } +} + + diff --git a/app/assets/stylesheets/main/simple_form.css.scss b/app/assets/stylesheets/main/simple_form.css.scss deleted file mode 100644 index 9282d89e0..000000000 --- a/app/assets/stylesheets/main/simple_form.css.scss +++ /dev/null @@ -1,7 +0,0 @@ -#workspace{ - - .submit{ - @extend .col-md-offset-3; - } - -} \ No newline at end of file diff --git a/app/assets/stylesheets/main/simple_form.scss b/app/assets/stylesheets/main/simple_form.scss new file mode 100644 index 000000000..9282d89e0 --- /dev/null +++ b/app/assets/stylesheets/main/simple_form.scss @@ -0,0 +1,7 @@ +#workspace{ + + .submit{ + @extend .col-md-offset-3; + } + +} \ No newline at end of file diff --git a/app/assets/stylesheets/main/stop_areas.css.scss b/app/assets/stylesheets/main/stop_areas.css.scss deleted file mode 100644 index 59c243c26..000000000 --- a/app/assets/stylesheets/main/stop_areas.css.scss +++ /dev/null @@ -1,172 +0,0 @@ -// Place all the styles related to the lines controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ - -#workspace.stop_areas.index -{ - #country_codes { display: none; } -} - -#workspace.stop_areas.edit, #workspace.stop_areas.new, #workspace.stop_areas.update, #workspace.stop_areas.create { - legend { padding-bottom: 20px; } - - #prefetch { - padding: 10px 10px 20px 10px; - - label{ - font-size: 16px; - margin-right: 25px; - } - - input{ width: 330px; } - } - - #map{ - float:none; - width: 100%; - height: 450px; - } -} - -#workspace.stop_areas.show -{ - .geo_data { - padding-left:15px; - } - - .summary{ - - p label { - font-weight: bold; - } - } - - .genealogical{ - - .parent{ - border: 2px solid black; - float: left; - padding: 3px 15px 3px 3px; - * { vertical-align:middle; } - span { margin-left: 7px; } - img { margin: 0px 5px 0px 5px;} - } - .lines{ - float: left; - - .line{ - border: 2px solid black; - padding: 3px 15px 3px 3px; - height: 25px; - margin-bottom: 5px; - * { vertical-align:middle; } - span { margin-left: 7px; } - img { margin: 0px 5px 0px 5px;} - } - } - .no_parent{ - float: left; - padding: 3px 15px 3px 3px; - width: 150px; - } - - .target{ - border: 2px solid #86b41d; - float: left; - padding: 3px 15px 3px 3px; - font-weight: bold; - * { vertical-align:middle; } - span { margin-left: 7px; } - img { margin: 0px 5px 0px 5px;} - } - - .children{ - float: left; - - .child{ - border: 2px solid black; - padding: 3px 15px 3px 3px; - margin-bottom: 5px; - * { vertical-align:middle; } - span { margin-left: 7px; } - img { margin: 0px 5px 0px 5px;} - } - } - - .link{ - float: left; - padding: 7px; - margin-right: 10px; - margin-left: 10px; - height: 25px; - } - } - -} - -#workspace.stop_areas.select_parent -{ - .token-input-list{ - display: inline-block; - } -} - - -#workspace.stop_areas.add_children -{ - .token-input-list{ - display: inline-block; - } -} - - -#workspace.stop_areas.access_links -{ - .access_link_pairs { - .link { - border: 2px solid black; - } - .access_point{ - float: left; - padding: 3px 15px 0px 3px; - height: 25px; - * { vertical-align:middle; } - span { margin-left: 7px; } - img { margin: 0px 5px 0px 5px;} - } - .stop_area{ - float: left; - padding: 3px 15px 0px 3px; - height: 25px; - * { vertical-align:middle; } - span { margin-left: 7px; } - img { margin: 0px 5px 0px 5px;} - } - - .info { - font-size: 10px; - color: #777; - font-weight: normal; - padding-top: 0px; - padding-left: 45px; - padding-right: 3px; - padding-bottom: 3px; - } - - } - -} - -#sidebar ul.selection li { - a { - line-height: 27px; - - img{ - height: 25px; - width: 25px; - vertical-align: middle; - } - } -} - - diff --git a/app/assets/stylesheets/main/stop_areas.scss b/app/assets/stylesheets/main/stop_areas.scss new file mode 100644 index 000000000..59c243c26 --- /dev/null +++ b/app/assets/stylesheets/main/stop_areas.scss @@ -0,0 +1,172 @@ +// Place all the styles related to the lines controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ + +#workspace.stop_areas.index +{ + #country_codes { display: none; } +} + +#workspace.stop_areas.edit, #workspace.stop_areas.new, #workspace.stop_areas.update, #workspace.stop_areas.create { + legend { padding-bottom: 20px; } + + #prefetch { + padding: 10px 10px 20px 10px; + + label{ + font-size: 16px; + margin-right: 25px; + } + + input{ width: 330px; } + } + + #map{ + float:none; + width: 100%; + height: 450px; + } +} + +#workspace.stop_areas.show +{ + .geo_data { + padding-left:15px; + } + + .summary{ + + p label { + font-weight: bold; + } + } + + .genealogical{ + + .parent{ + border: 2px solid black; + float: left; + padding: 3px 15px 3px 3px; + * { vertical-align:middle; } + span { margin-left: 7px; } + img { margin: 0px 5px 0px 5px;} + } + .lines{ + float: left; + + .line{ + border: 2px solid black; + padding: 3px 15px 3px 3px; + height: 25px; + margin-bottom: 5px; + * { vertical-align:middle; } + span { margin-left: 7px; } + img { margin: 0px 5px 0px 5px;} + } + } + .no_parent{ + float: left; + padding: 3px 15px 3px 3px; + width: 150px; + } + + .target{ + border: 2px solid #86b41d; + float: left; + padding: 3px 15px 3px 3px; + font-weight: bold; + * { vertical-align:middle; } + span { margin-left: 7px; } + img { margin: 0px 5px 0px 5px;} + } + + .children{ + float: left; + + .child{ + border: 2px solid black; + padding: 3px 15px 3px 3px; + margin-bottom: 5px; + * { vertical-align:middle; } + span { margin-left: 7px; } + img { margin: 0px 5px 0px 5px;} + } + } + + .link{ + float: left; + padding: 7px; + margin-right: 10px; + margin-left: 10px; + height: 25px; + } + } + +} + +#workspace.stop_areas.select_parent +{ + .token-input-list{ + display: inline-block; + } +} + + +#workspace.stop_areas.add_children +{ + .token-input-list{ + display: inline-block; + } +} + + +#workspace.stop_areas.access_links +{ + .access_link_pairs { + .link { + border: 2px solid black; + } + .access_point{ + float: left; + padding: 3px 15px 0px 3px; + height: 25px; + * { vertical-align:middle; } + span { margin-left: 7px; } + img { margin: 0px 5px 0px 5px;} + } + .stop_area{ + float: left; + padding: 3px 15px 0px 3px; + height: 25px; + * { vertical-align:middle; } + span { margin-left: 7px; } + img { margin: 0px 5px 0px 5px;} + } + + .info { + font-size: 10px; + color: #777; + font-weight: normal; + padding-top: 0px; + padding-left: 45px; + padding-right: 3px; + padding-bottom: 3px; + } + + } + +} + +#sidebar ul.selection li { + a { + line-height: 27px; + + img{ + height: 25px; + width: 25px; + vertical-align: middle; + } + } +} + + diff --git a/app/assets/stylesheets/main/stop_points.css.scss b/app/assets/stylesheets/main/stop_points.css.scss deleted file mode 100644 index b1ba9ff50..000000000 --- a/app/assets/stylesheets/main/stop_points.css.scss +++ /dev/null @@ -1,35 +0,0 @@ -// Place all the styles related to the lines controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ - -#workspace.stop_points.index -{ - .stop_points { - } - - #sortable_stop_points .stop_point { - /* to create multi-column index */ - width: 350px; - padding-right: 10px; - - .handle { - cursor: move; - margin-right: 7px; - margin-bottom: 20px; - } - - a.link { - background: url(image-path('icons/link-small.png')) no-repeat 0% 50%; - } - - .position { - background-color: #61970B; - font-weight: bold; - color: white; - margin-right: 10px; - padding-left: 4px; - } - - } -} - diff --git a/app/assets/stylesheets/main/stop_points.scss b/app/assets/stylesheets/main/stop_points.scss new file mode 100644 index 000000000..b1ba9ff50 --- /dev/null +++ b/app/assets/stylesheets/main/stop_points.scss @@ -0,0 +1,35 @@ +// Place all the styles related to the lines controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ + +#workspace.stop_points.index +{ + .stop_points { + } + + #sortable_stop_points .stop_point { + /* to create multi-column index */ + width: 350px; + padding-right: 10px; + + .handle { + cursor: move; + margin-right: 7px; + margin-bottom: 20px; + } + + a.link { + background: url(image-path('icons/link-small.png')) no-repeat 0% 50%; + } + + .position { + background-color: #61970B; + font-weight: bold; + color: white; + margin-right: 10px; + padding-left: 4px; + } + + } +} + diff --git a/app/assets/stylesheets/main/subscriptions.css.scss b/app/assets/stylesheets/main/subscriptions.css.scss deleted file mode 100644 index 58a272cbd..000000000 --- a/app/assets/stylesheets/main/subscriptions.css.scss +++ /dev/null @@ -1,8 +0,0 @@ -// Place all the styles related to the lines controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ - -#workspace.subscriptions.create, #workspace.subscriptions.new -{ -} - diff --git a/app/assets/stylesheets/main/subscriptions.scss b/app/assets/stylesheets/main/subscriptions.scss new file mode 100644 index 000000000..58a272cbd --- /dev/null +++ b/app/assets/stylesheets/main/subscriptions.scss @@ -0,0 +1,8 @@ +// Place all the styles related to the lines controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ + +#workspace.subscriptions.create, #workspace.subscriptions.new +{ +} + diff --git a/app/assets/stylesheets/main/time_table_combinations.css.scss b/app/assets/stylesheets/main/time_table_combinations.css.scss deleted file mode 100644 index 70dc2e535..000000000 --- a/app/assets/stylesheets/main/time_table_combinations.css.scss +++ /dev/null @@ -1,14 +0,0 @@ -#modal_combine{ - .time_table_combination{ - - .radio input[type="radio"]{ - position: inherit !important; - } - - .inputs{ - - overflow: visible !important; - } - - } -} \ No newline at end of file diff --git a/app/assets/stylesheets/main/time_table_combinations.scss b/app/assets/stylesheets/main/time_table_combinations.scss new file mode 100644 index 000000000..70dc2e535 --- /dev/null +++ b/app/assets/stylesheets/main/time_table_combinations.scss @@ -0,0 +1,14 @@ +#modal_combine{ + .time_table_combination{ + + .radio input[type="radio"]{ + position: inherit !important; + } + + .inputs{ + + overflow: visible !important; + } + + } +} \ No newline at end of file diff --git a/app/assets/stylesheets/main/time_tables.css.scss b/app/assets/stylesheets/main/time_tables.css.scss deleted file mode 100644 index bc1f48810..000000000 --- a/app/assets/stylesheets/main/time_tables.css.scss +++ /dev/null @@ -1,160 +0,0 @@ -// Place all the styles related to the lines controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ - -#workspace.time_tables.index -{ -} - - -#workspace.time_tables.show -{ - .modal-body{overflow-y: visible;} - - .summary{ - margin-top: 20px; - - p label { - font-weight: bold; - } - } - - .legend{ - margin-top: 20px; - - .title{ font-weight: bold; } - - .excluded_date, .overlaped_date, .selected_date, .selected_period{ - margin-left: 20px; - margin-right: 5px; - } - } - - .typeahead.dropdown-menu { - z-index: 100001; - } - - .validity_out { - color: $brand-danger; - } - - .validity_out_soon { - color: $brand-warning; - } - - .validity_regular { - color: $brand-success; - } - - span.included_day_type { - font-weight: bolder; - margin-right: 3px; - } - - span.excluded_day_type { - margin-right: 3px; - } - - .period { - padding-left:50px; - padding-right:450px; - } - - .date { - padding-left:50px; - } - - .odd { - padding-left:50px; - padding-right:450px; - } - - .even { - padding-left:50px; - padding-right:450px; - } - - .actions { - float: right; - } -} - -#workspace.time_tables.edit,#workspace.time_tables.new,#workspace.time_tables.create,#workspace.time_tables.update,#workspace.time_tables.duplicate -{ - fieldset.inputs{ - overflow: visible !important; - - .tags{ - overflow: visible !important; - } - } - - h3 { - .dates { - cursor: pointer; - } - .periods { - cursor: pointer; - } - .excluded_dates { - cursor: pointer; - } - } - - #dates,#excluded_dates,#periods{ - .nested-fields { - margin: 5px; - - ol { - li { - display: inline; - } - } - } - - margin-left: 25%; - } - - .day_type ol { - float: left; - margin: 0; - padding: 0 0 0 0; - width: 100%; - list_style: none outside none; - margin-top: 1em; - margin-bottom: 1em; - } - .day_type ol li { - float: left; - margin: 0 O 0 0; - width: auto; - padding: 0; - } - .day_type_label { - float: left; - margin-top: 0; - width: 25%; - } - .day_type ol li label { - padding-left: 10%; - margin-top: 0; - } - - a.add_fields { - margin-left: 25%; - margin-top: 20px; - padding-left: 18px; - background: url(image-path('icons/add.png')) no-repeat 0% 50%; - } - - a.remove_fields { - margin-left: 10px; - padding-left: 18px; - background: url(image-path('icons/remove.png')) no-repeat 0% 50%; - } - - .actions{ - margin-top: 20px; - } - -} diff --git a/app/assets/stylesheets/main/time_tables.scss b/app/assets/stylesheets/main/time_tables.scss new file mode 100644 index 000000000..bc1f48810 --- /dev/null +++ b/app/assets/stylesheets/main/time_tables.scss @@ -0,0 +1,160 @@ +// Place all the styles related to the lines controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ + +#workspace.time_tables.index +{ +} + + +#workspace.time_tables.show +{ + .modal-body{overflow-y: visible;} + + .summary{ + margin-top: 20px; + + p label { + font-weight: bold; + } + } + + .legend{ + margin-top: 20px; + + .title{ font-weight: bold; } + + .excluded_date, .overlaped_date, .selected_date, .selected_period{ + margin-left: 20px; + margin-right: 5px; + } + } + + .typeahead.dropdown-menu { + z-index: 100001; + } + + .validity_out { + color: $brand-danger; + } + + .validity_out_soon { + color: $brand-warning; + } + + .validity_regular { + color: $brand-success; + } + + span.included_day_type { + font-weight: bolder; + margin-right: 3px; + } + + span.excluded_day_type { + margin-right: 3px; + } + + .period { + padding-left:50px; + padding-right:450px; + } + + .date { + padding-left:50px; + } + + .odd { + padding-left:50px; + padding-right:450px; + } + + .even { + padding-left:50px; + padding-right:450px; + } + + .actions { + float: right; + } +} + +#workspace.time_tables.edit,#workspace.time_tables.new,#workspace.time_tables.create,#workspace.time_tables.update,#workspace.time_tables.duplicate +{ + fieldset.inputs{ + overflow: visible !important; + + .tags{ + overflow: visible !important; + } + } + + h3 { + .dates { + cursor: pointer; + } + .periods { + cursor: pointer; + } + .excluded_dates { + cursor: pointer; + } + } + + #dates,#excluded_dates,#periods{ + .nested-fields { + margin: 5px; + + ol { + li { + display: inline; + } + } + } + + margin-left: 25%; + } + + .day_type ol { + float: left; + margin: 0; + padding: 0 0 0 0; + width: 100%; + list_style: none outside none; + margin-top: 1em; + margin-bottom: 1em; + } + .day_type ol li { + float: left; + margin: 0 O 0 0; + width: auto; + padding: 0; + } + .day_type_label { + float: left; + margin-top: 0; + width: 25%; + } + .day_type ol li label { + padding-left: 10%; + margin-top: 0; + } + + a.add_fields { + margin-left: 25%; + margin-top: 20px; + padding-left: 18px; + background: url(image-path('icons/add.png')) no-repeat 0% 50%; + } + + a.remove_fields { + margin-left: 10px; + padding-left: 18px; + background: url(image-path('icons/remove.png')) no-repeat 0% 50%; + } + + .actions{ + margin-top: 20px; + } + +} diff --git a/app/assets/stylesheets/main/timebands.css.scss b/app/assets/stylesheets/main/timebands.css.scss deleted file mode 100644 index e69de29bb..000000000 diff --git a/app/assets/stylesheets/main/timebands.scss b/app/assets/stylesheets/main/timebands.scss new file mode 100644 index 000000000..e69de29bb diff --git a/app/assets/stylesheets/main/users.css.scss b/app/assets/stylesheets/main/users.css.scss deleted file mode 100644 index daaae0132..000000000 --- a/app/assets/stylesheets/main/users.css.scss +++ /dev/null @@ -1,7 +0,0 @@ -// Place all the styles related to the lines controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ - -#workspace.users.edit, #workspace.lines.new -{ -} diff --git a/app/assets/stylesheets/main/users.scss b/app/assets/stylesheets/main/users.scss new file mode 100644 index 000000000..daaae0132 --- /dev/null +++ b/app/assets/stylesheets/main/users.scss @@ -0,0 +1,7 @@ +// Place all the styles related to the lines controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ + +#workspace.users.edit, #workspace.lines.new +{ +} diff --git a/app/assets/stylesheets/main/vehicle_journey_imports.css.scss b/app/assets/stylesheets/main/vehicle_journey_imports.css.scss deleted file mode 100644 index 529182443..000000000 --- a/app/assets/stylesheets/main/vehicle_journey_imports.css.scss +++ /dev/null @@ -1,4 +0,0 @@ -#workspace.vehicle_journey_imports.new -{ - -} \ No newline at end of file diff --git a/app/assets/stylesheets/main/vehicle_journey_imports.scss b/app/assets/stylesheets/main/vehicle_journey_imports.scss new file mode 100644 index 000000000..529182443 --- /dev/null +++ b/app/assets/stylesheets/main/vehicle_journey_imports.scss @@ -0,0 +1,4 @@ +#workspace.vehicle_journey_imports.new +{ + +} \ No newline at end of file diff --git a/app/assets/stylesheets/main/vehicle_journeys.css.scss b/app/assets/stylesheets/main/vehicle_journeys.css.scss deleted file mode 100644 index 6f67bc4b4..000000000 --- a/app/assets/stylesheets/main/vehicle_journeys.css.scss +++ /dev/null @@ -1,153 +0,0 @@ -#workspace.vehicle_journeys.edit, -#workspace.vehicle_journeys.update, -#workspace.vehicle_journeys.create, -#workspace.vehicle_journeys.new, -#workspace.vehicle_journey_frequencies.edit, -#workspace.vehicle_journey_frequencies.update, -#workspace.vehicle_journey_frequencies.create, -#workspace.vehicle_journey_frequencies.new { - #route_color{ - width: 100px; - color: white; - font-weight: bold; - } - - .btn { - padding: 6px 12px; - } - - .time_table_list { padding-left: 25%; } - - #vehicle_journey_footnote_ids_input, - #vehicle_journey_frequency_footnote_ids_input { - min-height: 3em; - } - - .vehicle_journey_at_stops, - .vehicle_journey_frequency_at_stops { - margin-left: 25%; - - thead, tbody, tfoot{ - - th, td{ - text-align: center; - } - } - - .journey_pattern_dependent_list { - tr.no_stop { display: none; } - - td.departure_time, td.arrival_time{ - &.missing{ - background-color: $brand-warning; - } - - &.invalid_position{ - background-color: $brand-danger; - } - } - } - - .title{ - font-weight: bold; - margin-bottom: 20px; - } - - span{ - margin-left: 10px; - margin-right: 10px; - } - - .slide{ - margin-left: 30px; - - } - } -} - -#workspace.vehicle_journeys.index, -#workspace.vehicle_journey_frequencies.index -{ - #search{ - - ul.token-input-list{ - display: inline-block; - vertical-align: middle; - margin-left: 15px; - } - - .advanced_search{ margin-left: 40px; } - - .time_tables_id_eq{ margin-left: 20px; } - - .vehicle_journey_at_stops_departure_time_gt{ margin-left: 20px; } - - } - - table{ - - margin: 20px 0 0 0; - - .calendars{ - font-size: 12px; - } - - .stop_area{ width: 200px; } - - td.hours{ - text-align: center; - } - - tr th.vehicle_journey{ - text-align: center; - } - } - -} - -#workspace.vehicle_journeys.show, -#workspace.vehicle_journeys.edit, -#workspace.vehicle_journeys.update, -#workspace.vehicle_journeys.create, -#workspace.vehicle_journeys.new, -#workspace.vehicle_journey_journey.show, -#workspace.vehicle_journey_journey.edit, -#workspace.vehicle_journey_journey.update, -#workspace.vehicle_journey_journey.create, -#workspace.vehicle_journey_journey.new { - - .slide { - cursor: pointer; - } -} - -#workspace.vehicle_journeys.show, -#workspace.vehicle_journey_frequencies.show -{ - .summary p label { - font-weight: bold; - } -} - -#workspace.vehicle_journeys.timeless, -#workspace.vehicle_journey_frequencies.timeless -{ - .summary p label { - font-weight: bold; - } - - .vehicle_journeys, - .vehicle_journey_frequencies { - margin-top: 20px; - } - - .vehicle_journey, - .vehicle_journey_frequency { - - span.included_day_type { - font-weight: bolder; - } - span.excluded_day_type { - } - } -} diff --git a/app/assets/stylesheets/main/vehicle_journeys.scss b/app/assets/stylesheets/main/vehicle_journeys.scss new file mode 100644 index 000000000..6f67bc4b4 --- /dev/null +++ b/app/assets/stylesheets/main/vehicle_journeys.scss @@ -0,0 +1,153 @@ +#workspace.vehicle_journeys.edit, +#workspace.vehicle_journeys.update, +#workspace.vehicle_journeys.create, +#workspace.vehicle_journeys.new, +#workspace.vehicle_journey_frequencies.edit, +#workspace.vehicle_journey_frequencies.update, +#workspace.vehicle_journey_frequencies.create, +#workspace.vehicle_journey_frequencies.new { + #route_color{ + width: 100px; + color: white; + font-weight: bold; + } + + .btn { + padding: 6px 12px; + } + + .time_table_list { padding-left: 25%; } + + #vehicle_journey_footnote_ids_input, + #vehicle_journey_frequency_footnote_ids_input { + min-height: 3em; + } + + .vehicle_journey_at_stops, + .vehicle_journey_frequency_at_stops { + margin-left: 25%; + + thead, tbody, tfoot{ + + th, td{ + text-align: center; + } + } + + .journey_pattern_dependent_list { + tr.no_stop { display: none; } + + td.departure_time, td.arrival_time{ + &.missing{ + background-color: $brand-warning; + } + + &.invalid_position{ + background-color: $brand-danger; + } + } + } + + .title{ + font-weight: bold; + margin-bottom: 20px; + } + + span{ + margin-left: 10px; + margin-right: 10px; + } + + .slide{ + margin-left: 30px; + + } + } +} + +#workspace.vehicle_journeys.index, +#workspace.vehicle_journey_frequencies.index +{ + #search{ + + ul.token-input-list{ + display: inline-block; + vertical-align: middle; + margin-left: 15px; + } + + .advanced_search{ margin-left: 40px; } + + .time_tables_id_eq{ margin-left: 20px; } + + .vehicle_journey_at_stops_departure_time_gt{ margin-left: 20px; } + + } + + table{ + + margin: 20px 0 0 0; + + .calendars{ + font-size: 12px; + } + + .stop_area{ width: 200px; } + + td.hours{ + text-align: center; + } + + tr th.vehicle_journey{ + text-align: center; + } + } + +} + +#workspace.vehicle_journeys.show, +#workspace.vehicle_journeys.edit, +#workspace.vehicle_journeys.update, +#workspace.vehicle_journeys.create, +#workspace.vehicle_journeys.new, +#workspace.vehicle_journey_journey.show, +#workspace.vehicle_journey_journey.edit, +#workspace.vehicle_journey_journey.update, +#workspace.vehicle_journey_journey.create, +#workspace.vehicle_journey_journey.new { + + .slide { + cursor: pointer; + } +} + +#workspace.vehicle_journeys.show, +#workspace.vehicle_journey_frequencies.show +{ + .summary p label { + font-weight: bold; + } +} + +#workspace.vehicle_journeys.timeless, +#workspace.vehicle_journey_frequencies.timeless +{ + .summary p label { + font-weight: bold; + } + + .vehicle_journeys, + .vehicle_journey_frequencies { + margin-top: 20px; + } + + .vehicle_journey, + .vehicle_journey_frequency { + + span.included_day_type { + font-weight: bolder; + } + span.excluded_day_type { + } + } +} diff --git a/app/assets/stylesheets/main/vehicle_translation.css.scss b/app/assets/stylesheets/main/vehicle_translation.css.scss deleted file mode 100644 index f399d1a4a..000000000 --- a/app/assets/stylesheets/main/vehicle_translation.css.scss +++ /dev/null @@ -1,15 +0,0 @@ -#translate_form{ - .repeat_cloning{ - margin-top: 30px; - } - - .modal-footer{ - .actions { - padding-left: 75%; - - li { - margin: 0px 0px; - } - } - } -} diff --git a/app/assets/stylesheets/main/vehicle_translation.scss b/app/assets/stylesheets/main/vehicle_translation.scss new file mode 100644 index 000000000..f399d1a4a --- /dev/null +++ b/app/assets/stylesheets/main/vehicle_translation.scss @@ -0,0 +1,15 @@ +#translate_form{ + .repeat_cloning{ + margin-top: 30px; + } + + .modal-footer{ + .actions { + padding-left: 75%; + + li { + margin: 0px 0px; + } + } + } +} diff --git a/app/assets/stylesheets/main/welcome.css.scss b/app/assets/stylesheets/main/welcome.css.scss deleted file mode 100644 index 77ce11a74..000000000 --- a/app/assets/stylesheets/main/welcome.css.scss +++ /dev/null @@ -1,3 +0,0 @@ -// Place all the styles related to the welcome controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/main/welcome.scss b/app/assets/stylesheets/main/welcome.scss new file mode 100644 index 000000000..77ce11a74 --- /dev/null +++ b/app/assets/stylesheets/main/welcome.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the welcome controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/modules/devise.css.scss b/app/assets/stylesheets/modules/devise.css.scss deleted file mode 100644 index b99a016f5..000000000 --- a/app/assets/stylesheets/modules/devise.css.scss +++ /dev/null @@ -1,88 +0,0 @@ -#devise{ - background-color: $gray-light; - - .passwords.new{ - input{ - width: initial !important; - } - } - - .front_bg{ - background: url(image-path('welcome.jpg')) no-repeat center center; - background-size: cover; - - #devise_middle{ - min-height: 620px; - padding: 30px 20px 0px 20px; - - #registrations_new{ - - .error { - input { - border: 1px solid #d43f3a; - } - } - - span.help-block { - margin-left: 5px; - color: #d43f3a; - font-size: 15px; - } - } - - #sessions_new{ - - .btn{ - font-weight: bold; - } - - .product_summary{ - padding: 30px 60px 0 60px; - - color: white; - text-shadow: 0 0 1px rgba(0,0,0,.6); - - p{ - font-size: 21px; - } - - ul > li{ font-size: 21px; } - } - - .login{ - padding-top: 30px; - - .form-group{ - margin-bottom: 5px; - } - - .options{ - .new_password{ - padding-top: 7px; - } - - .checkbox{ - font-weight: normal; - - input[type="checkbox"]{ - margin-left: 0px !important; - position: relative; - margin: 0px 4px 0px 0px; - } - } - - .form-group{ - margin-bottom: 0px; - } - - font-size: 12px; - } - } - } - } - - #footer{ - background-color: rgba(0, 0, 0, 0.8); - } - } -} diff --git a/app/assets/stylesheets/modules/devise.scss b/app/assets/stylesheets/modules/devise.scss new file mode 100644 index 000000000..b99a016f5 --- /dev/null +++ b/app/assets/stylesheets/modules/devise.scss @@ -0,0 +1,88 @@ +#devise{ + background-color: $gray-light; + + .passwords.new{ + input{ + width: initial !important; + } + } + + .front_bg{ + background: url(image-path('welcome.jpg')) no-repeat center center; + background-size: cover; + + #devise_middle{ + min-height: 620px; + padding: 30px 20px 0px 20px; + + #registrations_new{ + + .error { + input { + border: 1px solid #d43f3a; + } + } + + span.help-block { + margin-left: 5px; + color: #d43f3a; + font-size: 15px; + } + } + + #sessions_new{ + + .btn{ + font-weight: bold; + } + + .product_summary{ + padding: 30px 60px 0 60px; + + color: white; + text-shadow: 0 0 1px rgba(0,0,0,.6); + + p{ + font-size: 21px; + } + + ul > li{ font-size: 21px; } + } + + .login{ + padding-top: 30px; + + .form-group{ + margin-bottom: 5px; + } + + .options{ + .new_password{ + padding-top: 7px; + } + + .checkbox{ + font-weight: normal; + + input[type="checkbox"]{ + margin-left: 0px !important; + position: relative; + margin: 0px 4px 0px 0px; + } + } + + .form-group{ + margin-bottom: 0px; + } + + font-size: 12px; + } + } + } + } + + #footer{ + background-color: rgba(0, 0, 0, 0.8); + } + } +} diff --git a/app/assets/stylesheets/modules/icons.css.scss b/app/assets/stylesheets/modules/icons.css.scss deleted file mode 100644 index 001e511d1..000000000 --- a/app/assets/stylesheets/modules/icons.css.scss +++ /dev/null @@ -1,90 +0,0 @@ -a:before { - font-family: FontAwesome; - display: inline-block; - padding-right: 3px; - vertical-align: middle; -} - -a.add:before { // fa-plus-circle - content: "\f055"; - color: $brand-success; - } - -a.edit:before { // fa-pencil - content: "\f040"; - color: $brand-warning; - } - -a.remove:before { // fa-trash - content: "\f1f8"; - color: $brand-danger; - } - -a.export:before { // fa-upload - content: "\f093"; - color: $brand-info; - } - -a.import:before { // fa-download - content: "\f019"; - color: $brand-info; - } - -a.clone:before { // fa-copy - content: "\f0c5"; - color: $brand-success; - } - -a.link:before { // fa-external-link - content: "\f08e"; - } - -a.select:before {// fa-select - content: "\f0a6"; - color: $brand-warning; - - } - -a.calculator:before { // fa-calculator - content: "\f1ec"; - color: $brand-warning; - } - -a.parent:before { // fa-arrow-up - content: "\f062"; - color: $brand-warning; - } - -a.children:before { // fa-sitemap - content: "\f0e8"; - color: $brand-warning; - } - -a.access_link:before { // fa-exchange - content: "\f0ec"; - color: $brand-warning; - } - -a.merge:before { // fa-link - content: "\f0c1"; - color: $brand-warning; - } - -a.clock:before { // fa-clock-o - content: "\f017"; - } - -.fa-stack { - /* sizes whole .fa-stack down to make them the regular sized */ - font-size: .5em; - /* makes sure regular and stacked icons vertically align */ - vertical-align: -16%; -} - -/* Styles text for doc type. Oswald is a great condensed -Google Web Font */ -.filetype-text { - font-size: .7em; - font-weight: 700; - font-family: 'Oswald'; -} diff --git a/app/assets/stylesheets/modules/icons.scss b/app/assets/stylesheets/modules/icons.scss new file mode 100644 index 000000000..001e511d1 --- /dev/null +++ b/app/assets/stylesheets/modules/icons.scss @@ -0,0 +1,90 @@ +a:before { + font-family: FontAwesome; + display: inline-block; + padding-right: 3px; + vertical-align: middle; +} + +a.add:before { // fa-plus-circle + content: "\f055"; + color: $brand-success; + } + +a.edit:before { // fa-pencil + content: "\f040"; + color: $brand-warning; + } + +a.remove:before { // fa-trash + content: "\f1f8"; + color: $brand-danger; + } + +a.export:before { // fa-upload + content: "\f093"; + color: $brand-info; + } + +a.import:before { // fa-download + content: "\f019"; + color: $brand-info; + } + +a.clone:before { // fa-copy + content: "\f0c5"; + color: $brand-success; + } + +a.link:before { // fa-external-link + content: "\f08e"; + } + +a.select:before {// fa-select + content: "\f0a6"; + color: $brand-warning; + + } + +a.calculator:before { // fa-calculator + content: "\f1ec"; + color: $brand-warning; + } + +a.parent:before { // fa-arrow-up + content: "\f062"; + color: $brand-warning; + } + +a.children:before { // fa-sitemap + content: "\f0e8"; + color: $brand-warning; + } + +a.access_link:before { // fa-exchange + content: "\f0ec"; + color: $brand-warning; + } + +a.merge:before { // fa-link + content: "\f0c1"; + color: $brand-warning; + } + +a.clock:before { // fa-clock-o + content: "\f017"; + } + +.fa-stack { + /* sizes whole .fa-stack down to make them the regular sized */ + font-size: .5em; + /* makes sure regular and stacked icons vertically align */ + vertical-align: -16%; +} + +/* Styles text for doc type. Oswald is a great condensed +Google Web Font */ +.filetype-text { + font-size: .7em; + font-weight: 700; + font-family: 'Oswald'; +} diff --git a/app/assets/stylesheets/modules/index_item.css.scss b/app/assets/stylesheets/modules/index_item.css.scss deleted file mode 100644 index e281854a8..000000000 --- a/app/assets/stylesheets/modules/index_item.css.scss +++ /dev/null @@ -1,93 +0,0 @@ -#index_item{ - - - .panel-heading{ - @extend .clearfix; - - .validity_out { - color: $brand-danger; - } - - .validity_out_soon { - color: $brand-warning; - } - - .validity_regular { - color: $brand-success; - } - - button { - margin-left:3px; - } - - .date { - font-size:10px; - color: gray; - text-align: center; - } - - .label{ - margin-right: 5px; - } - - h5{ - margin: 0px; - padding-top: 4.5px; - - span.name{ - .fa{ - margin-right: 5px; - } - } - - p.format{ - color: $gray; - margin: 3px 0px 0px 0px; - - .label{ - font-size: 10px; - } - } - - @import "job_status_colors" - } - - } - - .panel-body{ - p { - margin: 0 0 3px; - font-size: 12px; - } - - img{ - margin-right: 5px; - } - - i{ - color: $gray; - margin-right: 5px; - } - - span.included_day_type { - font-weight: bolder; - margin-right: 3px; - } - - span.excluded_day_type { - margin-right: 3px; - } - - } - - .panel-footer{ - text-align: center; - - .history{ - color: $gray; - font-size: 10px; - } - } - -} - diff --git a/app/assets/stylesheets/modules/index_item.scss b/app/assets/stylesheets/modules/index_item.scss new file mode 100644 index 000000000..e281854a8 --- /dev/null +++ b/app/assets/stylesheets/modules/index_item.scss @@ -0,0 +1,93 @@ +#index_item{ + + + .panel-heading{ + @extend .clearfix; + + .validity_out { + color: $brand-danger; + } + + .validity_out_soon { + color: $brand-warning; + } + + .validity_regular { + color: $brand-success; + } + + button { + margin-left:3px; + } + + .date { + font-size:10px; + color: gray; + text-align: center; + } + + .label{ + margin-right: 5px; + } + + h5{ + margin: 0px; + padding-top: 4.5px; + + span.name{ + .fa{ + margin-right: 5px; + } + } + + p.format{ + color: $gray; + margin: 3px 0px 0px 0px; + + .label{ + font-size: 10px; + } + } + + @import "job_status_colors" + } + + } + + .panel-body{ + p { + margin: 0 0 3px; + font-size: 12px; + } + + img{ + margin-right: 5px; + } + + i{ + color: $gray; + margin-right: 5px; + } + + span.included_day_type { + font-weight: bolder; + margin-right: 3px; + } + + span.excluded_day_type { + margin-right: 3px; + } + + } + + .panel-footer{ + text-align: center; + + .history{ + color: $gray; + font-size: 10px; + } + } + +} + diff --git a/app/assets/stylesheets/modules/job_status_colors.css.scss b/app/assets/stylesheets/modules/job_status_colors.css.scss deleted file mode 100644 index 3c9086471..000000000 --- a/app/assets/stylesheets/modules/job_status_colors.css.scss +++ /dev/null @@ -1,4 +0,0 @@ -.terminated{ color: $brand-success; } -.processed{ color: $brand-info; } -.aborted{ color: $brand-danger; } - diff --git a/app/assets/stylesheets/modules/job_status_colors.scss b/app/assets/stylesheets/modules/job_status_colors.scss new file mode 100644 index 000000000..3c9086471 --- /dev/null +++ b/app/assets/stylesheets/modules/job_status_colors.scss @@ -0,0 +1,4 @@ +.terminated{ color: $brand-success; } +.processed{ color: $brand-info; } +.aborted{ color: $brand-danger; } + diff --git a/app/assets/stylesheets/modules/job_status_title.css.scss b/app/assets/stylesheets/modules/job_status_title.css.scss deleted file mode 100644 index 65ce53efe..000000000 --- a/app/assets/stylesheets/modules/job_status_title.css.scss +++ /dev/null @@ -1,9 +0,0 @@ -h2{ - i{ margin: 0 5px 0 0; } - - p.format{ - margin: 5px 0 0 0; - color: $gray; - font-size: 14px; - } -} diff --git a/app/assets/stylesheets/modules/job_status_title.scss b/app/assets/stylesheets/modules/job_status_title.scss new file mode 100644 index 000000000..65ce53efe --- /dev/null +++ b/app/assets/stylesheets/modules/job_status_title.scss @@ -0,0 +1,9 @@ +h2{ + i{ margin: 0 5px 0 0; } + + p.format{ + margin: 5px 0 0 0; + color: $gray; + font-size: 14px; + } +} diff --git a/app/assets/stylesheets/modules/links.css.scss b/app/assets/stylesheets/modules/links.css.scss deleted file mode 100644 index b97927988..000000000 --- a/app/assets/stylesheets/modules/links.css.scss +++ /dev/null @@ -1,9 +0,0 @@ -.links{ - @include clearfix(); - - margin: 0 0 20px 0; - i{ - color: $gray; - margin: 0 3px 0 15px; - } -} diff --git a/app/assets/stylesheets/modules/links.scss b/app/assets/stylesheets/modules/links.scss new file mode 100644 index 000000000..b97927988 --- /dev/null +++ b/app/assets/stylesheets/modules/links.scss @@ -0,0 +1,9 @@ +.links{ + @include clearfix(); + + margin: 0 0 20px 0; + i{ + color: $gray; + margin: 0 3px 0 15px; + } +} diff --git a/app/assets/stylesheets/modules/progress_bars.css.scss b/app/assets/stylesheets/modules/progress_bars.css.scss deleted file mode 100644 index 690a0f4ac..000000000 --- a/app/assets/stylesheets/modules/progress_bars.css.scss +++ /dev/null @@ -1,27 +0,0 @@ -.progress_bars{ - width: 50%; - - margin-bottom: 10px; - - .progress { - position: relative; - height: 25px; - - .progress-type { - position: absolute; - left: 0px; - font-weight: 800; - width: 30%; - padding: 3px 30px 2px 10px; - color: rgb(255, 255, 255); - background-color: rgba(25, 25, 25, 0.2); - } - - .progress-completed { - position: absolute; - right: 0px; - font-weight: 800; - padding: 3px 10px 2px; - } - } -} diff --git a/app/assets/stylesheets/modules/progress_bars.scss b/app/assets/stylesheets/modules/progress_bars.scss new file mode 100644 index 000000000..690a0f4ac --- /dev/null +++ b/app/assets/stylesheets/modules/progress_bars.scss @@ -0,0 +1,27 @@ +.progress_bars{ + width: 50%; + + margin-bottom: 10px; + + .progress { + position: relative; + height: 25px; + + .progress-type { + position: absolute; + left: 0px; + font-weight: 800; + width: 30%; + padding: 3px 30px 2px 10px; + color: rgb(255, 255, 255); + background-color: rgba(25, 25, 25, 0.2); + } + + .progress-completed { + position: absolute; + right: 0px; + font-weight: 800; + padding: 3px 10px 2px; + } + } +} diff --git a/app/assets/stylesheets/modules/search.css.scss b/app/assets/stylesheets/modules/search.css.scss deleted file mode 100644 index eeb35a8a5..000000000 --- a/app/assets/stylesheets/modules/search.css.scss +++ /dev/null @@ -1,19 +0,0 @@ -#search{ - - #advanced_search{ - - .form-control{ - display: inline !important; - } - - .panel-body{ - div{ - margin-bottom: 10px; - } - } - } - - // Fix for typeahead css to remove - span.twitter-typeahead { display: inline !important;} - -} \ No newline at end of file diff --git a/app/assets/stylesheets/modules/search.scss b/app/assets/stylesheets/modules/search.scss new file mode 100644 index 000000000..eeb35a8a5 --- /dev/null +++ b/app/assets/stylesheets/modules/search.scss @@ -0,0 +1,19 @@ +#search{ + + #advanced_search{ + + .form-control{ + display: inline !important; + } + + .panel-body{ + div{ + margin-bottom: 10px; + } + } + } + + // Fix for typeahead css to remove + span.twitter-typeahead { display: inline !important;} + +} \ No newline at end of file diff --git a/app/assets/stylesheets/partials/footer.css.scss b/app/assets/stylesheets/partials/footer.css.scss deleted file mode 100644 index a6b38b76d..000000000 --- a/app/assets/stylesheets/partials/footer.css.scss +++ /dev/null @@ -1,15 +0,0 @@ -#footer{ - padding: 20px; - background-color: $gray-darker; - color: $gray-light; - font-size: 12px; - min-height: 200px; - - a { color: $gray-light; } - - h4 { color: $gray-lighter; } - - .logo > img { - margin-left: 20px; - } -} \ No newline at end of file diff --git a/app/assets/stylesheets/partials/footer.scss b/app/assets/stylesheets/partials/footer.scss new file mode 100644 index 000000000..a6b38b76d --- /dev/null +++ b/app/assets/stylesheets/partials/footer.scss @@ -0,0 +1,15 @@ +#footer{ + padding: 20px; + background-color: $gray-darker; + color: $gray-light; + font-size: 12px; + min-height: 200px; + + a { color: $gray-light; } + + h4 { color: $gray-lighter; } + + .logo > img { + margin-left: 20px; + } +} \ No newline at end of file diff --git a/app/assets/stylesheets/partials/header.css.scss b/app/assets/stylesheets/partials/header.css.scss deleted file mode 100644 index 6f7b777f1..000000000 --- a/app/assets/stylesheets/partials/header.css.scss +++ /dev/null @@ -1,48 +0,0 @@ -#header { - - .navbar-brand{ - padding-top: 5px; - padding-bottom: 5px; - line-height: 40px; - - img { - height: 40px; - } - } - - .navbar-text{ - margin-top: 10px; - margin-bottom: 10px; - margin-left: 0px; - - .brand_name{ - color: white; - font-weight: bold; - font-size: 20px; - } - - .version - { - margin-left: 5px; - color: white; - font-size: 12px; - } - } - - background: $brand_primary url(image-path('header.png')) no-repeat; - - .gravatar { - margin-right: 5px; - img{ - width: 25px; - height: 25px; - } - } - - .dropdown.languages{ - .dropdown-menu{ - min-width: 56px; - } - } - -} \ No newline at end of file diff --git a/app/assets/stylesheets/partials/header.scss b/app/assets/stylesheets/partials/header.scss new file mode 100644 index 000000000..6f7b777f1 --- /dev/null +++ b/app/assets/stylesheets/partials/header.scss @@ -0,0 +1,48 @@ +#header { + + .navbar-brand{ + padding-top: 5px; + padding-bottom: 5px; + line-height: 40px; + + img { + height: 40px; + } + } + + .navbar-text{ + margin-top: 10px; + margin-bottom: 10px; + margin-left: 0px; + + .brand_name{ + color: white; + font-weight: bold; + font-size: 20px; + } + + .version + { + margin-left: 5px; + color: white; + font-size: 12px; + } + } + + background: $brand_primary url(image-path('header.png')) no-repeat; + + .gravatar { + margin-right: 5px; + img{ + width: 25px; + height: 25px; + } + } + + .dropdown.languages{ + .dropdown-menu{ + min-width: 56px; + } + } + +} \ No newline at end of file diff --git a/app/assets/stylesheets/partials/ie_report.css.scss b/app/assets/stylesheets/partials/ie_report.css.scss deleted file mode 100644 index 55286d690..000000000 --- a/app/assets/stylesheets/partials/ie_report.css.scss +++ /dev/null @@ -1,35 +0,0 @@ -.status { - margin-left: 10px; -} -.resume { - &:after{ - content: " "; - display: block; - height: 0; - clear: both; - visibility: hidden; - } - .caption { - text-align :center; - font-weight: bold; - } - dl.inline dd { - display: inline; - margin: 0; - } - dl.inline dd:after{ - display: block; - content: ''; - } - dl.inline dt{ - display: inline-block; - min-width: 180px; - } -} - -.report { - margin-top: 20px; - .form-group { - margin-right: 20px; - } -} diff --git a/app/assets/stylesheets/partials/ie_report.scss b/app/assets/stylesheets/partials/ie_report.scss new file mode 100644 index 000000000..55286d690 --- /dev/null +++ b/app/assets/stylesheets/partials/ie_report.scss @@ -0,0 +1,35 @@ +.status { + margin-left: 10px; +} +.resume { + &:after{ + content: " "; + display: block; + height: 0; + clear: both; + visibility: hidden; + } + .caption { + text-align :center; + font-weight: bold; + } + dl.inline dd { + display: inline; + margin: 0; + } + dl.inline dd:after{ + display: block; + content: ''; + } + dl.inline dt{ + display: inline-block; + min-width: 180px; + } +} + +.report { + margin-top: 20px; + .form-group { + margin-right: 20px; + } +} diff --git a/app/assets/stylesheets/vendor/bootstrap_changes.css.scss b/app/assets/stylesheets/vendor/bootstrap_changes.css.scss deleted file mode 100644 index 6e2ccc1f6..000000000 --- a/app/assets/stylesheets/vendor/bootstrap_changes.css.scss +++ /dev/null @@ -1,58 +0,0 @@ -.popover{ - - li{ - list-style: inherit !important; - } - - .time_table_info{ - color: $gray; - font-size: 11px; - } - - span.included_day_type { - color: black; - font-weight: bold; - } - span.excluded_day_type { - } - - span.bounding{ - font-size: 11px; - margin-left: 5px; - } - - .validity_out { - color: $brand-danger; - } - - .validity_out_soon { - color: $brand-warning; - } - - .validity_regular { - color: $brand-success; - } -} -.popover-title { - display: table; - width: 100%; - > a { - display: table-cell; - vertical-align: top; - &:first-child { - padding-right: 10px; - } - &:last-child { - width: 32px; - } - } -} -.popover-content { - > ul { - margin: 0; - padding: 0; - > li { - list-style: none !important; - } - } -} diff --git a/app/assets/stylesheets/vendor/bootstrap_changes.scss b/app/assets/stylesheets/vendor/bootstrap_changes.scss new file mode 100644 index 000000000..6e2ccc1f6 --- /dev/null +++ b/app/assets/stylesheets/vendor/bootstrap_changes.scss @@ -0,0 +1,58 @@ +.popover{ + + li{ + list-style: inherit !important; + } + + .time_table_info{ + color: $gray; + font-size: 11px; + } + + span.included_day_type { + color: black; + font-weight: bold; + } + span.excluded_day_type { + } + + span.bounding{ + font-size: 11px; + margin-left: 5px; + } + + .validity_out { + color: $brand-danger; + } + + .validity_out_soon { + color: $brand-warning; + } + + .validity_regular { + color: $brand-success; + } +} +.popover-title { + display: table; + width: 100%; + > a { + display: table-cell; + vertical-align: top; + &:first-child { + padding-right: 10px; + } + &:last-child { + width: 32px; + } + } +} +.popover-content { + > ul { + margin: 0; + padding: 0; + > li { + list-style: none !important; + } + } +} diff --git a/app/assets/stylesheets/vendor/formtastic_changes.css.scss b/app/assets/stylesheets/vendor/formtastic_changes.css.scss deleted file mode 100644 index 7eb6b10c5..000000000 --- a/app/assets/stylesheets/vendor/formtastic_changes.css.scss +++ /dev/null @@ -1,42 +0,0 @@ -.formtastic{ - - .label{ - white-space: normal; - text-align: right; - } - - .stringish input{ - width: auto; - } - - fieldset.inputs { - - a.action { float: right; } - } - - .choices .label, .formtastic .fragments .label { - width: 25%; - border: 0px; - - label { - position: relative; - font-size: 14px; - } - } - - .choices legend.label label{ - @extend .label; - font-size: 14px !important; - width: 100% !important; - } - - .token-input-list { - display: inline-block; - } - - /* Hack to remove!!!! */ - .inputs input[type="file"] { - display: initial; - } - /* Hack to remove!!!! */ -} \ No newline at end of file diff --git a/app/assets/stylesheets/vendor/formtastic_changes.scss b/app/assets/stylesheets/vendor/formtastic_changes.scss new file mode 100644 index 000000000..7eb6b10c5 --- /dev/null +++ b/app/assets/stylesheets/vendor/formtastic_changes.scss @@ -0,0 +1,42 @@ +.formtastic{ + + .label{ + white-space: normal; + text-align: right; + } + + .stringish input{ + width: auto; + } + + fieldset.inputs { + + a.action { float: right; } + } + + .choices .label, .formtastic .fragments .label { + width: 25%; + border: 0px; + + label { + position: relative; + font-size: 14px; + } + } + + .choices legend.label label{ + @extend .label; + font-size: 14px !important; + width: 100% !important; + } + + .token-input-list { + display: inline-block; + } + + /* Hack to remove!!!! */ + .inputs input[type="file"] { + display: initial; + } + /* Hack to remove!!!! */ +} \ No newline at end of file diff --git a/app/assets/stylesheets/vendor/map_layers.css.scss b/app/assets/stylesheets/vendor/map_layers.css.scss deleted file mode 100644 index 835417ddc..000000000 --- a/app/assets/stylesheets/vendor/map_layers.css.scss +++ /dev/null @@ -1,10 +0,0 @@ -p.after_map { - clear: both; -} - -#map { - float: right; - width: 400px; - height: 400px; - border: 1px solid gray; -} \ No newline at end of file diff --git a/app/assets/stylesheets/vendor/map_layers.scss b/app/assets/stylesheets/vendor/map_layers.scss new file mode 100644 index 000000000..835417ddc --- /dev/null +++ b/app/assets/stylesheets/vendor/map_layers.scss @@ -0,0 +1,10 @@ +p.after_map { + clear: both; +} + +#map { + float: right; + width: 400px; + height: 400px; + border: 1px solid gray; +} \ No newline at end of file diff --git a/app/assets/stylesheets/vendor/pagination.css.scss b/app/assets/stylesheets/vendor/pagination.css.scss deleted file mode 100644 index eb994f308..000000000 --- a/app/assets/stylesheets/vendor/pagination.css.scss +++ /dev/null @@ -1,34 +0,0 @@ -.pagination { - margin: 10px 0 0 20px; - -} - -.page_info{ - margin: 20px 0 0 0; -} - -.page_info { - margin: 20px 0 0 0; - height: 30px; - line-height: 30px; - color: $gray; - border-bottom: solid 1px #cdc9c0; - border-top: solid 1px #cdc9c0; - - .search{ - margin: 0 20px 0 10px; - color: $brand_primary; - font-weight:bold; - } - - b { - padding: 0.1em 0.25em; - } -} - -.paginated_content{ - - .row{ - margin-top: 15px; - } -} \ No newline at end of file diff --git a/app/assets/stylesheets/vendor/pagination.scss b/app/assets/stylesheets/vendor/pagination.scss new file mode 100644 index 000000000..eb994f308 --- /dev/null +++ b/app/assets/stylesheets/vendor/pagination.scss @@ -0,0 +1,34 @@ +.pagination { + margin: 10px 0 0 20px; + +} + +.page_info{ + margin: 20px 0 0 0; +} + +.page_info { + margin: 20px 0 0 0; + height: 30px; + line-height: 30px; + color: $gray; + border-bottom: solid 1px #cdc9c0; + border-top: solid 1px #cdc9c0; + + .search{ + margin: 0 20px 0 10px; + color: $brand_primary; + font-weight:bold; + } + + b { + padding: 0.1em 0.25em; + } +} + +.paginated_content{ + + .row{ + margin-top: 15px; + } +} \ No newline at end of file diff --git a/app/assets/stylesheets/vendor/simple_form.css.scss b/app/assets/stylesheets/vendor/simple_form.css.scss deleted file mode 100644 index afac930c1..000000000 --- a/app/assets/stylesheets/vendor/simple_form.css.scss +++ /dev/null @@ -1,11 +0,0 @@ -.simple_form{ - - .help-inline{ - color:#cc0000; - } - - .form-actions{ - @extend .col-sm-offset-3; - @extend .col-sm-9; - } -} \ No newline at end of file diff --git a/app/assets/stylesheets/vendor/simple_form.scss b/app/assets/stylesheets/vendor/simple_form.scss new file mode 100644 index 000000000..afac930c1 --- /dev/null +++ b/app/assets/stylesheets/vendor/simple_form.scss @@ -0,0 +1,11 @@ +.simple_form{ + + .help-inline{ + color:#cc0000; + } + + .form-actions{ + @extend .col-sm-offset-3; + @extend .col-sm-9; + } +} \ No newline at end of file diff --git a/app/assets/stylesheets/vendor/typeahead.css.scss b/app/assets/stylesheets/vendor/typeahead.css.scss deleted file mode 100644 index 56653de9d..000000000 --- a/app/assets/stylesheets/vendor/typeahead.css.scss +++ /dev/null @@ -1,49 +0,0 @@ -.twitter-typeahead .tt-query, -.twitter-typeahead .tt-hint { - margin-bottom: 0; -} - -.tt-dropdown-menu { - min-width: 160px; - margin-top: 2px; - padding: 5px 0; - background-color: #fff; - border: 1px solid #ccc; - border: 1px solid rgba(0,0,0,.2); - *border-right-width: 2px; - *border-bottom-width: 2px; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - -webkit-box-shadow: 0 5px 10px rgba(0,0,0,.2); - -moz-box-shadow: 0 5px 10px rgba(0,0,0,.2); - box-shadow: 0 5px 10px rgba(0,0,0,.2); - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; -} - -.tt-suggestion { - display: block; - padding: 3px 20px; -} - -.tt-suggestion.tt-is-under-cursor { - color: #fff; - background-color: #0081c2; - background-image: -moz-linear-gradient(top, #0088cc, #0077b3); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3)); - background-image: -webkit-linear-gradient(top, #0088cc, #0077b3); - background-image: -o-linear-gradient(top, #0088cc, #0077b3); - background-image: linear-gradient(to bottom, #0088cc, #0077b3); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0) -} - -.tt-suggestion.tt-is-under-cursor a { - color: #fff; -} - -.tt-suggestion p { - margin: 0; -} \ No newline at end of file diff --git a/app/assets/stylesheets/vendor/typeahead.scss b/app/assets/stylesheets/vendor/typeahead.scss new file mode 100644 index 000000000..56653de9d --- /dev/null +++ b/app/assets/stylesheets/vendor/typeahead.scss @@ -0,0 +1,49 @@ +.twitter-typeahead .tt-query, +.twitter-typeahead .tt-hint { + margin-bottom: 0; +} + +.tt-dropdown-menu { + min-width: 160px; + margin-top: 2px; + padding: 5px 0; + background-color: #fff; + border: 1px solid #ccc; + border: 1px solid rgba(0,0,0,.2); + *border-right-width: 2px; + *border-bottom-width: 2px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; + -webkit-box-shadow: 0 5px 10px rgba(0,0,0,.2); + -moz-box-shadow: 0 5px 10px rgba(0,0,0,.2); + box-shadow: 0 5px 10px rgba(0,0,0,.2); + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; +} + +.tt-suggestion { + display: block; + padding: 3px 20px; +} + +.tt-suggestion.tt-is-under-cursor { + color: #fff; + background-color: #0081c2; + background-image: -moz-linear-gradient(top, #0088cc, #0077b3); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3)); + background-image: -webkit-linear-gradient(top, #0088cc, #0077b3); + background-image: -o-linear-gradient(top, #0088cc, #0077b3); + background-image: linear-gradient(to bottom, #0088cc, #0077b3); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0) +} + +.tt-suggestion.tt-is-under-cursor a { + color: #fff; +} + +.tt-suggestion p { + margin: 0; +} \ No newline at end of file -- cgit v1.2.3