Download as
Browse Code »

Commit ec01fa29fbb0c7279faaa20479e0858747c0fdfe

Authored by Dmitriy Zaporozhets
1 parent c844723a
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

styled top panel

Showing 3 changed files with 29 additions and 43 deletions   Show diff stats
app/assets/stylesheets/common.scss
  Diff comments   View file @ec01fa2
... ... @@ -80,7 +80,6 @@ a {
80 80  
81 81 .container-fluid .sidebar {
82 82 width: 250px;
83   - border-left: 1px solid $lite_border_color;
84 83 height:100%;
85 84 min-height:450px;
86 85 float:right;
... ... @@ -88,15 +87,19 @@ a {
88 87  
89 88 nav.main_menu {
90 89 border-radius: 4px;
91   - box-shadow: 0 1px 2px black;
92 90 width: 100%;
93 91 margin: auto;
94   - margin-top:20px;
95   - margin-bottom:20px;
96   - background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #595d63), to(#31363e));
97   - background-image: -webkit-linear-gradient(#595d63 6.6%, #31363e);
98   - background-image: -moz-linear-gradient(#595d63 6.6%, #31363e);
99   - background-image: -o-linear-gradient(#595d63 6.6%, #31363e);
  92 + margin-top:30px;
  93 + margin-bottom:30px;
  94 + background:#f1f1f1;
  95 + border:1px solid #ccc;
  96 + height:38px;
  97 +
  98 + background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #f1f1f1), to(#dfdfdf));
  99 + background-image: -webkit-linear-gradient(#f1f1f1 6.6%, #dfdfdf);
  100 + background-image: -moz-linear-gradient(#f1f1f1 6.6%, #202227);
  101 + background-image: -o-linear-gradient(#f1f1f1 6.6%, #202227);
  102 +
100 103  
101 104 .label {
102 105 background:$hover;
... ... @@ -117,17 +120,15 @@ nav.main_menu {
117 120 }
118 121 padding: 10px 25px;
119 122 display: inline-block;
120   - color: #D6DADF;
121   - border-right: 1px solid #31363E;
  123 + color: $style_color;
  124 + border-right: 1px solid #ccc;
122 125 position: relative;
123 126 box-shadow: 1px 0 0 rgba(255, 255, 255, 0.1);
124 127 margin: 0;
125   - text-shadow: 0 -1px 0 black;
  128 + float:left;
  129 + text-shadow:0 1px 1px white;
126 130 &.current {
127   - background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #595d63), to(#2c2f35));
128   - background-image: -webkit-linear-gradient(#595d63 6.6%, #2c2f35);
129   - background-image: -moz-linear-gradient(#595d63 6.6%, #202227);
130   - background-image: -o-linear-gradient(#595d63 6.6%, #202227);
  131 + background:#DDD;
131 132 }
132 133 }
133 134 }
... ... @@ -228,11 +229,6 @@ img.lil_av {
228 229 }
229 230 }
230 231  
231   -.well {
232   - a h3 {
233   - color:$link_color;
234   - }
235   -}
236 232 .widget {
237 233 padding:20px;
238 234 margin-bottom:20px;
... ...
app/views/layouts/_app_menu.html.haml
  Diff comments   View file @ec01fa2
1 1 %nav.main_menu
2   - -#= link_to "Activities", dashboard_path, :class => "#{"active" if current_page?(dashboard_path) || current_page?(root_path) }"
3   - = link_to "Projects", projects_path, :class => "#{"active" if current_page?(projects_path)}"
4   - = link_to "Issues", dashboard_issues_path, :class => "#{"active" if current_page?(dashboard_issues_path)}", :id => "issues_slide"
5   - = link_to "Requests", dashboard_merge_requests_path, :class => "#{"active" if current_page?(dashboard_merge_requests_path)}", :id => "merge_requests_slide"
6   - = link_to "Help", help_path, :class => "#{"active" if controller.controller_name == "help"}"
  2 + = link_to "Projects", projects_path, :class => "#{"current" if current_page?(projects_path) || current_page?(root_path)}"
  3 + = link_to "Issues", dashboard_issues_path, :class => "#{"current" if current_page?(dashboard_issues_path)}", :id => "issues_slide"
  4 + = link_to "Requests", dashboard_merge_requests_path, :class => "#{"current" if current_page?(dashboard_merge_requests_path)}", :id => "merge_requests_slide"
  5 + = link_to "Help", help_path, :class => "#{"current" if controller.controller_name == "help"}"
... ...
app/views/layouts/_projects_side.html.haml
  Diff comments   View file @ec01fa2
1 1 %aside.projects
2 2 - if current_user.can_create_project?
3   - .alert-message.block-message
  3 + .widget
4 4 You can create at least
5 5 = current_user.projects_limit
6 6 projects. Click on button to add a new one
7   - .alert-actions
8   - = link_to new_project_path, :class => "btn small" do
9   - New Project »
  7 + %hr
  8 + = link_to new_project_path, :class => "btn small" do
  9 + New Project »
10 10  
11 11 - if current_user.is_admin?
12   - .alert-message.block-message
  12 + .widget
13 13 You have administrator privilegies. You can configure application following this button:
14   - .alert-actions
15   - = link_to admin_root_path, :class => "btn small", :title => "Admin" do
16   - Visit Admin Area »
  14 + %hr
  15 + = link_to admin_root_path, :class => "btn small", :title => "Admin" do
  16 + Visit Admin Area »
17 17  
18 18 - if current_user.projects.count > 0
19   - %div.entry
20   - %h5
21   - Recent Projects:
22   - %ul
23   - - current_user.projects.order("id DESC").limit(5).each do |project|
24   - %li
25   - = link_to project_path(project) do
26   - = project.name
27   - = link_to "More » ", projects_path
28   -
  19 + = render "widgets/recent_projects"
29 20  
30 21  
... ...