aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichel Etienne2012-03-20 12:01:24 +0100
committerMichel Etienne2012-03-20 12:01:24 +0100
commitcfbc4eb9f199e8d1e36e05491f368d6ae8ca9409 (patch)
treeb7e753a4235e2b37e6324cd725455c43906eb249
parent2011ee0247deede4a58dbdcc6f5c50146dedf584 (diff)
downloadchouette-core-cfbc4eb9f199e8d1e36e05491f368d6ae8ca9409.tar.bz2
purge ~files
-rw-r--r--app/assets/stylesheets/application.css~7
-rw-r--r--app/assets/stylesheets/legacy.css.scss~195
-rw-r--r--app/controllers/lines_controller.rb~2
-rw-r--r--app/controllers/welcome_controller.rb~2
-rw-r--r--app/helpers/application_helper.rb~2
-rw-r--r--app/helpers/title_helper.rb~11
6 files changed, 0 insertions, 219 deletions
diff --git a/app/assets/stylesheets/application.css~ b/app/assets/stylesheets/application.css~
deleted file mode 100644
index fc25b5723..000000000
--- a/app/assets/stylesheets/application.css~
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * This is a manifest file that'll automatically include all the stylesheets available in this directory
- * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
- * the top of the compiled file, but it's generally better to create a new file per style scope.
- *= require_self
- *= require_tree .
-*/ \ No newline at end of file
diff --git a/app/assets/stylesheets/legacy.css.scss~ b/app/assets/stylesheets/legacy.css.scss~
deleted file mode 100644
index c0a62056d..000000000
--- a/app/assets/stylesheets/legacy.css.scss~
+++ /dev/null
@@ -1,195 +0,0 @@
-.div_for_object() {
- margin-bottom: 20px;
-
- a.preview {
- text-decoration: none;
- }
-
- img {
- float: left;
- margin-right: 10px;
- }
- a {
- display:block;
- text-decoration: underline;
- margin-bottom: 3px;
- }
- .info {
- font-size: 12px;
- color: #777;
- font-weight: normal;
- line-height: 18px;
-
- a {
- display:inline;
- color: #095495;
- }
- }
-}
-
-.after_div_for_object() {
- content: " ";
- display: block;
- height: 0;
- clear: left;
- visibility: hidden;
-}
-
-.line, .line_group, .stop_area, .service_link, .network, .service_link_stop_point, .indicator {
- .div_for_object;
-}
-
-.line:after, .line_group:after, .stop_area:after, .service_link:after, .network:after, .service_link_stop_point:after, .journey_pattern:after, .indicator:after {
- .after_div_for_object;
-}
-
-.line_show .summary{
- height: 250px;
- min-height: 250px;
-}
-
-.line {
- .color {
- width: 64px;
- height: 64px;
- float: left;
- margin-right: 10px;
- a {
- text-decoration: none;
- }
- }
-
- .code {
- font-size: 16px;
- text-align: center;
- color: white;
- font-weight: bold;
- padding-top: 21px;
- }
-}
-
-.journey_pattern{
- float: left;
- padding: 10px;
-
- .headers{
- background-color: #b78db7;
- text-align: center;
- padding: 5px;
-
- img{
- vertical-align: text-bottom;
- margin-left: 5px;
- }
- }
-
- .even{
- background-color: #eed7f1;
- padding: 5px;
-
- img{
- vertical-align: text-bottom;
- margin-right: 5px;
- }
- }
-
- .odd{
- padding: 5px;
-
- img{
- vertical-align: text-bottom;
- margin-right: 5px;
- }
- }
-}
-
-.network
-{
- .map{
- width: 50px;
- height: 50px;
- float: left;
- margin-right: 10px;
- background: url("../images/icons/viewer.png") no-repeat;
- }
-
- a.viewer {
- background: url("../images/icons/viewer.png") no-repeat;
- }
-}
-
-.stop_area {
- .info {
- .warning {
- background: url("../images/icons/warning.png") 0 100% no-repeat;
- padding-left: 20px;
- }
- }
-}
-
-#map.stop_area, #map.service_link, #map.line {
- float: right;
- width: 400px;
- height: 250px;
-}
-
-.service_link {
-
- #service_link_stop_points {
- li {
- margin-bottom: 1.5em;
- }
- li.stop_area {
- padding-left: 26px;
- }
- fieldset > ol > li {
- margin-bottom: 0;
- }
- }
-
- a {
- display: inline;
- }
-
- a.remove {
- float: left;
- img {
- margin: 4px 10px 0 0;
- }
- }
-
- .buttons{
- margin-top: 20px;
- }
-
-
-}
-
-.indicator{
-
-}
-
-div.auto_complete {
- width: 350px;
- background: #fff;
-
- ul {
- border:1px solid #888;
- margin:0;
- padding:0;
- width:100%;
- list-style-type:none;
- }
- ul li {
- margin:0;
- padding:3px;
- }
- ul li.selected {
- background-color: #ffb;
- }
- ul strong.highlight {
- color: #800;
- margin:0;
- padding:0;
- }
-}
diff --git a/app/controllers/lines_controller.rb~ b/app/controllers/lines_controller.rb~
deleted file mode 100644
index 81710ab8f..000000000
--- a/app/controllers/lines_controller.rb~
+++ /dev/null
@@ -1,2 +0,0 @@
-class LinesController < ApplicationController
-end
diff --git a/app/controllers/welcome_controller.rb~ b/app/controllers/welcome_controller.rb~
deleted file mode 100644
index d8c85ab84..000000000
--- a/app/controllers/welcome_controller.rb~
+++ /dev/null
@@ -1,2 +0,0 @@
-class WelcomeController < ApplicationController
-end
diff --git a/app/helpers/application_helper.rb~ b/app/helpers/application_helper.rb~
deleted file mode 100644
index de6be7945..000000000
--- a/app/helpers/application_helper.rb~
+++ /dev/null
@@ -1,2 +0,0 @@
-module ApplicationHelper
-end
diff --git a/app/helpers/title_helper.rb~ b/app/helpers/title_helper.rb~
deleted file mode 100644
index aba7cc490..000000000
--- a/app/helpers/title_helper.rb~
+++ /dev/null
@@ -1,11 +0,0 @@
-module TitleHelper
-
- def title(title = nil)
- if title
- @title = title
- else
- @title
- end
- end
-
-end