Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[#369] more compact interface

This commit is contained in:
Alexander Machehin 2015-02-06 20:49:06 +05:00
parent 2e20b9942d
commit cc1b70ffac
52 changed files with 171 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/stylesheets/custom_bootstrap.css.sass
View File

@ -231,3 +231,11 @@ textarea.resize-vertical
left: 20px
cursor: pointer
display: none
nav.navbar
form#clone_url
width: 35%
.form-group
display: inline
input
width: 100%

5
app/assets/stylesheets/new_application.css.scss
View File

@ -6,9 +6,12 @@
*= require_tree ./views
*/
$grid-gutter-width: 16px;
//$line-height-base: 1.1428571428;
$navbar-height: 37px;
$navbar-border-radius: 0px;
$nav-link-padding: 10px 8px;
$nav-link-padding: 5px 8px;
$top-menu-height: 52px;
$top-menu-padding-vertical: (($top-menu-height - 20) / 2);

2
app/views/advisories/_list.html.haml
View File

@ -1,4 +1,4 @@
.row.offset10.boffset20
.row.offset10.boffset10
.col-xs-8
= text_field_tag 'q', params[:q], placeholder: t('layout.advisories.search'),
class: 'form-control text-muted', 'ng-model' => 'q', 'ng-change' => 'goToPage(1)'

6
app/views/home/_activity_tab.html.slim
View File

@ -1,7 +1,7 @@
tab heading = "{{activity_tab.title | i18n}}" active = "activity_tab.active" select = "getContent('activity')"
.row
.col-md-3.offset20== render 'sidebar'
.col-md-9.offset20
.col-md-3.offset10== render 'sidebar'
.col-md-9.offset10
h3
= t 'layout.activity_feed.header'
= link_to image_tag('rss.ico', width: '15px', height: '15px', class: 'atom_icon'),
@ -10,7 +10,7 @@ tab heading = "{{activity_tab.title | i18n}}" active = "activity_tab.active" sel
- (collection = t 'feed_menu').each do |base, title|
tab heading = title active = (@filter == base) select = "changeActivityFilter('#{base}')"
/ The time line
.row.offset20
.row.offset10
.col-md-12.col-sm-12
ul.timeline
/ timeline time label

4
app/views/home/_tracker_and_pulls_tabs.html.slim
View File

@ -3,14 +3,14 @@
active = "#{kind}_tab.active"
select = "getContent('#{kind}')" ]
.row
.col-md-3.offset20
.col-md-3.offset10
ul.nav.nav-pills.nav-stacked
- %w(all assigned created).each do |kind_filter|
li ng-class = "{ active: #{kind}_tab.filter.#{kind_filter} }"
a ng-click = "setIssuesFilter('#{kind}', '#{kind_filter}')"
span.badge.pull-right= "{{ #{kind}_tab.filter.#{kind_filter}_count }}"
= "{{'#{kind}.filter.#{kind_filter}' | i18n}}"
.col-md-9.offset20
.col-md-9.offset10
tabset.boffset10
- %w(open closed).each do |status|
- count_issues = "({{#{kind}_tab.filter.#{status}_count}})"

2
app/views/home/activity.html.slim
View File

@ -1,6 +1,6 @@
-set_meta_tags title: nil
.row
.col-xs-12.col-md-10.col-md-offset-1 ng-controller = 'ActivityCtrl' ng-init = "init('#{action_name}')"
tabset.offset20 ng-cloak = true
tabset.offset10 ng-cloak = true
== render 'activity_tab'
== render 'tracker_and_pulls_tabs'

2
app/views/layouts/application.html.slim
View File

@ -25,7 +25,7 @@ html
== render 'layouts/noscript'
== render "layouts/flashes"
article.container-fluid.offset20
article.container-fluid.offset10
== yield
== render 'layouts/menu/new_bottom'
== javascript_include_tag 'new_application', cache: 'application'

2
app/views/layouts/menu/_new_bottom.html.haml
View File

@ -1,4 +1,4 @@
%footer.offset20
%footer.offset10
%ul
%li= t('bottom_menu.copyright', year: Date.today.year)
%li ·

2
app/views/layouts/sessions.html.slim
View File

@ -12,7 +12,7 @@ html
== render 'layouts/noscript'
== render "layouts/flashes"
article.container-fluid.offset20
article.container-fluid.offset10
.row
.col-md-6.col-md-offset-3
.panel.panel-primary

2
app/views/pages/tour/abf-tour-project-description-1.html.slim
View File

@ -3,7 +3,7 @@
.row
= image_tag "tour-top#{I18n.locale == :en ? '-eng' : ''}.png", alt: 'ABF', class: 'img-responsive center-block img-rounded'
.row.offset20
.row.offset10
.col-md-6
a.btn-link data-toggle="modal" data-target="#controlModal"
= image_tag 'tour/control.png', class: 'img-responsive center-block img-rounded'

