diff -r 00bfb7b29d9e -r 391ad752903e src/pyams_skin/resources/css/myams.css --- a/src/pyams_skin/resources/css/myams.css Mon Jan 18 18:41:23 2016 +0100 +++ b/src/pyams_skin/resources/css/myams.css Mon Jan 18 18:45:59 2016 +0100 @@ -1,3 +1,4 @@ +(node) util.print is deprecated. Use console.log instead. /* * MyAMS * « My Application Management Skin » @@ -12,6 +13,30 @@ /* * Colors variations */ +.txt-color-danger { + color: #a94442 !important; +} +.txt-color-warning { + color: #6b6d31 !important; +} +.txt-color-info { + color: #346597 !important; +} +.txt-color-success { + color: #296829 !important; +} +.bg-color-danger { + background-color: #a94442 !important; +} +.bg-color-warning { + background-color: #6b6d31 !important; +} +.bg-color-info { + background-color: #346597 !important; +} +.bg-color-success { + background-color: #5cb85c !important; +} .txt-color-text { color: #333333 !important; } @@ -3048,25 +3073,32 @@ */ @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; } +@font-face { + font-family: 'OpenSans'; + src: url('fonts/OpenSans-Regular.eot'); + src: url('fonts/OpenSans-Regular.eot?#iefix') format('embedded-opentype'), url('fonts/OpenSans-Regular.woff2') format('woff2'), url('fonts/OpenSans-Regular.woff') format('woff'), url('fonts/OpenSans-Regular.ttf') format('truetype'), url('fonts/OpenSans-Regular.svg') format('svg'); + font-weight: normal; + font-style: normal; +} html, body { font-family: Ubuntu, Arial, Helvetica, sans-serif; @@ -3103,6 +3135,9 @@ .align-base { vertical-align: baseline!important; } +.align-middle { + vertical-align: middle!important; +} .opacity-25 { opacity: 0.25!important; } @@ -3294,13 +3329,13 @@ margin-bottom: -4px !important; margin-right: -4px !important; } -.bordered { +.bordered:not(:empty) { border: 1px solid #ccc; } -.bordered:hover { - border: 1px solid #bbbbbb; -} -.bordered.nohover:hover { +.bordered:not(:empty):hover { + border-color: #bbbbbb; +} +.bordered:not(:empty).nohover:hover { border-color: #ccc; } .no-border, @@ -3706,7 +3741,7 @@ } } .page-title { - margin: 12px 0 15px; + margin: 7px 0 10px; } .page-title a { color: #6F8696; @@ -3738,7 +3773,6 @@ 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; @@ -3882,6 +3916,75 @@ .top-selector:hover { color: #333; } +#user-menu { + position: relative; +} +#user-menu .btn { + position: relative; + margin-top: 10px; + margin-bottom: 8px; + padding: 3px 6px 3px 0; + width: 60px; +} +@media (max-width: 767px) { + #user-menu .btn { + margin-top: 5px; + margin-left: 5px!important; + width: 40px; + padding-top: 5px; + padding-bottom: 4px; + } + #user-menu .btn i.fa { + float: none!important; + font-size: 150%; + } +} +#user-menu .btn img, +#user-menu .btn i.img { + position: absolute; + left: -1px; + top: -4px; + border: solid 1px white; + padding: 2px; + background-color: white; + transform: rotate(-7deg); +} +@media (max-width: 767px) { + #user-menu .btn img, + #user-menu .btn i.img { + display: none; + } +} +#user-menu .btn i.img { + width: 34px; + height: 34px; + color: #999; + opacity: 1; + font-size: 220%; +} +#user-menu .btn:active img, +#user-menu .btn:active i.img { + left: -2px; + top: -5px; +} +@media (max-width: 767px) { + #user-menu .dropdown-menu a { + width: auto!important; + } +} +#user-activity { + position: relative; +} +#user-activity .badge { + position: absolute; + top: 2px; + right: -8px; +} +@media (max-width: 767px) { + #user-activity .badge { + top: -2px; + } +} @media (max-width: 979px) { #login-info { display: none; @@ -4200,6 +4303,17 @@ background: 0 0; vertical-align: top; } +#ribbon .breadcrumb li.strong a { + line-height: 1em; + font-weight: bold; + font-size: 120%; + color: white!important; +} +@media only screen and (min-width: 0) and (max-width: 679px) { + #ribbon .breadcrumb li.strong a { + color: #333!important; + } +} #ribbon .breadcrumb, #ribbon .breadcrumb a { color: #ddd!important; @@ -4212,7 +4326,10 @@ } } #ribbon .breadcrumb > li + li:before { - padding: 0 1px 0 5px; + padding: 0 3px; +} +#ribbon .breadcrumb > li + li.strong:before { + padding-right: 1px; } #ribbon .breadcrumb li:last-child, #ribbon .breadcrumb > .active { @@ -4365,11 +4482,9 @@ } .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; @@ -4437,7 +4552,6 @@ 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 { @@ -4544,7 +4658,6 @@ .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 { @@ -4693,7 +4806,7 @@ .no-menu #hide-menu { display: none; } -#shortcut { +#shortcuts { position: absolute; top: 0; left: 0; @@ -4708,7 +4821,7 @@ -moz-box-sizing: border-box; box-sizing: border-box; } -#shortcut ul { +#shortcuts ul { padding: 15px 20px 10px; list-style: none; margin: 0; @@ -4716,25 +4829,37 @@ box-shadow: 0 4px 10px rgba(0, 0, 0, 0.3); border-bottom: 1px solid #423F3F; } -#shortcut ul li { +#shortcuts ul li { display: inline-block; width: auto; } -#shortcut ul li .ams-metro-tile { +#shortcuts ul li .ams-metro-tile { margin: 0 3px 3px; border: 0; border-radius: 0; } -#shortcut ul li .ams-metro-tile:hover { +#shortcuts ul li .ams-metro-tile:hover { color: #fff; text-decoration: none; } -#shortcut ul li .ams-metro-tile:active, -#shortcut ul li .ams-metro-tile:focus { +#shortcuts ul li .ams-metro-tile:active, +#shortcuts ul li .ams-metro-tile:focus { left: 0; top: 0; } -#shortcut .version { +#shortcuts ul li a { + display: inline-block; + box-sizing: content-box; + text-transform: capitalize; + font-size: 14px; + color: #333; + text-decoration: none; +} +#shortcuts ul li a span { + display: inline-block; + padding: 0 0 0 10px; +} +#shortcuts .version { position: absolute; right: 10px; bottom: 10px; @@ -5174,7 +5299,6 @@ } nav ul { width: 100%; - padding: 40px 28px 25px 0; padding: 0; margin: 0; font-size: 13px; @@ -5190,14 +5314,15 @@ height: 20px; border: 0; } +nav ul li.divider:last-child { + display: none; +} nav ul li.header { font-family: "Ubuntu-Light", Arial, Helvetica, sans-serif; font-size: 14px; font-weight: bold; color: #eee; background-color: #b13510; - border-top-color: #d44918; - border-bottom-color: #a13812; padding: 4px 10px 4px 20px; line-height: 18px; } @@ -5262,6 +5387,15 @@ color: #fefefe!important; position: relative; } +nav ul.active li.active > a { + cursor: default; +} +nav ul.active li.active > a.open { + cursor: pointer; +} +nav ul.active li.active > a.open.active { + cursor: default; +} nav ul b { float: right; font-size: 14px; @@ -5349,10 +5483,6 @@ nav ul ul b { color: #B3B3B3; } -nav > ul > li { - border-top: 1px solid #718999; - border-bottom: 1px solid #576975; -} nav > ul > li:hover > ul::before, nav > ul > li:hover > ul > li::before { border-color: #ACACAC!important; @@ -5362,6 +5492,7 @@ } nav > ul > li > a b { position: absolute!important; + visibility: hidden; right: 10px; top: 10px; } @@ -5393,6 +5524,10 @@ text-align: center; border: 1px solid rgba(255, 255, 255, 0.1); } +nav > ul > li:not(.open) > a:hover b, +nav > ul > li.open:not(.active) > a:hover b { + visibility: visible; +} nav > ul > li > ul::before { content: ""; display: block; @@ -7397,27 +7532,46 @@ .table-dnd tbody tr.dragging-row td { background-color: #cedbf7 !important; } -.table-dnd tbody tr td:first-child { +.table-dnd tbody tr:not(.no-drag-handle) td:first-child { padding-left: 20px!important; } +.table-dnd tbody td.sorter, +.table-dnd tbody td.sorter a { + cursor: move!important; +} .table-dnd tbody td.drag-handle { background: transparent url('../img/vert-drag-handle.png') scroll no-repeat left 50%; } +table:not(.table-dnd) td.sorter a { + display: none; +} .table-tight td, .table-tight th { padding: 4px 8px!important; line-height: 1.3!important; } +.table-tight td input[type="text"], +.table-tight th input[type="text"] { + height: 20px; +} .table-small td, .table-small th { padding: 2px 8px!important; line-height: 1.2!important; } +.table-small td input[type="text"], +.table-small th input[type="text"] { + height: 18px; +} .table-mini td, .table-mini th { padding: 1px 8px!important; line-height: 1.1!important; } +.table-mini td input[type="text"], +.table-mini th input[type="text"] { + height: 16px; +} .table-bordered > thead > tr > td, .table-bordered > thead > tr > th { border-width: 1px; @@ -7546,10 +7700,10 @@ background: url(../img/datatable/sort_both.png) no-repeat center right; } .dataTables_wrapper table.table thead .sorting_asc { - background: url(../img/datatable/sort_asc.png) no-repeat center right; + background: #e0f8ff url(../img/datatable/sort_asc.png) no-repeat center right; } .dataTables_wrapper table.table thead .sorting_desc { - background: url(../img/datatable/sort_desc.png) no-repeat center right; + background: #d4f0ff url(../img/datatable/sort_desc.png) no-repeat center right; } .dataTables_wrapper table.table thead .sorting_asc_disabled { background: url(../img/datatable/sort_asc_disabled.png) no-repeat center right; @@ -8944,7 +9098,7 @@ display: block; margin-top: 4px; margin-bottom: 6px; - padding-top: 0; + padding: 0 8px 6px; line-height: 19px; font-size: 13px; } @@ -9157,6 +9311,13 @@ .ams-form .textarea textarea[readonly] { border-bottom: 1px solid #ccc!important; } +.ams-form .input input[readonly]:focus, +.ams-form .select select[readonly]:focus, +.ams-form .textarea textarea[readonly]:focus { + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; +} .ams-form .input input.display-mode, .ams-form .select select.display-mode, .ams-form .textarea textarea.display-mode { @@ -9370,6 +9531,27 @@ height: 11px; font: 300 12px/16px FontAwesome; } +.inner-table-form .ams-form > fieldset { + margin-top: 10px; + margin-bottom: 0; +} +.inner-table-form .ams-form legend { + background-color: white; +} +.inner-table-form .ams-form .form-group { + padding: 5px 10px 0; +} +.inner-table-form .ams-form input[type="text"] { + height: 28px; +} +.inner-table-form .ams-form .mce-edit-area > iframe { + min-height: 250px!important; +} +.inner-table-form .ams-form footer { + padding: 5px 20px; + border-top: 0; + background-color: transparent; +} .ams-form .toggle { margin-bottom: 4px; padding-right: 61px; @@ -9521,6 +9703,9 @@ border-left-width: 1px; border-left-style: solid; } +.ams-form .icon-append.fa-spin { + border-left-style: none; +} .ams-form .icon-append-2 { right: 31px; } @@ -10413,9 +10598,68 @@ padding: 6px 4px 3px; border: 1px solid #fff; } +.mce-container, +.mce-container *, +.mce-widget, +.mce-widget *, +.mce-reset { + font-family: Ubuntu, Arial, Helvetica, sans-serif !important; + font-size: 13px; +} +.mce-container button, +.mce-container * button, +.mce-widget button, +.mce-widget * button, +.mce-reset button { + padding: 2px 10px!important; +} +.mce-container .mce-ico, +.mce-container * .mce-ico, +.mce-widget .mce-ico, +.mce-widget * .mce-ico, +.mce-reset .mce-ico { + font-family: tinymce, Arial!important; + font-size: 14px!important; +} +.mce-panel { + background-image: none!important; + border-color: #ccc!important; +} +.mce-menubar .mce-menubtn button { + padding: 2px 10px; + line-height: 16px; +} +.mce-menubar .mce-menubtn button span { + font-size: 12px; + line-height: 16px; +} +.mce-menubar .mce-menubtn button .mce-caret { + margin-top: 6px; +} +.mce-menubtn span { + font-size: 13px!important; +} +.mce-btn-group .mce-btn { + border-color: #ccc!important; +} +.mce-btn { + background-image: none!important; +} +.mce-colorbutton button { + padding: 2px 1px 2px 5px!important; +} .mce-edit-area > iframe { min-height: 400px!important; } +.mce-path, +.mce-wordcount { + padding: 2px 8px!important; + font-size: 12px!important; +} +.mce-path button, +.mce-wordcount button { + font-size: 12px!important; +} .client-form header { padding: 15px 13px; margin: 0; @@ -10466,8 +10710,6 @@ .btn { padding: 6px 12px; border-radius: 2px; - box-shadow: inset 0 -2px 0 rgba(0, 0, 0, 0.05); - -webkit-box-shadow: inset 0 -2px 0 rgba(0, 0, 0, 0.05); } .btn-toolbar .btn { padding: 4px; @@ -10590,16 +10832,13 @@ .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; } } @@ -10750,6 +10989,9 @@ padding: 0 8px; text-align: center; } +.widget-toolbar:empty { + padding: 0; +} .widget-toolbar.no-border { border-left: 0; } @@ -11955,15 +12197,13 @@ color: #999!important; } .select2-container.select2-container-disabled .select2-choice { - background-color: #f4f4f4; background-image: none; - border: 1px solid #ddd; + border: 1px solid transparent; + border-bottom: 1px solid #ccc; cursor: default; } .select2-container.select2-container-disabled .select2-choice .select2-arrow { - background-color: #f4f4f4; - background-image: none; - border-left: 0; + display: none; } .select2-container.select2-container-disabled .select2-choice abbr { display: none; @@ -12070,12 +12310,15 @@ background: rgba(0, 0, 0, 0.3); } .select2-container-multi.select2-container-disabled .select2-choices { - background-color: #f4f4f4; background-image: none; border: 1px solid transparent; border-bottom: 1px solid #ccc; cursor: default; } +.select2-container-multi.select2-container-disabled .select2-choices:hover { + border-color: transparent!important; + border-bottom: 1px solid #ccc!important; +} .select2-container-multi.select2-container-disabled .select2-choices .select2-search-choice { padding: 1px 5px; border: 1px solid #4a90cc; @@ -15240,18 +15483,33 @@ .modal-dialog .modal-body .modal-viewport { min-height: 140px; } +.modal-dialog .close:hover { + background-color: white; +} .modal-dialog .suffix .alert { margin-bottom: 0; } .modal-dialog .suffix .alert:last-child { border-radius: 0 0 5px 5px; } +.modal-header { + position: relative; +} +.modal-header .toolbar { + position: absolute; + right: 10px; + bottom: -19px; + z-index: 1; +} .modal-title img { margin: 0 15px 0 0; } .modal-overflow .modal-body { overflow: hidden; } +.modal-viewport fieldset .alert { + margin: 0 -5px 5px !important; +} .ui-dialog { position: absolute; top: 0; @@ -15456,42 +15714,30 @@ .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