Milestones: progressbar from bootstrap. Bradcrumbs styles

randx
1 parent 17d4cac2
Showing 5 changed files with 36 additions and 41 deletions Show diff stats
app/assets/stylesheets/gitlab_bootstrap.scss
app/assets/stylesheets/tree.scss
app/views/commits/index.html.haml
app/views/milestones/_milestone.html.haml
app/views/milestones/show.html.haml
@@ -484,3 +484,29 @@ table.admin-table {
   display:inline;
 }
  
+ul.breadcrumb {
+  background:white;
+  border:none;
+  li {
+    display: inline;
+    text-shadow: 0 1px 0 white
+  }
+
+  a { 
+    color:#474D57;
+    font-weight:bold;
+    font-size:14px;
+  }
+
+  .arrow { 
+    background: url("images.png") no-repeat -85px -77px;
+    width: 19px;
+    height: 16px;
+    float: left;
+    position: relative;
+    left: -10px;
+    padding:0;
+    margin:0;
+  }
+}
+
@@ -145,20 +145,6 @@
     }
   }
  
-  ul.breadcrumb {
-    background:white;
-    border:none;
-    li {
-      display: inline;
-      text-shadow: 0 1px 0 white
-    }
-
-    a { 
-      color:#474D57;
-      font-weight:bold;
-      font-size:14px;
-    }
-  }
  
   #tree-slider { 
     @include shade;
@@ -214,16 +200,6 @@
     }
   }
  
-  .arrow { 
-    background: url("images.png") no-repeat -85px -77px;
-    width: 19px;
-    height: 16px;
-    float: left;
-    position: relative;
-    left: -10px;
-    padding:0;
-    margin:0;
-  }
 }
  
 .blame_file { 
@@ -3,8 +3,9 @@
 - if params[:path]
   %ul.breadcrumb
     %li
+      %span.arrow
       = link_to project_commits_path(@project) do
-        = @project.code
+        = @project.name
       %span.divider 
         \/
     %li
@@ -9,14 +9,11 @@
   = link_to project_milestone_path(milestone.project, milestone) do
     %h4.row_title
       = truncate(milestone.title, :length => 100)
-      %small= milestone.expires_at
+      %small
+        = milestone.expires_at
       %br
-      .progress.span3
+      .progress.progress-success.span3
+        .bar{:style => "width: #{milestone.percent_complete}%;"}
+
  
   &nbsp;
-  :javascript
-    $(function() {
-      $( "##{dom_id(milestone)} .progress" ).progressbar({
-        value: #{milestone.percent_complete}
-       });
-    });
@@ -31,7 +31,9 @@
         #{@milestone.issues.opened.count} open
         &ndash;
         #{@milestone.issues.closed.count} closed
-    .progress
+    .progress.progress-success
+      .bar{:style => "width: #{@milestone.percent_complete}%;"}
+
  
   - if @milestone.description.present?
     .bottom_box_content
@@ -65,10 +67,3 @@
             = image_tag gravatar_icon(user.email, 24), :width => "24"
             &nbsp;
             = user.name
-
-:javascript
-  $(function() {
-    $( ".progress" ).progressbar({
-      value: #{@milestone.percent_complete}
-     });
-  });
...	...	@@ -484,3 +484,29 @@ table.admin-table {
484	484	display:inline;
485	485	}
486	486
	487	+ul.breadcrumb {
	488	+ background:white;
	489	+ border:none;
	490	+ li {
	491	+ display: inline;
	492	+ text-shadow: 0 1px 0 white
	493	+ }
	494	+
	495	+ a {
	496	+ color:#474D57;
	497	+ font-weight:bold;
	498	+ font-size:14px;
	499	+ }
	500	+
	501	+ .arrow {
	502	+ background: url("images.png") no-repeat -85px -77px;
	503	+ width: 19px;
	504	+ height: 16px;
	505	+ float: left;
	506	+ position: relative;
	507	+ left: -10px;
	508	+ padding:0;
	509	+ margin:0;
	510	+ }
	511	+}
	512	+
...	...
...	...	@@ -145,20 +145,6 @@
145	145	}
146	146	}
147	147
148		- ul.breadcrumb {
149		- background:white;
150		- border:none;
151		- li {
152		- display: inline;
153		- text-shadow: 0 1px 0 white
154		- }
155		-
156		- a {
157		- color:#474D57;
158		- font-weight:bold;
159		- font-size:14px;
160		- }
161		- }
162	148
163	149	#tree-slider {
164	150	@include shade;
...	...	@@ -214,16 +200,6 @@
214	200	}
215	201	}
216	202
217		- .arrow {
218		- background: url("images.png") no-repeat -85px -77px;
219		- width: 19px;
220		- height: 16px;
221		- float: left;
222		- position: relative;
223		- left: -10px;
224		- padding:0;
225		- margin:0;
226		- }
227	203	}
228	204
229	205	.blame_file {
...	...
...	...	@@ -3,8 +3,9 @@
3	3	- if params[:path]
4	4	%ul.breadcrumb
5	5	%li
	6	+ %span.arrow
6	7	= link_to project_commits_path(@project) do
7		- = @project.code
	8	+ = @project.name
8	9	%span.divider
9	10	\/
10	11	%li
...	...
...	...	@@ -9,14 +9,11 @@
9	9	= link_to project_milestone_path(milestone.project, milestone) do
10	10	%h4.row_title
11	11	= truncate(milestone.title, :length => 100)
12		- %small= milestone.expires_at
	12	+ %small
	13	+ = milestone.expires_at
13	14	%br
14		- .progress.span3
	15	+ .progress.progress-success.span3
	16	+ .bar{:style => "width: #{milestone.percent_complete}%;"}
	17	+
15	18
16	19
17		- :javascript
18		- $(function() {
19		- $( "##{dom_id(milestone)} .progress" ).progressbar({
20		- value: #{milestone.percent_complete}
21		- });
22		- });
...	...
...	...	@@ -31,7 +31,9 @@
31	31	#{@milestone.issues.opened.count} open
32	32	–
33	33	#{@milestone.issues.closed.count} closed
34		- .progress
	34	+ .progress.progress-success
	35	+ .bar{:style => "width: #{@milestone.percent_complete}%;"}
	36	+
35	37
36	38	- if @milestone.description.present?
37	39	.bottom_box_content
...	...	@@ -65,10 +67,3 @@
65	67	= image_tag gravatar_icon(user.email, 24), :width => "24"
66	68
67	69	= user.name
68		-
69		-:javascript
70		- $(function() {
71		- $( ".progress" ).progressbar({
72		- value: #{@milestone.percent_complete}
73		- });
74		- });
...	...