4
app/views/pages/tour/tour-inside.html.slim
View File

@ -3,9 +3,9 @@
.row
= image_tag "tour-top#{I18n.locale == :en ? '-eng' : ''}.png", alt: 'ABF', class: 'img-responsive center-block img-rounded'
.row.offset20
.row.offset10
= render 'pages/tour/submenu'
.offset20
.offset10
- @entries.each_with_index do |el, ind|
= render partial: 'pages/tour/entry', locals: {entry: el, is_left: ind.odd?}

2
app/views/platforms/platforms/index.html.slim
View File

@ -2,7 +2,7 @@
.row ng-controller='PlatformsCtrl'
.col-md-6.col-md-offset-3 ng-cloak=true
= link_to t('layout.platforms.new'), new_platform_path, class: 'btn btn-primary' if can? :create, Platform
table.table.table-hover.offset20
table.table.table-hover.offset10
thead
tr
th

2
app/views/platforms/product_build_lists/index.html.slim
View File

@ -4,7 +4,7 @@
.container
.row.offset20
.row.offset10
= render 'filter'
.row
table.table.table-striped

4
app/views/platforms/product_build_lists/show.html.slim
View File

@ -99,7 +99,7 @@
options_for_select(product_build_list_delete_options),
{ ng_model: "pbl.not_delete", ng_change: 'updateStatus()'}
.row.alert.alert-danger.offset20 ng-hide='pbl.not_delete'
.row.alert.alert-danger.offset10 ng-hide='pbl.not_delete'
- days = pbl.autostarted? ? ProductBuildList::LIVE_TIME : ProductBuildList::MAX_LIVE_TIME
- days = (pbl.created_at.to_date - days.ago.to_date).to_i
- if days > 1
@ -126,7 +126,7 @@
ng-show = 'pbl.can_destroy' ]
= t('layout.product_build_lists.delete')
.row.offset20 ng-show="pbl.status == #{ProductBuildList::BUILD_STARTED}"
.row.offset10 ng-show="pbl.status == #{ProductBuildList::BUILD_STARTED}"
= render 'shared/log', { build_started: true, get_log_path: log_platform_product_product_build_list_path(pbl.product.platform, pbl.product, pbl) }
.row

2
app/views/platforms/repositories/edit.html.slim
View File

@ -33,7 +33,7 @@
.col-md-2
= f.button :submit, label, data: { confirm: t('layout.confirm') }, class: 'btn-warning'
.row.offset20
.row.offset10
= simple_form_for @repository, url: regenerate_metadata_platform_repository_path(@platform, @repository), html: { method: :put } do |f|
.col-md-6
= t('layout.repositories.regenerate_metadata')

78
app/views/projects/base/_repo_block.html.haml
View File

