--- a/src/ztfy/myams/resources/css/myams.css Mon Apr 20 15:55:33 2015 +0200
+++ b/src/ztfy/myams/resources/css/myams.css Wed Jun 10 17:29:16 2015 +0200
@@ -67,7 +67,7 @@
color: #d5e7ec !important;
}
.txt-color-white {
- color: #ffffff !important;
+ color: #dedede !important;
}
.txt-color-grayDark {
color: #525252 !important;
@@ -142,7 +142,7 @@
background-color: #d5e7ec !important;
}
.bg-color-white {
- background-color: #ffffff !important;
+ background-color: #dedede !important;
}
.bg-color-grayDark {
background-color: #525252 !important;
@@ -3292,13 +3292,13 @@
margin-right: -4px !important;
}
.bordered {
- border: 1px solid #dddddd;
+ border: 1px solid #ccc;
}
.bordered:hover {
border: 1px solid #bbbbbb;
}
.bordered.nohover:hover {
- border-color: #dddddd;
+ border-color: #ccc;
}
.no-border,
.well[class*=" bg-"].no-border {
@@ -3461,7 +3461,6 @@
.no-padding > table {
border: 0!important;
margin-bottom: 0!important;
- border-bottom-width: 0!important;
}
.no-padding .dataTables_wrapper table tr td:first-child,
.no-padding > table tr td:first-child,
@@ -3703,6 +3702,10 @@
.page-title {
margin: 12px 0 15px;
}
+.page-title a:hover,
+.page-title a:active {
+ text-decoration: none;
+}
.page-title span {
font-size: 16px;
color: #333;
@@ -4139,6 +4142,11 @@
position: absolute!important;
}
}
+#left-panel #ajax-gear {
+ position: absolute;
+ left: calc(49%);
+ top: 5px;
+}
#left-panel .version {
position: absolute;
bottom: 2px;
@@ -4334,7 +4342,7 @@
.login-info a.btn-danger,
.login-info a.btn-success,
.login-info a.btn-primary {
- color: #ffffff;
+ color: #dedede;
}
.login-info span {
/*height: 38px;*/
@@ -5249,7 +5257,7 @@
margin: 0;
display: none;
background: rgba(91, 103, 113, 0.8);
- padding: 7px 0;
+ padding: 2px 0;
}
nav ul ul > li:hover b {
color: #D5D9E2;
@@ -5258,6 +5266,11 @@
margin: 0;
padding: 0;
}
+nav ul ul li.divider {
+ height: 1px;
+ margin-left: 30px;
+ padding: 0;
+}
nav ul ul li > a {
padding-left: 42px;
font-size: 12px;
@@ -5273,6 +5286,9 @@
padding-left: 12px;
background-color: #296191;
}
+.minified nav ul ul li > a.active {
+ margin-left: 0;
+}
nav ul ul ul {
background: 0 0;
padding: 0;
@@ -6044,6 +6060,7 @@
.tab-content.bordered,
.pill-content.bordered:hover,
.tab-content.bordered:hover {
+ border-color: #ddd;
border-top: 0;
}
.ams-widget > header > .nav-tabs.pull-left > li:first-child a {
@@ -6106,6 +6123,9 @@
margin-bottom: 10px;
border-style: dashed;
}
+li.nodot {
+ list-style-type: none;
+}
img.online {
border-left-color: #40ac2b!important;
}
@@ -7215,7 +7235,7 @@
.tree li {
list-style-type: none;
margin: 0;
- padding: 5px;
+ padding: 3px 0 3px 5px;
position: relative;
}
.tree li:after,
@@ -7229,7 +7249,7 @@
border-left: 1px solid #999;
bottom: 50px;
height: 100%;
- top: -11px;
+ top: -5px;
width: 1px;
-webkit-transition: "border-color 0.1s ease 0.1s";
transition: "border-color 0.1s ease 0.1s";
@@ -7240,56 +7260,45 @@
.tree li:after {
border-top: 1px solid #999;
height: 20px;
- top: 18px;
+ top: 14px;
width: 25px;
}
-.tree li span {
+.tree li:hover {
+ background: rgba(0, 0, 0, 0.15);
+}
+.tree li > span {
border: 1px dotted #999;
border-radius: 5px;
display: inline-block;
- padding: 3px 8px;
+ padding: 4px 8px;
text-decoration: none;
-webkit-transition: color 0.2s ease 0.1s, background-color 0.2s ease 0.1s, border-color 0.3s ease 0.2s;
transition: color 0.2s ease 0.1s, background-color 0.2s ease 0.1s, border-color 0.3s ease 0.2s;
}
+.tree li > span > i {
+ padding-right: 4px;
+}
.tree li.parent_li > span {
- cursor: pointer;
padding: 7px;
}
-.tree li.parent_li > span:hover {
- background-color: #DF8505;
- border: 1px solid #C67605;
- color: #fff;
-}
-.tree li.parent_li > span:hover + ul li::before {
- border-left-color: #F89406;
-}
-.tree li.parent_li > span:hover + ul li::after {
- border-top-color: #F89406;
-}
-.tree li.parent_li > span:hover + ul li span {
- background: #FDDFB3!important;
- border: 1px solid #FAA937;
- color: #000;
-}
-.tree li.parent_li > span:hover,
-.tree li.parent_li > span:hover + ul li span {
+.tree li > span {
+ cursor: pointer;
+}
+.tree li > span:hover,
+.tree li > span:hover + ul li > span {
background: #eee;
border: 1px solid #94a0b4;
color: #000;
}
.tree ul ul {
padding-left: 34px;
- padding-top: 10px;
-}
-.tree ul ul li:hover {
- background: rgba(0, 0, 0, 0.015);
+ padding-top: 5px;
}
.tree > ul {
padding-left: 0;
}
-.tree > ul > li :after,
-.tree > ul > li :before {
+.tree > ul > li:after,
+.tree > ul > li:before {
border: 0;
}
.pace {
@@ -8586,6 +8595,9 @@
.ams-form fieldset[disabled] LEGEND.checker .checkbox {
cursor: pointer;
}
+.ams-form fieldset.switched {
+ margin-bottom: 0!important;
+}
.ams-form fieldset.switched > section,
.ams-form fieldset.switched > article,
.ams-form fieldset.switched > div {
@@ -8594,6 +8606,9 @@
.ams-form fieldset.switched legend {
border-bottom: 0;
}
+.ams-form fieldset.switched + fieldset {
+ margin-top: 0!important;
+}
.ams-form fieldset.bordered {
margin: 10px;
border: 1px solid rgba(192, 192, 192, 0.8);
@@ -8674,6 +8689,10 @@
.ams-form .form-group {
padding: 5px 10px;
}
+.ams-form.form-tight .form-group,
+.ams-form .form-tight .form-group {
+ padding: 1px 10px;
+}
.ams-form label.checkbox,
.ams-form label.radio {
padding-top: 0;
@@ -9092,7 +9111,7 @@
.ams-form .input input[readonly],
.ams-form .select select[readonly],
.ams-form .textarea textarea[readonly] {
- border-bottom: 1px solid #bdbdbd!important;
+ border-bottom: 1px solid #ccc!important;
}
.ams-form .input input.display-mode,
.ams-form .select select.display-mode,
@@ -9104,6 +9123,23 @@
height: 14px;
line-height: 1em;
}
+.ams-form .input span.textarea-widget,
+.ams-form .textarea span.textarea-widget {
+ display: block;
+ width: 100%;
+ min-height: 14px;
+ padding: 4px 0;
+ border-bottom: 1px solid #ccc!important;
+}
+.ams-form .input .i18n-content input[readonly],
+.ams-form .select .i18n-content select[readonly],
+.ams-form .textarea .i18n-content textarea[readonly] {
+ border-width: 0!important;
+}
+.ams-form .input .i18n-content .textarea-widget {
+ display: block;
+ min-height: 12px;
+}
.ams-form .input input:focus + .tooltip,
.ams-form .textarea textarea:focus + .tooltip {
opacity: 1;
@@ -9461,7 +9497,7 @@
.ams-form .select select,
.ams-form .textarea textarea,
.ams-form .toggle i {
- border-color: #BDBDBD;
+ border-color: #ccc;
transition: border-color 0.3s;
-webkit-transition: border-color 0.3s;
}
@@ -10333,6 +10369,9 @@
padding: 6px 4px 3px;
border: 1px solid #fff;
}
+.mce-edit-area > iframe {
+ min-height: 400px!important;
+}
.client-form header {
padding: 15px 13px;
margin: 0;
@@ -10386,6 +10425,9 @@
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;
+}
.btn:active {
position: relative;
top: 1px;
@@ -10872,6 +10914,10 @@
.ams-widget header .nav-pills > li > a {
padding: 3px 5px 4px;
}
+.ams-widget header > .btn-group {
+ margin-top: -13px;
+ margin-left: 5px;
+}
.ams-widget > header {
height: 30px;
padding: 0;
@@ -10907,6 +10953,10 @@
margin-left: 10px;
float: left;
}
+.ams-widget > header > h2 + .btn,
+.ams-widget > header > h2 + .btn-group {
+ margin-left: 20px;
+}
.rtl .ams-widget > header {
padding: 0 7px 0 0;
}
@@ -10947,12 +10997,12 @@
margin: 0;
padding: 13px 13px 0;
background-color: #fff !important;
- border-width: 1px 1px 2px;
+ border-width: 1px;
border-style: solid;
+ border-color: #ccc!important;
+}
+.ams-widget > header + div {
border-top: 0;
- border-right-color: #CCC !important;
- border-bottom-color: #CCC !important;
- border-left-color: #CCC !important;
}
.ams-widget .widget-body {
position: relative;
@@ -11265,7 +11315,7 @@
}
.ams-widget-color-white > header {
color: #c8c8c8;
- background: #ffffff;
+ background: #dedede;
border-color: #c8c8c8 !important;
}
.ams-widget-color-white .nav-tabs li:not(.active) a,
@@ -11948,8 +11998,18 @@
.select2-container-multi .select2-choices .select2-search-choice.ui-sortable-handle {
cursor: move;
}
-.select2-container-multi.nofloat .select2-choices li {
+.with-icons .select2-container-multi .select2-choices .select2-search-choice.ui-sortable-handle {
+ margin-right: 1px;
+}
+.select2-container-multi.ordered .select2-choices li {
float: none;
+ cursor: move;
+}
+.select2-container-multi.ordered .select2-choices li.ui-state-highlight {
+ margin: 2px 0 2px 2px;
+ height: 20px;
+ background-color: #ddd;
+ border: 1px solid #ddd;
}
.select2-container-multi .select2-search-choice-close {
display: block;
@@ -11964,11 +12024,11 @@
background-color: #f4f4f4;
background-image: none;
border: 1px solid transparent;
- border-bottom: 1px solid #bdbdbd;
+ border-bottom: 1px solid #ccc;
cursor: default;
}
.select2-container-multi.select2-container-disabled .select2-choices .select2-search-choice {
- padding: 3px 5px;
+ padding: 1px 5px;
border: 1px solid #4a90cc;
background-image: none;
background-color: #86b4dd;
@@ -12643,117 +12703,7 @@
* Colorpicker
*/
.colorpicker {
- zoom: 1;
- top: 0;
- left: 0;
- padding: 4px;
- min-width: 120px;
- margin-top: 1px;
- border-top-right-radius: 4px;
- border-top-left-radius: 4px;
- border-bottom-right-radius: 4px;
- border-bottom-left-radius: 4px;
-}
-.colorpicker:after {
- clear: both;
-}
-.colorpicker:before {
- content: '';
- display: inline-block;
- border-left: 7px solid transparent;
- border-right: 7px solid transparent;
- border-bottom: 7px solid #ccc;
- border-bottom-color: rgba(0, 0, 0, 0.2);
- position: absolute;
- top: -7px;
- left: 6px;
-}
-.colorpicker:after {
- content: '';
- display: inline-block;
- border-left: 6px solid transparent;
- border-right: 6px solid transparent;
- border-bottom: 6px solid #fff;
- position: absolute;
- top: -6px;
- left: 7px;
-}
-.colorpicker.alpha {
- min-width: 140px;
-}
-.colorpicker.alpha .colorpicker-alpha {
- display: block;
-}
-.colorpicker div {
- position: relative;
-}
-.colorpicker-saturation {
- width: 100px;
- height: 100px;
- background-image: url(../img/saturation.png);
- cursor: crosshair;
- float: left;
-}
-.colorpicker-saturation i {
- display: block;
- height: 5px;
- width: 5px;
- border: 1px solid #000;
- position: absolute;
- top: 0;
- left: 0;
- margin: -4px 0 0 -4px;
-}
-.colorpicker-saturation i b {
- display: block;
- height: 5px;
- width: 5px;
- border: 1px solid #fff;
-}
-.colorpicker-color {
- height: 10px;
- margin-top: 5px;
- clear: both;
- background-image: url(../img/alpha.png);
- background-position: 0 100%;
-}
-.colorpicker-color div {
- height: 10px;
-}
-.colorpicker-alpha,
-.colorpicker-hue {
- width: 15px;
- height: 100px;
- float: left;
- cursor: row-resize;
- margin-left: 4px;
- margin-bottom: 4px;
-}
-.colorpicker-alpha i,
-.colorpicker-hue i {
- display: block;
- height: 1px;
- background: #000;
- border-top: 1px solid #fff;
- position: absolute;
- top: 0;
- left: 0;
- width: 100%;
- margin-top: -1px;
-}
-.colorpicker-hue {
- background-image: url(../img/hue.png);
-}
-.colorpicker-alpha {
- background-image: url(../img/alpha.png);
- display: none;
-}
-.input-append.color .add-on i,
-.input-prepend.color .add-on i {
- display: block;
- cursor: pointer;
- width: 16px;
- height: 16px;
+ padding-left: 30px!important;
}
/*
* Timepicker
@@ -15211,6 +15161,7 @@
position: fixed;
width: 100%;
height: 100%;
+ z-index: 990;
}
.modal-dialog.modal-max {
width: 98%;
@@ -15234,6 +15185,9 @@
max-width: 450px;
}
}
+.modal-dialog .modal-body .modal-viewport {
+ min-height: 140px;
+}
.modal-dialog .suffix .alert {
margin-bottom: 0;
border-radius: 0 0 5px 5px;
@@ -15878,7 +15832,7 @@
text-align: center;
line-height: 18px;
font-size: 10px;
- color: #BDBDBD;
+ color: #ccc;
text-shadow: 0 1px 0 rgba(77, 77, 77, 0.5);
filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1);
-webkit-transform: rotate(90deg);