From c25e40a89cfb9cf38273ac7b6c279d3655c95c0a Mon Sep 17 00:00:00 2001 From: Alexander Machehin Date: Wed, 27 May 2015 15:47:17 +0500 Subject: [PATCH] bootsrapXL: change monitoring page --- app/assets/stylesheets/BootstrapXL.css | 678 ++++++++++++++++++ app/assets/stylesheets/new_application.scss | 1 + .../projects/build_lists/_filter.html.slim | 12 +- .../projects/build_lists/index.html.slim | 4 +- 4 files changed, 687 insertions(+), 8 deletions(-) create mode 100644 app/assets/stylesheets/BootstrapXL.css diff --git a/app/assets/stylesheets/BootstrapXL.css b/app/assets/stylesheets/BootstrapXL.css new file mode 100644 index 000000000..18426588b --- /dev/null +++ b/app/assets/stylesheets/BootstrapXL.css @@ -0,0 +1,678 @@ +/* +* CSS file with Bootstrap grid classes for screens bigger than 1600px. Just add this file after the Bootstrap CSS file and you will be able to use col-xl, col-xl-push, hidden-xl, etc. +* +* Author: Marc van Nieuwenhuijzen +* Company: WebVakman +* Site: WebVakman.nl +* +*/ +.visible-xs, +.visible-xs-block, +.visible-xs-inline, +.visible-xs-inline-block, +.visible-sm, +.visible-sm-block, +.visible-sm-inline, +.visible-sm-inline-block, +.visible-md, +.visible-md-block, +.visible-md-inline, +.visible-md-inline-block, +.visible-lg, +.visible-lg-block, +.visible-lg-inline, +.visible-lg-inline-block, +.visible-xl, +.visible-xl-block, +.visible-xl-inline, +.visible-xl-inline-block, +.visible-xx, +.visible-xx-block, +.visible-xx-inline, +.visible-xx-inline-block { + display: none !important; +} + +@media (max-width: 768px) { + .visible-xs { + display: block !important; + } + + table.visible-xs { + display: table; + } + + tr.visible-xs { + display: table-row !important; + } + + th.visible-xs, td.visible-xs { + display: table-cell !important; + } + + .visible-xs-block { + display: block !important; + } + + .visible-xs-inline { + display: inline !important; + } + + .visible-xs-inline-block { + display: inline-block !important; + } + + .hidden-xs { + display: none !important; + } +} + +@media (min-width: 768px) and (max-width: 991px) { + .visible-sm { + display: block !important; + } + + table.visible-sm { + display: table; + } + + tr.visible-sm { + display: table-row !important; + } + + th.visible-sm, td.visible-sm { + display: table-cell !important; + } + + .visible-sm-block { + display: block !important; + } + + .visible-sm-inline { + display: inline !important; + } + + .visible-sm-inline-block { + display: inline-block !important; + } + + .hidden-sm { + display: none !important; + } +} + +@media (min-width: 992px) and (max-width: 1199px) { + .visible-md { + display: block !important; + } + + table.visible-md { + display: table; + } + + tr.visible-md { + display: table-row !important; + } + + th.visible-md, td.visible-md { + display: table-cell !important; + } + + .visible-md-block { + display: block !important; + } + + .visible-md-inline { + display: inline !important; + } + + .visible-md-inline-block { + display: inline-block !important; + } + + .hidden-md { + display: none !important; + } +} + +@media (min-width: 1200px) { + .col-lg-3 { + width: 25%; + } + + .visible-lg { + display: block !important; + } + + table.visible-lg { + display: table; + } + + tr.visible-lg { + display: table-row !important; + } + + th.visible-lg, td.visible-lg { + display: table-cell !important; + } + + .visible-lg-block { + display: block !important; + } + + .visible-lg-inline { + display: inline !important; + } + + .visible-lg-inline-block { + display: inline-block !important; + } + + .hidden-lg { + display: none !important; + } +} + +@media (min-width: 1600px) { + .visible-lg { + display: none !important; + } +} + +@media (min-width: 1600px) { + .container { + width: 1570px; + } + + .col-xl-1, .col-xl-2, .col-xl-3, .col-xl-4, .col-xl-5, .col-xl-6, .col-xl-7, .col-xl-8, .col-xl-9, .col-xl-10, .col-xl-11, .col-xl-12 { + float: left; + } + + .col-xl-12 { + width: 100%; + } + + .col-xl-11 { + width: 91.66666667%; + } + + .col-xl-10 { + width: 83.33333333%; + } + + .col-xl-9 { + width: 75%; + } + + .col-xl-8 { + width: 66.66666667%; + } + + .col-xl-7 { + width: 58.33333333%; + } + + .col-xl-6 { + width: 50%; + } + + .col-xl-5 { + width: 41.66666667%; + } + + .col-xl-4 { + width: 33.33333333%; + } + + .col-xl-3 { + width: 25%; + } + + .col-xl-2 { + width: 16.66666667%; + } + + .col-xl-1 { + width: 8.33333333%; + } + + .col-xl-pull-12 { + right: 100%; + } + + .col-xl-pull-11 { + right: 91.66666667%; + } + + .col-xl-pull-10 { + right: 83.33333333%; + } + + .col-xl-pull-9 { + right: 75%; + } + + .col-xl-pull-8 { + right: 66.66666667%; + } + + .col-xl-pull-7 { + right: 58.33333333%; + } + + .col-xl-pull-6 { + right: 50%; + } + + .col-xl-pull-5 { + right: 41.66666667%; + } + + .col-xl-pull-4 { + right: 33.33333333%; + } + + .col-xl-pull-3 { + right: 25%; + } + + .col-xl-pull-2 { + right: 16.66666667%; + } + + .col-xl-pull-1 { + right: 8.33333333%; + } + + .col-xl-pull-0 { + right: auto; + } + + .col-xl-push-12 { + left: 100%; + } + + .col-xl-push-11 { + left: 91.66666667%; + } + + .col-xl-push-10 { + left: 83.33333333%; + } + + .col-xl-push-9 { + left: 75%; + } + + .col-xl-push-8 { + left: 66.66666667%; + } + + .col-xl-push-7 { + left: 58.33333333%; + } + + .col-xl-push-6 { + left: 50%; + } + + .col-xl-push-5 { + left: 41.66666667%; + } + + .col-xl-push-4 { + left: 33.33333333%; + } + + .col-xl-push-3 { + left: 25%; + } + + .col-xl-push-2 { + left: 16.66666667%; + } + + .col-xl-push-1 { + left: 8.33333333%; + } + + .col-xl-push-0 { + left: auto; + } + + .col-xl-offset-12 { + margin-left: 100%; + } + + .col-xl-offset-11 { + margin-left: 91.66666667%; + } + + .col-xl-offset-10 { + margin-left: 83.33333333%; + } + + .col-xl-offset-9 { + margin-left: 75%; + } + + .col-xl-offset-8 { + margin-left: 66.66666667%; + } + + .col-xl-offset-7 { + margin-left: 58.33333333%; + } + + .col-xl-offset-6 { + margin-left: 50%; + } + + .col-xl-offset-5 { + margin-left: 41.66666667%; + } + + .col-xl-offset-4 { + margin-left: 33.33333333%; + } + + .col-xl-offset-3 { + margin-left: 25%; + } + + .col-xl-offset-2 { + margin-left: 16.66666667%; + } + + .col-xl-offset-1 { + margin-left: 8.33333333%; + } + + .col-xl-offset-0 { + margin-left: 0; + } + + .visible-xl { + display: block !important; + } + + table.visible-xl { + display: table; + } + + tr.visible-xl { + display: table-row !important; + } + + th.visible-xl, td.visible-xl { + display: table-cell !important; + } + + .visible-xl-block { + display: block !important; + } + + .visible-xl-inline { + display: inline !important; + } + + .visible-xl-inline-block { + display: inline-block !important; + } + + .hidden-xl { + display: none !important; + } +} + +@media (min-width: 2048px) { + .visible-xl { + display: none !important; + } +} + +@media (min-width: 2048px) { + .container { + width: 1570px; + } + + .col-xx-1, .col-xx-2, .col-xx-3, .col-xx-4, .col-xx-5, .col-xx-6, .col-xx-7, .col-xx-8, .col-xx-9, .col-xx-10, .col-xx-11, .col-xx-12 { + float: left; + } + + .col-xx-12 { + width: 100%; + } + + .col-xx-11 { + width: 91.66666667%; + } + + .col-xx-10 { + width: 83.33333333%; + } + + .col-xx-9 { + width: 75%; + } + + .col-xx-8 { + width: 66.66666667%; + } + + .col-xx-7 { + width: 58.33333333%; + } + + .col-xx-6 { + width: 50%; + } + + .col-xx-5 { + width: 41.66666667%; + } + + .col-xx-4 { + width: 33.33333333%; + } + + .col-xx-3 { + width: 25%; + } + + .col-xx-2 { + width: 16.66666667%; + } + + .col-xx-1 { + width: 8.33333333%; + } + + .col-xx-pull-12 { + right: 100%; + } + + .col-xx-pull-11 { + right: 91.66666667%; + } + + .col-xx-pull-10 { + right: 83.33333333%; + } + + .col-xx-pull-9 { + right: 75%; + } + + .col-xx-pull-8 { + right: 66.66666667%; + } + + .col-xx-pull-7 { + right: 58.33333333%; + } + + .col-xx-pull-6 { + right: 50%; + } + + .col-xx-pull-5 { + right: 41.66666667%; + } + + .col-xx-pull-4 { + right: 33.33333333%; + } + + .col-xx-pull-3 { + right: 25%; + } + + .col-xx-pull-2 { + right: 16.66666667%; + } + + .col-xx-pull-1 { + right: 8.33333333%; + } + + .col-xx-pull-0 { + right: auto; + } + + .col-xx-push-12 { + left: 100%; + } + + .col-xx-push-11 { + left: 91.66666667%; + } + + .col-xx-push-10 { + left: 83.33333333%; + } + + .col-xx-push-9 { + left: 75%; + } + + .col-xx-push-8 { + left: 66.66666667%; + } + + .col-xx-push-7 { + left: 58.33333333%; + } + + .col-xx-push-6 { + left: 50%; + } + + .col-xx-push-5 { + left: 41.66666667%; + } + + .col-xx-push-4 { + left: 33.33333333%; + } + + .col-xx-push-3 { + left: 25%; + } + + .col-xx-push-2 { + left: 16.66666667%; + } + + .col-xx-push-1 { + left: 8.33333333%; + } + + .col-xx-push-0 { + left: auto; + } + + .col-xx-offset-12 { + margin-left: 100%; + } + + .col-xx-offset-11 { + margin-left: 91.66666667%; + } + + .col-xx-offset-10 { + margin-left: 83.33333333%; + } + + .col-xx-offset-9 { + margin-left: 75%; + } + + .col-xx-offset-8 { + margin-left: 66.66666667%; + } + + .col-xx-offset-7 { + margin-left: 58.33333333%; + } + + .col-xx-offset-6 { + margin-left: 50%; + } + + .col-xx-offset-5 { + margin-left: 41.66666667%; + } + + .col-xx-offset-4 { + margin-left: 33.33333333%; + } + + .col-xx-offset-3 { + margin-left: 25%; + } + + .col-xx-offset-2 { + margin-left: 16.66666667%; + } + + .col-xx-offset-1 { + margin-left: 8.33333333%; + } + + .col-xx-offset-0 { + margin-left: 0; + } + + .visible-xx { + display: block !important; + } + + table.visible-xx { + display: table; + } + + tr.visible-xx { + display: table-row !important; + } + + th.visible-xx, td.visible-xx { + display: table-cell !important; + } + + .visible-xx-block { + display: block !important; + } + + .visible-xx-inline { + display: inline !important; + } + + .visible-xx-inline-block { + display: inline-block !important; + } + + .hidden-xx { + display: none !important; + } +} \ No newline at end of file diff --git a/app/assets/stylesheets/new_application.scss b/app/assets/stylesheets/new_application.scss index 378495ad7..fe8cc852f 100644 --- a/app/assets/stylesheets/new_application.scss +++ b/app/assets/stylesheets/new_application.scss @@ -37,6 +37,7 @@ $navbar-inverse-toggle-border-color: #ddd; @import "bootstrap-sprockets"; @import "bootstrap"; +@import "BootstrapXL"; @import "custom_bootstrap"; @import "timeline"; @import "font-awesome"; diff --git a/app/views/projects/build_lists/_filter.html.slim b/app/views/projects/build_lists/_filter.html.slim index dc79e543d..e7cb640ff 100644 --- a/app/views/projects/build_lists/_filter.html.slim +++ b/app/views/projects/build_lists/_filter.html.slim @@ -7,7 +7,7 @@ .panel-body ng-show = 'isOpenFilters' = form_for :filter, html: { class: :form, id: 'monitoring_filter' }, authenticity_token: false do |f| .row - .col-lg-12.col-md-4 + .col-xl-12.col-md-4 h4= t 'layout.build_lists.ownership.header' =f.hidden_field :ownership, value: '{{params.filter.ownership}}' if current_user .btn-group.btn-group-justified @@ -32,7 +32,7 @@ { include_blank: true }, html_options.merge(id: 'status', 'ng-model' => 'params.filter.status') - .col-lg-12.col-md-4 + .col-xl-12.col-md-4 h4= t 'activerecord.models.platform' = f.select :save_to_platform_id, filter_by_save_to_platform, { include_blank: true }, @@ -46,10 +46,10 @@ = f.select :mass_build_id, mass_build_options, { include_blank: true }, html_options.merge(id: 'mass_build', 'ng-model' => 'params.filter.mass_build_id') - .col-lg-12.col-md-4 + .col-xl-12.col-md-4 .row ng-controller = 'DatePickerController as datePickerCtrl' -[:updated_at_start, :updated_at_end].each do |attr| - .col-lg-12.col-md-6 + .col-xl-12.col-md-6 h4= t attr == :updated_at_start ? '_on' : 'until' = f.text_field attr, size: 10, class: 'form-control', 'datepicker-popup' => '{{datePickerCtrl.format}}', @@ -75,11 +75,11 @@ disabled = @project.present? ] .clearfix - .col-lg-12.col-md-4.offset10 + .col-xl-12.col-md-4.offset10 = label_tag :autoreload do = check_box_tag :autoreload, true, true = t 'layout.autoreload_page' - .col-lg-12.col-lg-offset-0.col-md-4.col-md-offset-4.offset10 + .col-xl-12.col-xl-offset-0.col-md-4.col-md-offset-4.offset10 .btn-group.btn-group-justified .btn-group ng-show = 'isRequest' button.btn.btn-default type = 'button' disabled = true diff --git a/app/views/projects/build_lists/index.html.slim b/app/views/projects/build_lists/index.html.slim index f90a10da5..31fa65765 100644 --- a/app/views/projects/build_lists/index.html.slim +++ b/app/views/projects/build_lists/index.html.slim @@ -2,7 +2,7 @@ .row.offset10 ng-controller = 'BuildListsController' ng-init = 'init()' ng-cloak = true = hidden_field_tag :name_with_owner, @project.try(:name_with_owner) - .col-lg-2.col-sm-12 + .col-xl-2.col-sm-12 -if @project && policy(@project.build_lists.build).create? button.btn.btn-primary.btn-block[ id = 'filter_new_build' @@ -12,7 +12,7 @@ =< t('layout.build_lists.new_header') .offset10 == render 'filter' - .col-lg-10.col-sm-12 + .col-xl-10.col-sm-12 table.table.table-condensed thead tr