@ -1,78 +0,0 @@
- act = action_name.to_sym; contr = controller_name.to_sym; treeish = project.default_head(params[:treeish]); branch = @branch.try(:name) || project.default_head
-http_url = git_repo_url(project.name_with_owner)
-ssh_url = git_ssh_repo_url(project.name_with_owner)
%div{ role: 'navigation', 'ng-controller' => 'ProjectRepoBlockController', 'ng-cloak' => true,
'ng-init' => "init('#{ssh_url}', #{project.repo.branches.count})" }
%nav.navbar.navbar-default
.container-fluid
/ Brand and toggle get grouped for better mobile display
.navbar-header
%button.navbar-toggle{ 'data-target' => '#repo-block-navbar-collapse', 'data-toggle' => 'collapse', type: 'button' }
%span.sr-only Toggle navigation
%span.icon-bar
%span.icon-bar
%span.icon-bar
/ Collect the nav links, forms, and other content for toggling
#repo-block-navbar-collapse.collapse.navbar-collapse
%ul.nav.navbar-nav
%li.dropdown
%a.dropdown{ href: '#', 'data-toggle' => 'dropdown' }
= fa_icon 'file-archive-o', class: 'fa-lg'
%span.caret
%ul.dropdown-menu{ role: 'menu' }
- file_name = "#{@project.name}-#{treeish}"
%li= link_to 'tar.gz', archive_path(project, file_name, 'tar.gz')
%li= link_to 'zip', archive_path(project, file_name, 'zip')
.navbar-left
%button.btn.navbar-btn.btn-default{ type: 'button', 'ng-click' => "clone_url = '#{http_url}'",
'ng-model' => "clone_url_protocol", 'btn-radio' => "'http'",
'ng-class' => '{"btn-info": clone_url_protocol == "http"}' } HTTP
%button.btn.navbar-btn.btn-default{ type: 'button', 'ng-click' => "clone_url = '#{ssh_url}'",
'ng-model' => "clone_url_protocol", 'btn-radio' => "'ssh'",
'ng-class' => '{"btn-info": clone_url_protocol == "ssh"}'} SSH
#git-help.navbar-text.navbar-left
%a.navbar-link{ 'ng-click' => 'is_collapsed_git_help = !is_collapsed_git_help' }
= fa_icon 'question', class: 'fa-lg'
%form#clone_url.navbar-form.navbar-left
.form-group
%input#clone-url.form-control{ readonly: 'readonly', spellcheck: false,
type: 'text', 'ng-model' => 'clone_url' }
.navbar-text.navbar-left{ title: t('layout.projects.git_help.question_title') }
%a#copy_to_clipboard.navbar-link{ 'data-clipboard-target' => 'clone-url' }
%i.fa.fa-clipboard.fa-lg
.navbar-text.navbar-left
= can?(:write, project) ? t("layout.read_write_access") : t("layout.read_access")
.navbar-right= render 'branch_select', project: project if act != :tags
%div{ collapse: "is_collapsed_git_help" }
.container
%p= t("layout.projects.git_help.cloning") + ":"
%p
- if current_user
%p{ 'ng-hide' => 'clone_url_protocol == "ssh"' }~ "git clone #{http_url} #{project.name}"
%p{ 'ng-hide' => 'clone_url_protocol == "http"' }~ "git clone #{ssh_url} #{project.name}"
%p~ "cd #{project.name}"
%p
%p= t("layout.projects.git_help.remote") + ":"
%p
- if current_user
%p{ 'ng-hide' => 'clone_url_protocol == "ssh"' }~ "git remote add #{project.name} #{http_url}"
%p{ 'ng-hide' => 'clone_url_protocol == "http"' }~ "git remote add #{project.name} #{ssh_url}"
%p~ "git fetch #{project.name}"
%p~ "git checkout -b my-local-tracking-branch #{project.name}/master_or_other_branch"
.container
.row
%ul.nav.nav-tabs{ role: 'tablist' }
%li{class: ('active' if act == :show && contr == :trees )}
= link_to t('project_menu.files'), tree_path(project, treeish)
%li{class: ('active' if act == :index && contr == :commits )}
= link_to t('project_menu.commits'), commits_path(project, treeish)
%li{class: ('active' if act == :branches && contr == :trees )}
= link_to t('project_menu.branches', count: '{{singleton.project.branches_count}}'), branch_path(project, branch)
%li.tags{class: ('active' if act == :tags && contr == :trees )}
= link_to t('project_menu.tags', count: project.repo.tags.count), tags_path(project)

78
app/views/projects/base/_repo_block.html.slim Normal file
View File

