--- src/app/stylesheets/_buttons.scss | 1 - src/app/stylesheets/layout.scss | 4 ++-- src/app/views/layouts/application.html.haml | 2 ++ src/public/stylesheets/layout_ie8.css | 3 +++ 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/app/stylesheets/_buttons.scss b/src/app/stylesheets/_buttons.scss index ae5cb00..08ce5da 100644 --- a/src/app/stylesheets/_buttons.scss +++ b/src/app/stylesheets/_buttons.scss @@ -298,7 +298,6 @@ Application Button Set background: url(../../images/deployment_large_icon_provider_white.png) 12px center no-repeat, -o-linear-gradient(top, #ace3ac 0%,#5ab45c 100%); /* Opera 11.10+ */ background: url(../../images/deployment_large_icon_provider_white.png) 12px center no-repeat, -ms-linear-gradient(top, #ace3ac 0%,#5ab45c 100%); /* IE10+ */ background: url(../../images/deployment_large_icon_provider_white.png) 12px center no-repeat, linear-gradient(top, #ace3ac 0%,#5ab45c 100%); /* W3C */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ace3ac', endColorstr='#5ab45c',GradientType=0 ); /* IE6-9 */ &:active{ background: #458944; /* Old browsers */ background: url(../../images/deployment_large_icon_provider_white.png) 12px center no-repeat, -moz-linear-gradient(top, #9ecc9b 0%, #458944 100%); /* FF3.6+ */ diff --git a/src/app/stylesheets/layout.scss b/src/app/stylesheets/layout.scss index f5e4f25..db94d8c 100644 --- a/src/app/stylesheets/layout.scss +++ b/src/app/stylesheets/layout.scss @@ -1,8 +1,6 @@ @import "reset"; @import "compass/reset"; @import "converge-ui/composites/shell"; -@import "converge-ui/components/forms"; -@import "converge-ui/components/buttons"; @import "mixins"; @import "helpers"; @import "buttons"; @@ -335,6 +333,7 @@ Page Header -- v.0.0.1 [header] (header.scss) & > *{ vertical-align: middle; } float: right; margin: 13px 7px 12px 24px; + min-height: 18px; } ul#provider_select{ @@ -2042,6 +2041,7 @@ form.filterable-data{ padding: 3px 4px; @include gradient-bg($cell_color_base, $cell_color_header); &:after{ content: ""; } + img {vertical-align:middle;} } ul{ display: none; diff --git a/src/app/views/layouts/application.html.haml b/src/app/views/layouts/application.html.haml index 1a00936..d76f83f 100644 --- a/src/app/views/layouts/application.html.haml +++ b/src/app/views/layouts/application.html.haml @@ -5,6 +5,8 @@ = content_for :stylesheets_block do = stylesheet_link_tag '/stylesheets/compiled/layout.css' = stylesheet_link_tag 'jquery.ui-1.8.1/jquery-ui-1.8.1.custom.css' + /[if lt IE 10] + = stylesheet_link_tag '/stylesheets/layout_ie9.css' /[if lt IE 9] = javascript_include_tag 'https://html5shiv.googlecode.com/svn/trunk/html5.js' = stylesheet_link_tag '/stylesheets/layout_ie8.css' diff --git a/src/public/stylesheets/layout_ie8.css b/src/public/stylesheets/layout_ie8.css index 8214928..1fb6139 100644 --- a/src/public/stylesheets/layout_ie8.css +++ b/src/public/stylesheets/layout_ie8.css @@ -28,3 +28,6 @@ section.maincontent { table.provider-selection-strategies td { filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#666666', endColorstr='#535353',GradientType=0 ); /* IE6-9 */ } + +/* Launch deployment button */ +#launch_deployment_button { padding: 13px 29px 9px 29px; } -- 1.7.11.7