# HG changeset patch # User Thierry Florac # Date 1426867937 -3600 # Node ID e5e706f6c489e9d593d39e11e2f127f2dbe43af1 # Parent c9c67ada3b8635b3e2866300c43661fa31ba25a3 Updated CSS diff -r c9c67ada3b86 -r e5e706f6c489 src/pyams_skin/resources/css/myams.css --- a/src/pyams_skin/resources/css/myams.css Wed Mar 11 21:11:09 2015 +0100 +++ b/src/pyams_skin/resources/css/myams.css Fri Mar 20 17:12:17 2015 +0100 @@ -2,7 +2,7 @@ * MyAMS * « My Application Management Skin » * - * $Tag: 0.1.13 $ + * $Tag$ * A bootstrap based application/administration skin * * Custom administration and application skin tools @@ -3033,22 +3033,22 @@ */ @font-face { font-family: 'Ubuntu'; - src: url('fonts/Ubuntu-C.eot'); - src: url('fonts/Ubuntu-C.eot?#iefix') format('embedded-opentype'), url('fonts/Ubuntu-C.woff') format('woff'), url('fonts/Ubuntu-C.ttf') format('truetype'), url('fonts/Ubuntu-C.svg') format('svg'); + src: url('./fonts/Ubuntu-C.eot'); + src: url('./fonts/Ubuntu-C.eot?#iefix') format('embedded-opentype'), url('./fonts/Ubuntu-C.woff') format('woff'), url('./fonts/Ubuntu-C.ttf') format('truetype'), url('./fonts/Ubuntu-C.svg') format('svg'); font-weight: normal; font-style: normal; } @font-face { font-family: 'Ubuntu-Light'; - src: url('fonts/Ubuntu-L.eot'); - src: url('fonts/Ubuntu-L.eot?#iefix') format('embedded-opentype'), url('fonts/Ubuntu-L.woff') format('woff'), url('fonts/Ubuntu-L.ttf') format('truetype'), url('fonts/Ubuntu-L.svg') format('svg'); + src: url('./fonts/Ubuntu-L.eot'); + src: url('./fonts/Ubuntu-L.eot?#iefix') format('embedded-opentype'), url('./fonts/Ubuntu-L.woff') format('woff'), url('./fonts/Ubuntu-L.ttf') format('truetype'), url('./fonts/Ubuntu-L.svg') format('svg'); font-weight: normal; font-style: normal; } @font-face { font-family: 'Ubuntu-Bold'; - src: url('fonts/Ubuntu-B.eot'); - src: url('fonts/Ubuntu-B.eot?#iefix') format('embedded-opentype'), url('fonts/Ubuntu-B.woff') format('woff'), url('fonts/Ubuntu-B.ttf') format('truetype'), url('fonts/Ubuntu-B.svg') format('svg'); + src: url('./fonts/Ubuntu-B.eot'); + src: url('./fonts/Ubuntu-B.eot?#iefix') format('embedded-opentype'), url('./fonts/Ubuntu-B.woff') format('woff'), url('./fonts/Ubuntu-B.ttf') format('truetype'), url('./fonts/Ubuntu-B.svg') format('svg'); font-weight: bold; font-style: normal; } @@ -3714,6 +3714,7 @@ background: -webkit-gradient(linear, top left, top right, from(#829db0), to(#6f8696)); background: -webkit-linear-gradient(left, #829db0 93%, #6f8696 100%); background: linear-gradient(to right, #829db0 93%, #6f8696 100%);*/ + } #header { display: block; @@ -4325,9 +4326,11 @@ } .login-info span { /*height: 38px;*/ + display: inline-block; padding: 0 0 0 10px; /*border-bottom: 1px solid #1A1817;*/ + } .login-info span a.btn-success { margin-top: -10px; @@ -4395,6 +4398,7 @@ overflow: visible; /*border-bottom: 1px solid #1A1817; border-top: 1px solid #525151;*/ + } .minified #left-panel > ul > li > ul::before, .minified nav > ul > li > ul::before { @@ -4501,6 +4505,7 @@ .minified nav > ul > li > ul > li { background-color: rgba(91, 103, 113, 0.8); /*background-color: rgba(69, 69, 69, .9);*/ + } .minified #left-panel > ul > li > ul > li > ul > li, .minified nav > ul > li > ul > li > ul > li { @@ -9099,6 +9104,9 @@ .ams-form .input.with-icons .icon-append-2 + input { padding-right: 60px; } +.ams-form .input-file { + position: relative; +} .ams-form .input-file .button { position: absolute; top: 3px; @@ -10477,13 +10485,16 @@ .btn-header a { margin-top: 9px!important; /*width: 40px!important;*/ + } } @media (min-width: 768px) and (max-width: 880px) { .btn-header a { margin-top: 9px!important; /*width: 40px!important;*/ + /*height: 39px!important;*/ + line-height: 26px!important; } } @@ -15418,30 +15429,42 @@ .modal-overflow .scrollmarker.top { background: -moz-linear-gradient(top, #3276b1 0%, rgba(50, 118, 177, 0.83) 17%, rgba(50, 118, 177, 0) 100%); /* FF3.6+ */ + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #3276b1), color-stop(17%, rgba(50, 118, 177, 0.83)), color-stop(100%, rgba(50, 118, 177, 0))); /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(top, #3276b1 0%, rgba(50, 118, 177, 0.83) 17%, rgba(50, 118, 177, 0) 100%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(top, #3276b1 0%, rgba(50, 118, 177, 0.83) 17%, rgba(50, 118, 177, 0) 100%); /* Opera 11.10+ */ + background: -ms-linear-gradient(top, #3276b1 0%, rgba(50, 118, 177, 0.83) 17%, rgba(50, 118, 177, 0) 100%); /* IE10+ */ + background: linear-gradient(to bottom, #3276b1 0%, rgba(50, 118, 177, 0.83) 17%, rgba(50, 118, 177, 0) 100%); /* W3C */ + } .modal-overflow .scrollmarker.bottom { background: -moz-linear-gradient(bottom, #3276b1 0%, rgba(50, 118, 177, 0.83) 17%, rgba(50, 118, 177, 0) 100%); /* FF3.6+ */ + background: -webkit-gradient(linear, left bottom, left top, color-stop(0%, #3276b1), color-stop(17%, rgba(50, 118, 177, 0.83)), color-stop(100%, rgba(50, 118, 177, 0))); /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(bottom, #3276b1 0%, rgba(50, 118, 177, 0.83) 17%, rgba(50, 118, 177, 0) 100%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(bottom, #3276b1 0%, rgba(50, 118, 177, 0.83) 17%, rgba(50, 118, 177, 0) 100%); /* Opera 11.10+ */ + background: -ms-linear-gradient(bottom, #3276b1 0%, rgba(50, 118, 177, 0.83) 17%, rgba(50, 118, 177, 0) 100%); /* IE10+ */ + background: linear-gradient(to top, #3276b1 0%, rgba(50, 118, 177, 0.83) 17%, rgba(50, 118, 177, 0) 100%); /* W3C */ + } /* * Pricing-style component diff -r c9c67ada3b86 -r e5e706f6c489 src/pyams_skin/resources/less/forms.less --- a/src/pyams_skin/resources/less/forms.less Wed Mar 11 21:11:09 2015 +0100 +++ b/src/pyams_skin/resources/less/forms.less Fri Mar 20 17:12:17 2015 +0100 @@ -1317,6 +1317,8 @@ } } .input-file { + position: relative; + .button { position: absolute; top: 3px;