Download as
Browse Code »

Commit a2b3eb134a5549bf9c80a8ee0f950a4c67777413

Authored by Dmitriy Zaporozhets
1 parent 38ff5d1a
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

Move from ui-box to panels 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 9 changed files with 32 additions and 24 deletions   Show diff stats
app/assets/javascripts/dashboard.js.coffee
  Diff comments   View file @a2b3eb1
... ... @@ -4,7 +4,7 @@ class Dashboard
4 4  
5 5 $(".dash-filter").keyup ->
6 6 terms = $(this).val()
7   - uiBox = $(this).parents('.ui-box').first()
  7 + uiBox = $(this).parents('.panel').first()
8 8 if terms == "" || terms == undefined
9 9 uiBox.find(".dash-list li").show()
10 10 else
... ...
app/assets/stylesheets/generic/lists.scss
  Diff comments   View file @a2b3eb1
... ... @@ -72,6 +72,15 @@
72 72 font-size: 14px;
73 73 line-height: 18px;
74 74 }
  75 +
  76 + .row_title {
  77 + font-weight: 500;
  78 + color: #444;
  79 + &:hover {
  80 + color: #444;
  81 + text-decoration: underline;
  82 + }
  83 + }
75 84 }
76 85 }
77 86  
... ...
app/assets/stylesheets/generic/ui_box.scss
  Diff comments   View file @a2b3eb1
... ... @@ -106,15 +106,6 @@
106 106 }
107 107 }
108 108  
109   - .row_title {
110   - font-weight: 500;
111   - color: #444;
112   - &:hover {
113   - color: #444;
114   - text-decoration: underline;
115   - }
116   - }
117   -
118 109 .form-holder {
119 110 padding-top: 20px;
120 111 form {
... ...
app/assets/stylesheets/gl_bootstrap.scss
  Diff comments   View file @a2b3eb1
... ... @@ -221,3 +221,11 @@ ul.breadcrumb {
221 221 position: relative;
222 222 white-space: nowrap;
223 223 }
  224 +
  225 +/**
  226 + * Add some extra stuff to panels
  227 + *
  228 + */
  229 +.panel {
  230 +
  231 +}
... ...
app/views/admin/background_jobs/show.html.haml
  Diff comments   View file @a2b3eb1
... ... @@ -5,7 +5,7 @@
5 5  
6 6 .panel.panel-default
7 7 .panel-heading Sidekiq running processes
8   - .body
  8 + .panel-body
9 9 - if @sidekiq_processes.empty?
10 10 %h4.cred
11 11 %i.icon-warning-sign
... ...
app/views/admin/groups/show.html.haml
  Diff comments   View file @a2b3eb1
... ... @@ -48,7 +48,7 @@
48 48 .panel.panel-default
49 49 .panel-heading
50 50 Add user(s) to the group:
51   - .body.form-holder
  51 + .panel-body.form-holder
52 52 %p.light
53 53 Read more about project permissions
54 54 %strong= link_to "here", help_page_path("permissions", "permissions"), class: "vlink"
... ...
app/views/admin/projects/show.html.haml
  Diff comments   View file @a2b3eb1
... ... @@ -78,7 +78,7 @@
78 78 .panel.panel-default
79 79 .panel-heading
80 80 Transfer project
81   - .body
  81 + .panel-body
82 82 = form_for @project, url: transfer_admin_project_path(@project), method: :put, html: { class: 'form-horizontal' } do |f|
83 83 .form-group
84 84 = f.label :namespace_id, "Namespace", class: 'control-label'
... ...
app/views/groups/edit.html.haml
  Diff comments   View file @a2b3eb1
... ... @@ -84,9 +84,9 @@
84 84 .nothing-here-block This group has no projects yet
85 85  
86 86 .tab-pane#tab-remove
87   - .panel.panel-default.panel.panel-default-danger
  87 + .panel.panel-default.panel.panel-danger
88 88 .panel-heading Remove group
89   - .body
  89 + .panel-body
90 90 %p
91 91 Removing group will cause all child projects and resources to be removed.
92 92 %p
... ...
app/views/projects/edit.html.haml
  Diff comments   View file @a2b3eb1
... ... @@ -6,7 +6,7 @@
6 6 Project settings:
7 7 %p.light Some settings, such as "Transfer Project", are hidden inside the danger area below
8 8 %hr
9   - .form-holder
  9 + .panel-body
10 10 = form_for @project, remote: true, html: { class: "edit_project form-horizontal" } do |f|
11 11 %fieldset
12 12 .form-group.project_name_holder
... ... @@ -106,13 +106,13 @@
106 106  
107 107 .js-toggle-content.hide
108 108 - if can? current_user, :archive_project, @project
109   - .panel.panel-default.panel.panel-default-danger
  109 + .panel.panel-default.panel.panel-danger
110 110 .panel-heading
111 111 - if @project.archived?
112 112 Unarchive project
113 113 - else
114 114 Archive project
115   - .body
  115 + .panel-body
116 116 - if @project.archived?
117 117 %p
118 118 Unarchiving the project will mark its repository as active.
... ... @@ -137,10 +137,10 @@
137 137 .nothing-here-block Only the project owner can archive a project
138 138  
139 139 - if can?(current_user, :change_namespace, @project)
140   - .panel.panel-default.panel.panel-default-danger
  140 + .panel.panel-default.panel.panel-danger
141 141 .panel-heading Transfer project
142 142 .errors-holder
143   - .form-holder
  143 + .panel-body
144 144 = form_for(@project, url: transfer_project_path(@project), method: :put, remote: true, html: { class: 'transfer-project form-horizontal' }) do |f|
145 145 .form-group
146 146 = f.label :namespace_id, class: 'control-label' do
... ... @@ -157,10 +157,10 @@
157 157 - else
158 158 .nothing-here-block Only the project owner can transfer a project
159 159  
160   - .panel.panel-default.panel.panel-default-danger
  160 + .panel.panel-default.panel.panel-danger
161 161 .panel-heading Rename repository
162 162 .errors-holder
163   - .form-holder
  163 + .panel-body
164 164 = form_for(@project, html: { class: 'form-horizontal' }) do |f|
165 165 .form-group
166 166 = f.label :path, class: 'control-label' do
... ... @@ -177,9 +177,9 @@
177 177 = f.submit 'Rename', class: "btn btn-remove"
178 178  
179 179 - if can?(current_user, :remove_project, @project)
180   - .panel.panel-default.panel.panel-default-danger
  180 + .panel.panel-default.panel.panel-danger
181 181 .panel-heading Remove project
182   - .body
  182 + .panel-body
183 183 %p
184 184 Removing the project will delete its repository and all related resources including issues, merge requests etc.
185 185 %br
... ...