Skip to content

Commit 29237c5

Browse files
naumov-socolovnaumov-socolov
committed
Interaface. All entities. Making perfect all the small things; 'adding mode' visually sepatated from 'editing'
1 parent baae928 commit 29237c5

File tree

13 files changed

+94
-55
lines changed

13 files changed

+94
-55
lines changed

‎web/css/main.css‎

Lines changed: 78 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,14 @@ label {
2323
cursor: pointer;
2424
}
2525

26+
label:hover {
27+
color: #469DC5;
28+
}
29+
30+
label:active {
31+
color: #F79B44;
32+
}
33+
2634
.hidden {
2735
display: none;
2836
}
@@ -35,7 +43,6 @@ label {
3543
box-shadow: 0 2px 5px rgba(0, 0, 0, 0.10);
3644
}
3745

38-
3946
.top .nav-logo .logo-container{
4047
background-color: #fff;
4148
width: 167px;
@@ -113,7 +120,7 @@ label {
113120
}
114121

115122
.top-user:hover {
116-
color: #fff;
123+
color: #6DB8D3;
117124
}
118125

119126
.top-user:active {
@@ -189,7 +196,8 @@ label {
189196
padding-bottom: 0;
190197
font-family: Arial, Helvetica, sans-serif;
191198
margin: 0;
192-
color: #4a82be;
199+
color: #3A89AE;
200+
/* color: #1677A5;*/
193201
height: 108px;
194202
width: 119px;
195203
float: left;
@@ -263,10 +271,10 @@ label {
263271
line-height: 1.4em;
264272
font-size: 9pt;
265273
font-family: Arial, Helvetica, sans-serif;
266-
color: #333;
274+
// color: #333;
275+
color: #7E7D7F;
267276
decoration: none;
268277
overflow: hidden;
269-
opacity: 0.8;
270278
}
271279

272280
.submenu {
@@ -355,8 +363,8 @@ label {
355363
}
356364

357365
.submenu-button-main:hover {
358-
border: 1px solid #aaa;
359-
background-color: #adaeae;
366+
border: 1px solid #6DB8D3;
367+
background-color: #6DB8D3;
360368

361369
-webkit-transition: background .1s ease-in-out;
362370
-moz-transition: background .1s ease-in-out;
@@ -365,16 +373,15 @@ label {
365373
}
366374

367375
.submenu-button-select:hover {
368-
border: 1px solid #adaeae;
369-
background-color: #adaeae;
376+
border: 1px solid #6DB8D3;
377+
background-color: #6DB8D3;
370378
color: #fff;
371379
}
372380

373381
.submenu-button-search:hover {
374-
border: 1px solid #adaeae;
375-
background-color: #adaeae;
382+
border: 1px solid #6DB8D3;
383+
background-color: #6DB8D3;
376384
color: #fff;
377-
378385
}
379386

380387
.submenu-button-main:active {
@@ -384,14 +391,13 @@ label {
384391

385392
.submenu-button-select:active {
386393
color: #fff;
387-
border: 1px solid #f79b44;
388-
background-color: #f79b44;
394+
border: 1px solid #ccc;
395+
background-color: #ccc;
389396
}
390397

391398
.submenu-button-search:active {
392-
color: #fff;
393-
border: 1px solid #f79b44;
394-
background-color: #f79b44;
399+
border: 1px solid #ccc;
400+
background-color: #ccc;
395401
}
396402

397403
.submenu-select-block {
@@ -432,7 +438,7 @@ label {
432438
background-color: #fff;
433439
border: 1px solid #ccc;
434440
border-radius: 3px 3px 3px 3px;
435-
padding: 4px 5px;
441+
padding: 0px 0px 2px 4px;
436442
}
437443

438444

@@ -464,7 +470,7 @@ label {
464470
font-size: 14px;
465471
background-color: #fff;
466472
float: left;
467-
padding: 0px 3px 0px 3px;
473+
padding: 0px 5px 0px 5px;
468474
height: 26px;
469475
width: 232px;
470476
margin: 0 4px 0 0;
@@ -511,15 +517,16 @@ label {
511517
}
512518

513519
.vst {
514-
padding: 5px 7px 0 7px;
515-
margin: 0;
520+
padding: 0px 2px 0 2px;
521+
margin: 5px 7px 0 7px;
516522
text-decoration: none;
517523
color: #999;
518524
font-size: 11pt;
519525
float: left;
520526
}
521527

522528
.vst:hover {
529+
color: #f79b44;
523530
text-decoration: underline;
524531
}
525532

@@ -587,10 +594,14 @@ label {
587594

588595
.data-add {
589596
margin: 0;
590-
background-color: #f7f6ed;
597+
background-color: #D3E1D1;
591598
border-bottom: 1px solid #e9e9e9;
592599
}
593600

601+
.mode-add .data-add {
602+
background-color: #f7f6ed;
603+
}
604+
594605
.data-dotted {
595606
text-align: left;
596607
vertical-align:top;
@@ -632,7 +643,7 @@ label {
632643
}
633644

634645
.data-date {
635-
letter-spacing: 0.3em;
646+
letter-spacing: 0.1em;
636647
font-size: 8pt;
637648
color: #333;
638649
}
@@ -672,6 +683,10 @@ label {
672683
border-left: 1px solid #f79b44;
673684
}
674685

686+
.data-controls.do_delete:hover {
687+
background-color: #FF6947;
688+
}
689+
675690
.data-controls:active {
676691
background-color: #999;
677692
}
@@ -778,7 +793,7 @@ label {
778793
vertical-align: top;
779794
line-height: 1.2em;
780795
font-size: 10pt;
781-
color: #222;
796+
color: #7E7D7F;
782797
padding: 2px 4px 1px 0;
783798
white-space: nowrap;
784799
}
@@ -788,28 +803,28 @@ label {
788803
line-height: 0.8em;
789804
font-size: 8pt;
790805
padding: 4px 0 0 0;
791-
color: #222;
806+
color: #7E7D7F;
792807
}
793808

794809
.counter-value {
795810
vertical-align: top;
796811
line-height: 1.2em;
797812
font-size: 10pt;
798-
color: #222;
813+
color: #626163;
799814
padding: 2px 0 1px 2px;
800815
}
801816

802817
.log-counter-value {
803818
vertical-align:top;
804819
font-size: 12pt;
805-
color: #484243;
820+
color: #7E7D7F;
806821
}
807822

808823
.cron-counter-value {
809824
vertical-align:top;
810825
line-height: 1.2em;
811826
font-size: 12pt;
812-
color: #484243;
827+
color: #7E7D7F;
813828
}
814829

815830
.name {
@@ -855,6 +870,7 @@ label {
855870
width: 360px;
856871
height: 90px;
857872
font-family:Arial, Helvetica, sans-serif;
873+
padding: 9px 1px 6px 14px;
858874
}
859875

860876
.vst-textinput:hover {
@@ -877,10 +893,11 @@ label {
877893
border-radius: 3px 3px 3px 3px;
878894
color: #555;
879895
font-size: 14pt;
880-
padding: 5px;
896+
padding: 7px 3px 9px 14px;
881897
width: 360px;
882898
height: 28px;
883899
margin: 2px 6px 0 0;
900+
font-family: Arial;
884901
}
885902

886903
.vst-input:hover {
@@ -905,16 +922,23 @@ label {
905922
font-family:Arial, Helvetica, sans-serif;
906923
font-size: 12pt;
907924
color: #555;
908-
height: 30px;
925+
height: 43px;
909926
min-width: 138px;
910927
margin: 2px 6px 0 0;
928+
padding: 8px 1px 6px 10px;
929+
}
930+
931+
.vst-list option {
932+
padding: 6px 1px 6px 15px;
911933
}
912934

935+
/*
913936
@-moz-document url-prefix() {
914937
.vst-list {
915938
padding-top: 2px;
916939
}
917940
}
941+
*/
918942

919943
.vst-checkbox {
920944
padding: 5px;
@@ -943,8 +967,11 @@ label {
943967

944968
.button:hover {
945969
color: #fff;
946-
border: 1px solid #999;
947-
background-color: #999;
970+
border: 1px solid #6DB8D3;
971+
background-color: #6DB8D3;
972+
// font-size: 14px;
973+
// line-height: 28px;
974+
// color: #FFF;
948975
}
949976

950977
.button:active {
@@ -983,9 +1010,11 @@ label {
9831010
}
9841011

9851012
.generate {
986-
color: #2361a1;
1013+
color: #3A89AE;
9871014
text-decoration: underline;
9881015
cursor: pointer;
1016+
margin-left: -3px;
1017+
padding: 0 3px;
9891018
}
9901019

9911020
.generate:hover {
@@ -998,7 +1027,7 @@ label {
9981027
}
9991028

10001029
.vst-advanced {
1001-
color: #2361a1;
1030+
color: #3A89AE;
10021031
font-size: 10pt;
10031032
letter-spacing: 0.1em;
10041033
text-decoration: none;
@@ -1075,8 +1104,9 @@ label {
10751104
}
10761105

10771106
.hint {
1078-
font-size: 14pt;
1079-
color: #7fa1cb;
1107+
font-size: 12pt;
1108+
color: #777;
1109+
font-style: italic;
10801110
}
10811111

10821112
.step-top {
@@ -1096,7 +1126,7 @@ label {
10961126
}
10971127

10981128
.additional-control {
1099-
margin-left: 20px;
1129+
margin-left: 17px;
11001130
color: #2361a1;
11011131
border-bottom: 1px solid #f79b44;
11021132
font-size: 10pt;
@@ -1105,12 +1135,21 @@ label {
11051135
}
11061136

11071137
.additional-control:hover {
1108-
color: #7fa1cb;
1138+
background-color: #f79b44;
1139+
color: #fff;
11091140
}
11101141

11111142
.additional-control:active {
11121143
color: #fff;
1113-
background-color: #f79b44;
1144+
background-color: #aaa;
1145+
}
1146+
1147+
.additional-control.do_delete:hover{
1148+
background-color: #FF6D3C;
1149+
}
1150+
1151+
.additional-control.do_delete:active{
1152+
background-color: #aaa;
11141153
}
11151154

11161155
.ftp-path-prefix {

‎web/templates/admin/add_cron.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
</div>
2525

2626
<form id="vstobjects" name="v_add_cron" method="post">
27-
<table class='data'>
27+
<table class="data mode-add">
2828
<tr class="data-add">
2929
<td class="data-dotted">
3030
<table class="data-col1">

‎web/templates/admin/add_db.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
document.v_add_db.v_password.value = randomstring;
4545
}
4646
</script>
47-
<table class='data'>
47+
<table class="data mode-add">
4848
<tr class="data-add">
4949
<td class="data-dotted">
5050
<table class="data-col1">
@@ -54,7 +54,7 @@
5454
<td class="data-dotted">
5555
<table class="data-col2" width="600px">
5656
<tr>
57-
<td class="step-top" style="color:#777;" >
57+
<td class="step-top hint" style="color:#777;" >
5858
<?php print __('Prefix will be automaticaly added to database name and database user',$user."_");?>
5959
</td>
6060
</tr>

‎web/templates/admin/add_dns.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
}
3636
</script>
3737

38-
<table class="data">
38+
<table class="data mode-add">
3939
<tr class="data-add">
4040
<td class="data-dotted">
4141
<table class="data-col1">

‎web/templates/admin/add_dns_rec.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
</div>
2525

2626
<form id="vstobjects" name="v_add_dns_rec" method="post">
27-
<table class='data'>
27+
<table class="data mode-add">
2828
<tr class="data-add">
2929
<td class="data-dotted">
3030
<table class="data-col1">

0 commit comments

Comments
 (0)