7 files changed, 72 insertions, 52 deletions
diff --git a/app/assets/images/icons/calculator_edit.png b/app/assets/images/icons/calculator_edit.png
new file mode 100644
index 000000000..45a4ed0a4
--- /dev/null
+++ b/app/assets/images/icons/calculator_edit.png
diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 94da51a76..91050771e 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -42,7 +42,7 @@
         }
 
         .actions {
-            margin-top: 14px;
+            margin-top: 10px;
             a {
                 color: #666;
                 padding-left: 12px;
diff --git a/app/assets/stylesheets/journey_patterns.css.scss b/app/assets/stylesheets/journey_patterns.css.scss
index 5981c76b0..d023ffffa 100644
--- a/app/assets/stylesheets/journey_patterns.css.scss
+++ b/app/assets/stylesheets/journey_patterns.css.scss
@@ -3,37 +3,6 @@
 // You can use Sass (SCSS) here: http://sass-lang.com/
 @import "common";
 
-#workspace.routes.show
-{
-    .jouerney_pattern:after { 
-        @include after_div_for_object;  
-    }
-
-    .journey_patterns {
-        margin-top: 20px;
-    }
-
-    .journey_patterns:after {
-        @include content_to_clear;
-    }
-    
-    .journey_pattern {
-        @include div_for_object;
-
-        /* to create multi-column index */
-        width: 350px;
-        padding-right: 10px;
-        height: 60px;
-        float: left;
-
-        .name {
-            line-height: 16px;
-        //    float: left;
-        }
-        
-    }
-}
-
 #workspace.journey_patterns.edit, #workspace.journey_patterns.new
 {
     #route_color{ width: 100px;
diff --git a/app/assets/stylesheets/layout.css.scss b/app/assets/stylesheets/layout.css.scss
index 58d85b5a7..3c4af97e5 100644
--- a/app/assets/stylesheets/layout.css.scss
+++ b/app/assets/stylesheets/layout.css.scss
@@ -92,4 +92,8 @@ $text_color: #222;
     a.select_areas {
         background: url(image-path('icons/select_parent.png')) no-repeat;
     }
+
+    a.calculator_edit {
+        background: url(image-path('icons/calculator_edit.png')) no-repeat;
+    }
 }
diff --git a/app/assets/stylesheets/pagination.css.scss b/app/assets/stylesheets/pagination.css.scss
index 222ab861b..7bb3e9cde 100644
--- a/app/assets/stylesheets/pagination.css.scss
+++ b/app/assets/stylesheets/pagination.css.scss
@@ -1,7 +1,27 @@
+.page_info {
+    margin: 30px 0 10px 0;
+    height: 30px;
+    line-height: 30px;
+    color: #777777; 
+    border-bottom: solid 1px #cdc9c0;
+    border-top: solid 1px #cdc9c0;
+    
+    .search{
+        margin: 0 20px 0 10px;
+        color: #61970b;
+        font-weight:bold;
+    }
+    
+    b {
+        padding: 0.1em 0.25em; 
+    }
+}
+
 .pagination {
   background: white;
   cursor: default;
-  margin-top: 20px;
+  margin-top: 10px;
+  padding-left: 70px;
  
   /* self-clearing method: */
   a, span, em {
@@ -25,17 +45,6 @@
   a:hover,  a:focus {
       color: #000033;
       border-color: #000033; }
-  .page_info {
-      background: #61970b;
-      color: white;
-      padding: 0.4em 0.6em;
-      width: 22em;
-      margin-bottom: 0.3em;
-      text-align: center; }
-  .page_info b {
-      color: #000033;
-      background: #86b41d;
-      padding: 0.1em 0.25em; }
 }
 
 .pagination:after {
diff --git a/app/assets/stylesheets/routes.css.scss b/app/assets/stylesheets/routes.css.scss
index a5c63bf01..77e473dbc 100644
--- a/app/assets/stylesheets/routes.css.scss
+++ b/app/assets/stylesheets/routes.css.scss
@@ -63,7 +63,7 @@
     }
 
     .stop_points {
-        margin-top: 20px;
+        margin-top: 10px;
     }
 
     .stop_points:after {
@@ -79,7 +79,7 @@
     .stop_point {
         @include div_for_object;
         /* to create multi-column index */
-        width: 350px;
+        width: 250px;
         float: left;
         padding-right: 10px;
 
@@ -95,5 +95,35 @@
         }
     }
     
-}        
+}   
+
+#workspace.routes.show
+{
+    .jouerney_pattern:after { 
+        @include after_div_for_object;  
+    }
+
+    .journey_patterns {
+        margin-top: 10px;
+    }
+
+    .journey_patterns:after {
+        @include content_to_clear;
+    }
+    
+    .journey_pattern {
+        @include div_for_object;
+
+        /* to create multi-column index */
+        width: 350px;
+        padding-right: 10px;
+        height: 80px;
+        float: left;
+
+        .name {
+            line-height: 16px;
+        }
+        
+    }
+}     
 
diff --git a/app/assets/stylesheets/stop_areas.css.scss b/app/assets/stylesheets/stop_areas.css.scss
index ad1339494..cd1623a05 100644
--- a/app/assets/stylesheets/stop_areas.css.scss
+++ b/app/assets/stylesheets/stop_areas.css.scss
@@ -9,10 +9,6 @@
         @include after_div_for_object;  
     }
 
-    .stop_areas {
-        margin-top: 20px;
-    }
-
     .stop_areas:after {
         @include content_to_clear;
     }
@@ -20,7 +16,7 @@
     .stop_area {
         @include div_for_object;
         /* to create multi-column index */
-        width: 350px;
+        width: 250px;
         float: left;
         padding-right: 10px;
 
@@ -139,4 +135,16 @@
     }
 }
 
+#sidebar ul.selection li {    
+    a {
+        line-height: 27px;
+        
+        img{
+            height: 25px;
+            width: 25px;
+            vertical-align: middle;
+        }
+    }
+}
+