@ -0,0 +1,78 @@
- act = action_name.to_sym; contr = controller_name.to_sym; treeish = project.default_head(params[:treeish]); branch = @branch.try(:name) || project.default_head
-http_url = git_repo_url(project.name_with_owner)
-ssh_url = git_ssh_repo_url(project.name_with_owner)
div[ role = 'navigation' ng-controller = 'ProjectRepoBlockController' ng-cloak = true
ng-init = "init('#{ssh_url}', #{project.repo.branches.count})" ]
nav.navbar.navbar-default
.container-fluid
/ Brand and toggle get grouped for better mobile display
.navbar-header
button.navbar-toggle[ data-target = '#repo-block-navbar-collapse' data-toggle = 'collapse' type = 'button' ]
span.sr-only Toggle navigation
span.icon-bar
span.icon-bar
span.icon-bar
/ Collect the nav links, forms, and other content for toggling
#repo-block-navbar-collapse.collapse.navbar-collapse
ul.nav.navbar-nav
li.dropdown
a.dropdown href = '#' data-toggle = 'dropdown'
= fa_icon 'file-archive-o', class: 'fa-lg'
span.caret
ul.dropdown-menu role = 'menu'
- file_name = "#{@project.name}-#{treeish}"
li= link_to 'tar.gz', archive_path(project, file_name, 'tar.gz')
li= link_to 'zip', archive_path(project, file_name, 'zip')
.navbar-left
button.btn.navbar-btn.btn-default[ type = 'button' ng-click = "clone_url = '#{http_url}'"
ng-model = "clone_url_protocol" btn-radio = "'http'"
ng-class = '{"btn-info": clone_url_protocol == "http"}' ] HTTP
button.btn.navbar-btn.btn-default[ type = 'button' ng-click = "clone_url = '#{ssh_url}'"
ng-model = "clone_url_protocol" btn-radio = "'ssh'"
ng-class = '{"btn-info": clone_url_protocol == "ssh"}'] SSH
#git-help.navbar-text.navbar-left
a.navbar-link ng-click = 'is_collapsed_git_help = !is_collapsed_git_help'
= fa_icon 'question', class: 'fa-lg'
form#clone_url.navbar-form.navbar-left
.form-group
input#clone-url.form-control[ readonly = 'readonly' spellcheck = false
type = 'text' ng-model = 'clone_url' ]
.navbar-text.navbar-left title = t('layout.projects.git_help.question_title')
a#copy_to_clipboard.navbar-link data-clipboard-target = 'clone-url'
i.fa.fa-clipboard.fa-lg
.navbar-text.navbar-left
= can?(:write, project) ? t("layout.read_write_access") : t("layout.read_access")
.navbar-right== render 'branch_select', project: project if act != :tags
div collapse = "is_collapsed_git_help"
.container
p= t("layout.projects.git_help.cloning") + ":"
p
- if current_user
p[ ng-hide = 'clone_url_protocol == "ssh"']~ "git clone #{http_url} #{project.name}"
p[ ng-hide = 'clone_url_protocol == "http"']~ "git clone #{ssh_url} #{project.name}"
p~ "cd #{project.name}"
p
p= t("layout.projects.git_help.remote") + ":"
p
- if current_user
p[ ng-hide = 'clone_url_protocol == "ssh"' ]~ "git remote add #{project.name} #{http_url}"
p[ ng-hide = 'clone_url_protocol == "http"' ]~ "git remote add #{project.name} #{ssh_url}"
p~ "git fetch #{project.name}"
p~ "git checkout -b my-local-tracking-branch #{project.name}/master_or_other_branch"
.container
.row
ul.nav.nav-tabs role = 'tablist'
li class = ('active' if act == :show && contr == :trees )
= link_to t('project_menu.files'), tree_path(project, treeish)
li class = ('active' if act == :index && contr == :commits )
= link_to t('project_menu.commits'), commits_path(project, treeish)
li class = ('active' if act == :branches && contr == :trees )
= link_to t('project_menu.branches', count: '{{singleton.project.branches_count}}'), branch_path(project, branch)
li.tags class = ('active' if act == :tags && contr == :trees )
= link_to t('project_menu.tags', count: project.repo.tags.count), tags_path(project)

2
app/views/projects/base/_settings_menu.html.slim
View File

@ -1,7 +1,7 @@
- act = action_name.to_sym
- contr = controller_name.to_sym
ul.nav.nav-tabs.nav-justified.boffset20[ role = 'tablist' ]
ul.nav.nav-tabs.nav-justified.boffset10[ role = 'tablist' ]
- if can? :edit, @project
li[ class = "#{(act == :edit && contr == :projects) ? 'active' : ''}" ]
= link_to t("layout.projects.edit"), edit_project_path(@project)

4
app/views/projects/build_lists/_filter.html.haml
View File

@ -63,11 +63,11 @@
%h4= t 'layout.build_lists.id_search'
%input#filter_id.form-control{ name: 'filter{id}', size: '30', type: 'text', value: '{{params.filter.id}}' }
.clearfix
.col-md-4.col-sm-6.offset20
.col-md-4.col-sm-6.offset10
= label_tag :autoreload do
= check_box_tag :autoreload, true, true
= t 'layout.autoreload_page'
.col-md-4.col-sm-6.col-md-offset-4.offset20
.col-md-4.col-sm-6.col-md-offset-4.offset10
.btn-group.btn-group-justified
.btn-group{ 'ng-show' => 'isRequest' }
%button.btn.btn-default{ type: 'button', disabled: true }

2
app/views/projects/build_lists/index.html.haml
View File

@ -3,7 +3,7 @@
.col-xs-12.col-md-10.col-md-offset-1{ 'ng-controller' => 'BuildListsController',
'ng-init' => 'init()', 'ng-cloak' => true }
.row.offset20
.row.offset10
= render 'filter'
.row
%table.table.table-condensed

2
app/views/projects/build_lists/new_build/_extra_params_and_preferences.html.slim
View File

@ -5,7 +5,7 @@ h3= t('activerecord.attributes.build_list.extra_params.label')
placeholder: t("activerecord.attributes.build_list.extra_params.#{field}"),
class: 'form-control'
h3.offset20= t("activerecord.attributes.build_list.preferences")
h3.offset10= t("activerecord.attributes.build_list.preferences")
- selected = params[:build_list].try(:[], :auto_publish_status) ? {selected: params[:build_list][:auto_publish_status]} : {}
.form-group
= f.label :auto_publish_status

2
app/views/projects/build_lists/new_build/_include_repos.html.haml
View File

