Skip to content

Commit 5d070fc

Browse files
committed
Fixes for FM
1 parent ec43524 commit 5d070fc

File tree

13 files changed

+274
-1489
lines changed

13 files changed

+274
-1489
lines changed

web/css/file_manager.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -556,11 +556,12 @@ input[type="checkbox"] {
556556
.menu div.button { display: none; }
557557
.menu div.button.medium,
558558
.menu div.button.small { display: inline-block; }
559-
.listing li .filename-holder { max-width: 20%; }
560559
}
561560

562561
@media (max-width: 1080px) {
562+
.listing li .filename-holder { max-width: 36%; }
563563
.listing li .owner { display: none; }
564+
.listing li .mode { display: none; }
564565
}
565566

566567
@media (max-width: 890px) {

web/css/file_manager_editor.css

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
body, form { padding: 0; margin: 0; background: #333; }
22

33

4-
input.save {
4+
input.save {
55
background-color: rgba(247, 165, 48, 0.8);
66
border: 1px solid #f79b44;
77
border-radius: 3px;
8-
/* bottom: 17px;*/
98
top: 9px;
109
color: #fafafa;
1110
cursor: pointer;
@@ -32,13 +31,5 @@ input.save:active { border: 1px solid #FFCC00; background-color: #FFCC00; color:
3231
.ace-twilight .ace_gutter-active-line { margin-top: 10px; }
3332

3433
.ace_gutter-cell { color: #777; }
35-
/*
36-
.ace_gutter-cell { color: #777; padding: 9px 0px 0px 4px; }
37-
.ace_line { padding: 9px 0px 0px 4px; }
38-
39-
.ace_editor,
40-
.ace-twilight .ace_cursor,
41-
.ace_text-input { font-size: 17px; }
42-
*/
4334

4435
.ace_editor { font-size: 19px !important; }

web/css/styles.min.css

Lines changed: 147 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -663,7 +663,7 @@ input[type="checkbox"] {
663663
height: 22px;
664664
margin-top: 4px;
665665
width: 73px;
666-
margin-left: -11px;
666+
margin-left: -2px;
667667
}
668668

669669
.l-header {
@@ -746,7 +746,8 @@ input[type="checkbox"] {
746746
float: left;
747747
color: #a4abad;
748748
font-weight: 700;
749-
padding: 10px 5px;
749+
padding: 10px 0 0 10px;
750+
margin-right: 12px;
750751
}
751752
.l-profile__username:hover {
752753
color: #ffd62e;
@@ -759,8 +760,8 @@ input[type="checkbox"] {
759760
.l-profile__logout {
760761
float: left;
761762
color: #fff;
762-
margin-left: 40px;
763-
padding: 10px 5px;
763+
/* margin-left: 40px; */
764+
padding: 10px 0 0 10px;
764765
}
765766
.l-profile__logout:hover {
766767
color: #C0E60E;
@@ -775,6 +776,111 @@ input[type="checkbox"] {
775776
padding: 8px 5px;
776777
}
777778

779+
.l-profile__notifications {
780+
background: url("/images/sprite.png") no-repeat scroll -129px -135px;
781+
border-radius: 30px;
782+
color: #fff;
783+
cursor: pointer;
784+
float: left;
785+
font-weight: bold;
786+
height: 15px;
787+
margin-right: 4px;
788+
margin-top: 5px;
789+
padding: 10px 5px 0;
790+
width: 15px;
791+
}
792+
.l-profile__notifications.active {
793+
background-color: #454545;
794+
}
795+
.l-profile__notifications:hover {
796+
background-color: #333;
797+
}
798+
.l-profile__notifications:active {
799+
background-color: #c4da5e;
800+
}
801+
.l-profile__notifications.updates {
802+
background-position: -165px -135px;
803+
}
804+
805+
.l-profile__notifications.updates2 {
806+
/* background-position: -202px -135px; */
807+
background-position: -202px -157px;
808+
}
809+
810+
.notification-container {
811+
background-color: #454545;
812+
box-shadow: 0 2px 7px 0 rgba(0, 0, 0, 0.3);
813+
list-style-type: none;
814+
margin: 0;
815+
overflow: hidden;
816+
padding-left: 0;
817+
position: fixed;
818+
top: 34px;
819+
width: 351px;
820+
z-index: 21;
821+
font-size: 12px;
822+
padding: 0;
823+
color: #9E9E9E;
824+
}
825+
.notification-container li {
826+
border-bottom: 1px solid #555;
827+
padding: 10px 15px 24px;
828+
}
829+
.notification-container .mark-seen {
830+
background: rgba(0, 0, 0, 0) url("/images/sprite.png") repeat scroll -427px -486px;
831+
border: 5px solid #454545;
832+
border-radius: 12px;
833+
cursor: pointer;
834+
display: inline-block;
835+
float: right;
836+
height: 9px;
837+
margin-right: -8px;
838+
margin-top: -3px;
839+
width: 9px;
840+
}
841+
.notification-container .mark-seen:hover {
842+
background-color: #333;
843+
border-color: #333;
844+
}
845+
.notification-container .mark-seen:active {
846+
background-color: #777;
847+
border-color: #777;
848+
}
849+
.notification-container .title {
850+
color: #9e9e9e;
851+
font-weight: bold;
852+
line-height: 30px;
853+
padding: 0;
854+
text-transform: none;
855+
float: none;
856+
display: block;
857+
}
858+
.notification-container .title a {
859+
color: #9e9e9e;
860+
}
861+
862+
.notification-container .unseen .title a,
863+
.notification-container .unseen .title {
864+
color: #C4DA5E;
865+
}
866+
.notification-container .unseen .title a:hover {
867+
color: #ffcc00;
868+
}
869+
.notification-container .unseen .title a:active {
870+
color: #dacf2e;
871+
}
872+
873+
874+
.notification-container a {
875+
color: #5ABDB5;/* #eee;*/
876+
}
877+
.notification-container a:hover {
878+
color: #2CA99B;
879+
}
880+
.notification-container a:active {
881+
color: #00C0C0;
882+
}
883+
778884

779885

780886
.l-stat {
@@ -1406,7 +1512,7 @@ div.l-content > div.l-separator:nth-of-type(4) {
14061512
width: 250px;
14071513
}
14081514
.l-unit__stat-col--left.wide-4 {
1409-
width: 575px;
1515+
width: 550px;
14101516
}
14111517

14121518

@@ -2686,6 +2792,7 @@ form#vstobjects.suspended {
26862792
padding: 3px 14px 3px 27px;
26872793
position: absolute;
26882794
text-transform: uppercase;
2795+
word-break: keep-all;
26892796
z-index: -1;
26902797
}
26912798

@@ -2838,7 +2945,7 @@ form#vstobjects.suspended {
28382945
.description {
28392946
font-weight: normal;
28402947
line-height: 25px;
2841-
padding-bottom: 20px;
2948+
padding-bottom: 45px;
28422949
margin-left: 50px;
28432950
}
28442951
.description ul{
@@ -2857,20 +2964,44 @@ form#vstobjects.suspended {
28572964
color: #2c9491;
28582965
}
28592966
.description a.purchase {
2860-
color: #86A307;
2967+
color: #FFF;
28612968
background-color: #9fbf0c;
2969+
border: none;
28622970
border-radius: 3px;
2863-
color: #fff;
28642971
font-size: 13px;
28652972
font-weight: bold;
2866-
padding: 7px;
2973+
padding: 7px 15px;;
28672974
text-transform: capitalize;
28682975
text-decoration: none;
28692976
}
28702977
.description a.purchase:hover {
28712978
background-color: #c0e60f;
28722979
color: #555;
28732980
}
2981+
.description a.purchase:active {
2982+
background-color: #D9F210;
2983+
color: #555;
2984+
}
2985+
2986+
.description a.cancel {
2987+
background-color: #999;
2988+
border: none;
2989+
border-radius: 3px;
2990+
color: #fff;
2991+
font-size: 13px;
2992+
font-weight: bold;
2993+
padding: 7px 15px;
2994+
text-transform: capitalize;
2995+
text-decoration: none;
2996+
}
2997+
.description a.cancel:hover {
2998+
background-color: #2c9491;
2999+
}
3000+
.description a.cancel:active {
3001+
background-color: #5f9491;
3002+
}
3003+
3004+
28743005
.description .licence {
28753006
padding: 20px 0;
28763007
color: #2c9491;
@@ -2887,3 +3018,10 @@ form#vstobjects.suspended {
28873018
padding-top: 20px;
28883019
}
28893020

3021+
.description .twoco {
3022+
font-style: italic;
3023+
line-height: 15px;
3024+
font-size: 12px;
3025+
}
3026+
3027+

0 commit comments

Comments
 (0)