@ -1,5 +1,5 @@
%h4= t 'activerecord.attributes.build_list.build_for_platform'
.boffset20{ 'ng-repeat' => 'platform in newBuildCtrl.platforms',
.boffset10{ 'ng-repeat' => 'platform in newBuildCtrl.platforms',
'ng-hide' => 'newBuildCtrl.hidePlatform(platform)' }
%div
%h5 {{ platform.name }}

10
app/views/projects/build_lists/new_build/_new_form.html.haml
View File

@ -5,14 +5,14 @@
.col-md-4
%h4= t 'activerecord.attributes.build_list.save_to_repository'
%select.form-control.boffset20{ 'ng-model' => 'newBuildCtrl.save_to_repository',
%select.form-control.boffset10{ 'ng-model' => 'newBuildCtrl.save_to_repository',
'ng-options' => 'r.name for r in newBuildCtrl.save_to_repositories track by r.id',
'ng-change' => 'newBuildCtrl.selectSaveToRepository()',
name: 'build_list[save_to_repository_id]',
required: true }
%h4= t 'activerecord.attributes.build_list.project_version'
%select.form-control.boffset20{ 'ng-model' => 'newBuildCtrl.project_version',
%select.form-control.boffset10{ 'ng-model' => 'newBuildCtrl.project_version',
'ng-options' => 'v.name group by v.kind for v in newBuildCtrl.project_versions track by v.name',
'ng-change' => 'newBuildCtrl.selectProjectVersion()',
'ng-value' => 'newBuildCtrl.project_version',
@ -28,9 +28,9 @@
name: 'arches[]' }
{{ arch.name }}
%h4.offset20= t 'activerecord.attributes.build_list.update_type'
%h4.offset10= t 'activerecord.attributes.build_list.update_type'
- selected = params[:build_list].try(:[], :update_type) ? {selected: params[:build_list][:update_type]} : {}
= f.select :update_type, BuildList::UPDATE_TYPES, selected, class: 'form-control boffset20'
= f.select :update_type, BuildList::UPDATE_TYPES, selected, class: 'form-control boffset10'
%div{ 'ng-hide' => 'newBuildCtrl.is_build_for_main_platform' }
= render 'shared/autocomplete_form',
@ -52,7 +52,7 @@
= hidden_field_tag :from_build_list_id, params[:build_list_id] if params[:build_list_id].present?
= f.submit t('layout.projects.build_button'),
data: {'disable-with' => t('layout.processing')},
class: 'btn btn-primary offset20'
class: 'btn btn-primary offset10'
- content_for :additional_scripts do
= render 'projects/build_lists/new_build/init_service.js.erb'

4
app/views/projects/build_lists/show.html.slim
View File

@ -86,7 +86,7 @@ div[class = 'row'
= @build_list.update_type
tr
td.offset20.ng-hide ng-show='update_type_errors' colspan=2
td.offset10.ng-hide ng-show='update_type_errors' colspan=2
.flash_notify
.alert ng-class="{ 'alert-danger': update_type_errors }"
| {{ update_type_errors }}
@ -208,7 +208,7 @@ div[class = 'row'
.row
= render 'buttons', build_list: @build_list
.row.offset20 ng-show="build_list.status == #{BuildList::BUILD_STARTED}"
.row.offset10 ng-show="build_list.status == #{BuildList::BUILD_STARTED}"
= render 'shared/log', { build_started: true, get_log_path: log_build_list_path(@build_list) }
hr

2
app/views/projects/git/commits/_commit_diff.html.slim
View File

@ -1,6 +1,6 @@
- commit_id = commit_diff.deleted_file ? @commit.parents.first.id : @commit.id
- diff_counter_content = "diff-#{commit_diff_counter}_content"
.file.offset20
.file.offset10
a name = "diff-#{commit_diff_counter}"
.top
button.btn.btn-link.pull-left[ type = 'button'

2
app/views/projects/git/commits/index.html.slim
View File

@ -3,6 +3,6 @@
.col-xs-12.col-md-10.col-md-offset-1
.row
== render 'repo_block', project: @project
.offset20
.offset10
== render partial: 'commits', object: @commits
== render 'paginate' if @path.blank?

2
app/views/projects/git/trees/_branches.html.slim
View File

@ -10,7 +10,7 @@
input.form-control ng-model = 'query.ref' placeholder = t('layout.search.header')
.clearfix
table.table.table-hover.offset20
table.table.table-hover.offset10
tbody
tr ng-repeat = 'branch in branches | filter:query' ng-class = '{info: branch.ref == current_ref}'
td

2
app/views/projects/git/trees/_tags.html.slim
View File

@ -10,7 +10,7 @@
input.form-control ng-model = 'query.ref' placeholder = t('layout.search.header')
.clearfix
table.table.table-hover.offset20
table.table.table-hover.offset10
tbody
tr ng-repeat = 'tag in tags | filter:query'
td

4
app/views/projects/hooks/edit.html.slim
View File

@ -6,7 +6,7 @@
= render 'settings_menu'
= simple_form_for @hook, url: project_hooks_path(@project, @hook),
html: { class: 'form-horizontal offset20' },
html: { class: 'form-horizontal offset10' },
wrapper: :horizontal_form do |f|
h2= t("layout.hooks.services.#{@hook.name}")
@ -14,6 +14,6 @@
.col-sm-offset-3.col-sm-9
= f.button :submit, t('layout.update'), data: {'disable-with' => t('layout.processing')},
class: 'btn btn-primary boffset20'
class: 'btn btn-primary boffset10'
.col-sm-offset-3.col-sm-9= render "projects/hooks/docs/#{@hook.name}"

4
app/views/projects/hooks/new.html.slim
View File

@ -6,13 +6,13 @@
= render 'settings_menu'
= simple_form_for @hook, url: project_hooks_path(@project),
html: { class: 'form-horizontal offset20' },
html: { class: 'form-horizontal offset10' },
wrapper: :horizontal_form do |f|
h2= t("layout.hooks.services.#{@hook.name}")
= render "form", f: f
.col-sm-offset-3.col-sm-9
= f.button :submit, t('layout.create'), data: {'disable-with' => t('layout.saving')},
class: 'btn btn-primary boffset20'
class: 'btn btn-primary boffset10'
.col-sm-offset-3.col-sm-9= render "projects/hooks/docs/#{@hook.name}"

2
app/views/projects/hooks/show.html.slim
View File

@ -11,7 +11,7 @@
= link_to t('layout.create'),
new_project_hook_path(@project, hook: {name: @name}),
class: 'btn btn-primary boffset20'
class: 'btn btn-primary boffset10'
.clearfix

2
app/views/projects/issues/_choose_assignee.html.slim
View File

@ -19,4 +19,4 @@
typeahead-on-select = "issueCtrl.selectAssignee($item, $model, $label)"
typeahead-template-url = "search_collaborators.html" ]
.clearfix
.offset20
.offset10

4
app/views/projects/issues/_header.html.slim
View File

@ -1,4 +1,4 @@
.offset20 ng-hide='issueCtrl.edit'
.offset10 ng-hide='issueCtrl.edit'
h3#issue_title_text
= @issue.title
.panel.panel-default
@ -31,7 +31,7 @@
== render "projects/comments/add", project: @project, commentable: @issue
- if can?(:update, @issue)
.offset20 ng-show = 'issueCtrl.edit'
.offset10 ng-show = 'issueCtrl.edit'
h3= t('layout.issues.edit_header')
= simple_form_for @issue, url: project_issue_path(@project, @issue) do |f|

2
app/views/projects/issues/_user_container.html.slim
View File

@ -10,6 +10,6 @@
-if can?(:write, @project)
input.hidden name = 'issue[assignee_id]' ng-value = 'issueCtrl.assignee.id'
a< href = ''
i [ class = 'fa fa-share-square-o boffset20'
i [ class = 'fa fa-share-square-o boffset10'
ng-click = 'issueCtrl.toggle_manage_assignee = !issueCtrl.toggle_manage_assignee' ]

4
app/views/projects/issues/index.html.slim
View File

@ -3,9 +3,9 @@
.col-xs-12.col-md-10.col-md-offset-1 ng-controller = 'IssuesController as issuesCtrl' ng-cloak = true
.row
.col-md-3.col-sm-4.offset20
.col-md-3.col-sm-4.offset10
== render 'index_sidebar', project: @project
.col-md-9.col-sm-8.offset20
.col-md-9.col-sm-8.offset10
tabset.boffset10
tab[ heading = "#{t "layout.issues.statuses.open"} ({{issuesCtrl.filter.opened_count}})"
active = 'issuesCtrl.filter.status_open'

4
app/views/projects/issues/new.html.slim
View File

@ -6,11 +6,11 @@
.row
- can_write = can?(:write, @project)
- if can_write
.col-md-3.col-sm-4.offset20
.col-md-3.col-sm-4.offset10
== render 'select_labels'
== render 'manage_labels'
.col-md-9.col-sm-8.offset20[ class = "#{'col-md-offset-2' unless can_write}" ]
.col-md-9.col-sm-8.offset10[ class = "#{'col-md-offset-2' unless can_write}" ]
h3= title t('layout.issues.create_header')
== render 'form', f: f
= submit_tag t('layout.create'),

2
app/views/projects/issues/show.html.slim
View File

@ -4,7 +4,7 @@
.col-xs-12.col-md-10.col-md-offset-1 ng-controller = 'IssueController as issueCtrl' ng-cloak = true
.row
.col-md-3.col-sm-4.offset20
.col-md-3.col-sm-4.offset10
== render 'status_sidebar'
- if can?(:write, @project)
= simple_form_for @issue, url: project_issue_path(@project, @issue) do |f|

2
app/views/projects/projects/_aliases.html.slim
View File

@ -2,7 +2,7 @@
h3= t('.header')
table.table.table-condensed.offset20
table.table.table-condensed.offset10
thead
tr
th= t('.name')

2
app/views/projects/projects/_build_schedule.html.slim
View File

@ -12,7 +12,7 @@
ng-init = "autostart_status = '#{@project.autostart_status}'" ]
option[ value = '' ]
table.table.table-condensed.offset20
table.table.table-condensed.offset10
thead
tr
th= t('activerecord.attributes.repository.name')

4
app/views/projects/projects/_filters.html.haml
View File

@ -2,11 +2,11 @@
%input.form-control{ name: 'search', size: '30', type: 'text', 'ng-model' => 'search',
placeholder: t('layout.find_project'), 'ng-change' => 'getProjects()' }
- if can?(:create, Project)
%hr.offset20
%hr.offset10
%p= link_to t('layout.projects.new'), new_project_path, class: 'btn btn-primary'
- if can?(:mass_import, Project)
%p= link_to t('layout.projects.mass_import'), mass_import_projects_path, class: 'btn btn-primary'
%hr.offset20
%hr.offset10
%h3=t('layout.relations.filters')
%ul.nav.nav-pills.nav-stacked
- options_for_filters(@projects, @groups, @owners).each do |options|

2
app/views/projects/projects/index.html.slim
View File

@ -1,6 +1,6 @@
-set_meta_tags title: t('layout.projects.list_header')
.col-xs-12.col-md-10.col-md-offset-1 ng-controller = 'ProjectsCtrl'
.row.offset20
.row.offset10
.col-md-3.col-sm-4== render 'filters'
.col-md-9.col-sm-8
.toolbar

2
app/views/projects/pull_requests/_discussion_comments.html.slim
View File

@ -1,5 +1,5 @@
-comment = item[1].first
.panel.panel-default.offset20
.panel.panel-default.offset10
.panel-heading
=comment.data[:view_path]
.pull-right

2
app/views/projects/pull_requests/_pull_diff.html.slim
View File

@ -1,7 +1,7 @@
- commit_id = pull_diff.deleted_file ? @pull.to_commit.id : @pull.from_commit.id
- diff_counter = "diff-#{pull_diff_counter}"
- diff_counter_content = "#{diff_counter}_content"
.file.offset20
.file.offset10
a name = diff_counter
.top
button.btn.btn-link.pull-left[ type = 'button'

10
app/views/projects/pull_requests/new.html.slim
View File

@ -16,7 +16,7 @@
= simple_form_for @pull, url: (@pull.already? ? new_project_pull_request_path : project_pull_requests_path),
html: {method: (@pull.already? ? :get : :post)} do |f|
.form-group.offset20
.form-group.offset10
= f.label :from_project, t("#{ar}.from_project"), class: 'col-sm-2 control-label'
.col-sm-10
.row
@ -40,13 +40,13 @@
.form-group
.col-sm-offset-2.col-sm-10
= f.submit t('.update'), class: 'btn btn-primary offset20',
= f.submit t('.update'), class: 'btn btn-primary offset10',
style: @pull.already? ? '' : 'display: none;',
id: 'update_pull', data: {'disable-with' => t('layout.processing')}
-unless @pull.already?
.clearfix
.offset20 ng-controller = 'IssueController as issueCtrl' ng-cloak = true
.offset10 ng-controller = 'IssueController as issueCtrl' ng-cloak = true
= f.fields_for :issue do |issue|
== render 'projects/issues/form', f: issue
.form-group
@ -55,11 +55,11 @@
data: {'disable-with' => t('layout.processing')} unless @pull.already?
- if !@pull.already? && @stats != nil
#diff.tab-pane
.offset20.content
.offset10.content
== render 'diff_tab'
#commits.tab-pane
.offset20.content
.offset10.content
== render 'commits_tab'
- content_for :additional_scripts do

10
app/views/projects/pull_requests/show.html.slim
View File

@ -24,15 +24,15 @@
- if current_user
hr
== render 'projects/comments/add', project: @project, commentable: @issue
.pull_status.offset20== render 'status'
.pull_status.offset10== render 'status'
#diff.tab-pane
.offset20.content ng-hide = 'pullCtrl.processing'
i.fa.fa-spinner.fa-spin.fa-lg.offset20 ng-show = 'pullCtrl.processing'
.offset10.content ng-hide = 'pullCtrl.processing'
i.fa.fa-spinner.fa-spin.fa-lg.offset10 ng-show = 'pullCtrl.processing'
#commits.tab-pane
.offset20.content ng-hide = 'pullCtrl.processing'
i.fa.fa-spinner.fa-spin.fa-lg.offset20 ng-show = 'pullCtrl.processing'
.offset10.content ng-hide = 'pullCtrl.processing'
i.fa.fa-spinner.fa-spin.fa-lg.offset10 ng-show = 'pullCtrl.processing'
div ng-non-bindable = true
== render 'projects/comments/new_line'

2
app/views/projects/wiki/compare.html.slim
View File

@ -15,7 +15,7 @@
strong= @page.name
- else
= t('wiki.wiki_history')
.col-md-6.offset20
.col-md-6.offset10
= simple_form_for :project, url: revert_path(@project, @versions.first[0..6], (@versions.size == 1) ? 'prev' : @versions.last[0..6], @name) do |f|
- if can? :read, @project
a.btn.btn-primary> href=(@name ? history_project_wiki_path(@project, escaped_name) : history_project_wiki_index_path(@project))

2
app/views/projects/wiki/edit.html.slim
View File

@ -14,7 +14,7 @@
=> t('wiki.editing_page')
strong= @page.name
- if can? :read, @project
.col-md-4.offset20
.col-md-4.offset10
a.btn.btn-primary> href=view_path(@project, escaped_name)
= t('wiki.view_page')
a.btn.btn-primary> href=history_project_wiki_path(@project, escaped_name)

2
app/views/projects/wiki/search.html.slim
View File

@ -14,7 +14,7 @@
strong= @query
= raw t("wiki.search_results_for", query: @st_query)
- if can? :read, @project
.col-md-2.offset20
.col-md-2.offset10
a.btn.btn-primary href=project_wiki_index_path(@project)
= t('wiki.home')
hr

2
app/views/projects/wiki/show.html.slim
View File

@ -13,7 +13,7 @@
= @page.name
= "(#{ t("wiki.preview") })" if action_name == 'preview'
- unless action_name == 'preview'
.col-md-8.offset20
.col-md-8.offset10
a.btn.btn-primary> href=history_project_wiki_path(@project, escaped_name)
= t('wiki.page_history')
- if @editable

2
app/views/search/index.html.slim
View File

@ -2,7 +2,7 @@
.col-md-3.col-md-offset-1
h3
= t('.advanced')
.col-md-7.offset20
.col-md-7.offset10
= simple_form_for @search, url: search_index_path, method: :get do |f|
.row
.col-md-6

4
app/views/users/profile/show.html.slim
View File

@ -53,9 +53,9 @@
a href="#"
= t('top_menu.statistics')
.offset20 ng-show="tab == 'projects'" ng-controller='ProfileController' ng-cloak = true
.offset10 ng-show="tab == 'projects'" ng-controller='ProfileController' ng-cloak = true
= render 'projects', subject: @user
#manage-statistics.offset20[ ng-show = "tab == 'statistics'"
#manage-statistics.offset10[ ng-show = "tab == 'statistics'"
ng-controller = 'StatisticsController'
ng-cloak = true ]
= render 'statistics'

14
vendor/assets/stylesheets/timeline.scss vendored
View File

@ -29,7 +29,7 @@ Component: timeline
--------------------
*/
.timeline {
margin: 0 0 30px 0;
margin: 0 0 10px 0;
padding: 0;
list-style: none;
}
@ -49,8 +49,8 @@ Component: timeline
}
.timeline > li {
position: relative;
margin-right: 10px;
margin-bottom: 15px;
margin-right: 5px;
margin-top: 5px;
}
.timeline > li:before,
.timeline > li:after {
@ -61,12 +61,12 @@ Component: timeline
clear: both;
}
.timeline > li > .timeline-item {
margin-top: 10px;
margin-top: 5px;
border: 0px solid #b2b2b2;
background: #fff;
color: #555;
margin-left: 60px;
margin-right: 15px;
margin-right: 8px;
padding: 5px;
position: relative;
box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.2);
@ -88,11 +88,11 @@ Component: timeline
font-weight: 600;
}
.timeline > li > .timeline-item > .timeline-header > a > img {
margin: 0 10px 0 10px;
margin: 0 5px;
}
.timeline > li > .timeline-item > .timeline-body,
.timeline > li > .timeline-item > .timeline-footer {
padding: 5px 10px 5px 10px;
padding: 0 8px;
}
.timeline > li.time-label > span {
font-weight: 600;