Compare View

switch
from
...
to
 
Commits (5)
css/style.css
... ... @@ -136,10 +136,6 @@ ul li {
136 136 /* ----------------------------------------------------------- */
137 137 /* ------------------- Measurement input --------------------- */
138 138  
139   -#measurements {
140   -
141   -}
142   -
143 139 #lengths {
144 140 padding-top: 20px;
145 141 padding-bottom: 20px;
... ... @@ -228,7 +224,7 @@ ul li {
228 224 height: 100%;
229 225 }
230 226  
231   -.test-wrapper {
  227 +.custom-terrace-wrapper {
232 228 overflow-y: auto;
233 229 overflow-x: hidden;
234 230 border-top-left-radius: 10px;
... ... @@ -238,10 +234,8 @@ ul li {
238 234 height: 100%;
239 235 width: 275px;
240 236 z-index: 20;
241   - /*background-image: url("../images/wallpapers/seamless_paper_texture.png");*/
  237 + background: url("../images/wallpapers/funky-lines.png");
242 238 border: 1px solid black;
243   - background-color: #f9f9f9;
244   - /*margin: 10px;*/
245 239 }
246 240  
247 241 /* ----------------------------------------------------------- */
... ... @@ -327,7 +321,6 @@ ul li {
327 321 #gui {
328 322 width: 100%;
329 323 height: 100%;
330   - /*display: none;*/
331 324 z-index: 10;
332 325 }
333 326  
... ... @@ -338,7 +331,7 @@ ul li {
338 331 position: fixed;
339 332 bottom: 5px;
340 333 left: 5px;
341   - width: 100px;
  334 + width: 80px;
342 335 z-index: 15;
343 336 text-align: center;
344 337 transition: all 0.2s ease-in-out;
... ... @@ -355,12 +348,12 @@ ul li {
355 348 }
356 349  
357 350 #imgCart {
358   - width: 50px;
  351 + width: 40px;
359 352 bottom: 0;
360 353 }
361 354  
362 355 #subtotal {
363   - font-size: 15px;
  356 + font-size: 10px;
364 357 font-family: Arial, Helvetica, sans-serif;
365 358 }
366 359  
... ... @@ -383,10 +376,10 @@ ul li {
383 376 position: fixed;
384 377 z-index: 20;
385 378 width: 800px;
386   - height: 650px;
  379 + height: 600px;
387 380 background: url("../images/wallpapers/funky-lines.png");
388 381 left: calc(50% - 400px);
389   - top: calc(50% - 325px);
  382 + top: calc(50% - 300px);
390 383 border: 1px solid black;
391 384 border-radius: 10px;
392 385 display: none;
... ... @@ -401,16 +394,34 @@ ul li {
401 394  
402 395 #closeItemList {
403 396 position: absolute;
404   - top: -30px;
  397 + top: -20px;
405 398 right: 10px;
406 399 cursor: pointer;
407 400 font-size: 50px;
408 401 }
409 402  
410   -#itemTableDiv {
  403 +#itemTableHead {
  404 + position: relative;
  405 + margin-top: 10px;
  406 + left: 1%;
411 407 width: 98%;
412   - height: 75%;
  408 + text-align: center;
  409 + background-color: #cccccc;
413 410 border: 1px solid black;
  411 +}
  412 +
  413 +#itemTableHead thead tr th {
  414 + text-align: center;
  415 +}
  416 +
  417 +#itemTableDiv {
  418 + position: relative;
  419 + top: 4%;
  420 + width: 98%;
  421 + height: 65%;
  422 + border-left: 1px solid black;
  423 + border-right: 1px solid black;
  424 + border-top: 1px solid black;
414 425 margin: 0 1%;
415 426 overflow: auto;
416 427 background-color: white;
... ... @@ -429,6 +440,19 @@ ul li {
429 440 vertical-align: top;
430 441 }
431 442  
  443 +#itemTableFoot {
  444 + position: relative;
  445 + top: 4%;
  446 + left: 1%;
  447 + width: 98%;
  448 + background-color: #cccccc;
  449 + border: 1px solid black;
  450 +}
  451 +
  452 +#itemTableFoot tr th div, #itemTableFoot tr th {
  453 + text-align: right;
  454 +}
  455 +
432 456 #itemListFooter {
433 457 position: relative;
434 458 width: 100%;
... ... @@ -437,7 +461,7 @@ ul li {
437 461 #downloadItemListButton {
438 462 position: relative;
439 463 right: -355px;
440   - bottom: -5px;
  464 + top: 30px;
441 465 width: 70px;
442 466 cursor: pointer;
443 467 transition: all 0.2s ease-in-out;
... ... @@ -469,24 +493,41 @@ ul li {
469 493 width: 200px;*/
470 494 }
471 495  
  496 +#home {
  497 + position: fixed;
  498 + top: 0;
  499 + z-index: 20;
  500 + width: 30px;
  501 + display: none;
  502 +}
  503 +
  504 +#helpLinesButton {
  505 + position: fixed;
  506 + top: -1px;
  507 + z-index: 20;
  508 + margin: 5px;
  509 + left: 10px;
  510 + height: 40px;
  511 +}
  512 +
472 513 .view-nav {
473 514 position: relative;
474 515 top: 0;
475   - left: -20px;
476   - width: 60px;
  516 + left: 28px;
  517 + width: 45px;
477 518 }
478 519  
479   -/* https://bit.ly/2L2k2qd */
  520 +/************ https://bit.ly/2L2k2qd **************/
480 521 .view-nav li ul {
481 522 position:absolute;
482 523 left: 0;
483   - top:36px;
  524 + top: 36px;
484 525 z-index:1;
485 526 }
486 527 .view-nav li ul li {
487 528 overflow:hidden;
488 529 max-height:0;
489   - width: 70px;
  530 + width: 55px;
490 531 -webkit-transition:max-height 500ms ease;
491 532 -moz-transition:max-height 500ms ease;
492 533 -o-transition:max-height 500ms ease;
... ... @@ -495,18 +536,19 @@ ul li {
495 536 .view-nav ul > li:hover ul li {
496 537 max-height:100px;
497 538 }
  539 +/**************************************************/
498 540  
499 541 .view {
500   - width: 60px;
  542 + width: 45px;
501 543 }
502 544  
503 545 .dropdown-view {
504   - padding-top: 20px;
  546 + padding-top: 5px;
505 547 padding-left: 40px
506 548 }
507 549  
508 550 .cameraButtons {
509   - width: 45px;
  551 + width: 35px;
510 552 margin-left: 5px;
511 553 margin-top: 5px;
512 554 }
... ... @@ -515,20 +557,30 @@ ul li {
515 557 transform: scale(1.05);
516 558 }
517 559  
518   -#helpLinesButton {
  560 +
  561 +#zoom-out {
519 562 position: fixed;
520   - top:0;
  563 + top: 0;
521 564 z-index: 20;
522   - margin: 5px;
523   - left: 90px;
524   - height: 50px;
  565 + margin-top: 10px;
  566 + height: 30px;
  567 + left: 125px;
  568 +}
  569 +
  570 +#zoom-in {
  571 + position: fixed;
  572 + top: 0;
  573 + z-index: 20;
  574 + margin-top: 10px;
  575 + height: 30px;
  576 + left: 170px;
525 577 }
526 578  
527 579 #helpButton {
528 580 position: fixed;
529   - top: 2px;
530   - left: 150px;
531   - height: 45px;
  581 + top: 6px;
  582 + left: 210px;
  583 + height: 25px;
532 584 margin: 5px;
533 585 }
534 586  
... ... @@ -543,7 +595,7 @@ ul li {
543 595 border: none;
544 596 height: 20px;
545 597 transform: rotate(180deg);
546   - transition: all 1s;
  598 + transition: all 0.5s;
547 599 }
548 600  
549 601 #moduleMenuGUI {
... ... @@ -565,7 +617,7 @@ ul li {
565 617 background: url("../images/wallpapers/funky-lines.png");
566 618 border-top-left-radius: 10px;
567 619 border-bottom-left-radius: 10px;
568   - transition: right 1s;
  620 + transition: right 0.5s;
569 621 }
570 622  
571 623 .poleButtons {
... ... @@ -610,10 +662,6 @@ ul li {
610 662 margin-top: 10px;
611 663 }
612 664  
613   -#glassTypeInfo {
614   - padding-bottom: 2%;
615   -}
616   -
617 665 #glassButtons {
618 666 position: relative;
619 667 }
... ... @@ -639,11 +687,16 @@ ul li {
639 687 left: 10%;
640 688 }
641 689  
642   -.option-dropdown-info {
  690 +#glass-type-selection, #glass-width-selection {
  691 + width: 80%;
  692 + left: 10%;
  693 +}
  694 +
  695 +#glassTypeInfo, #glassWidthInfo{
643 696 width: 35%;
644 697 }
645 698  
646   -.option-dropdown-selection {
  699 +#glassTypeSelect, #glassWidthSelect {
647 700 width: 65%;
648 701 }
649 702  
... ... @@ -738,12 +791,11 @@ ul li {
738 791 height: 40px;
739 792 }
740 793  
741   -/*******************************************************/
742   -/************ AutoGen ********************/
743   -/*******************************************************/
  794 +/************************************************/
  795 +/***************** Autogen **********************/
744 796  
745 797 .autoGenPoleButton {
746   - height: 125px;
  798 + height: 80px;
747 799 border: 1px solid black;
748 800 border-radius: 5px;
749 801 }
... ... @@ -819,6 +871,48 @@ ul li {
819 871 /************************************************/
820 872 /***************** Overlay **********************/
821 873  
  874 +.init-info {
  875 + position: fixed;
  876 + left: 0;
  877 + top: 0;
  878 + z-index: 20;
  879 + width: 100%;
  880 + height: 100%;
  881 + background: rgba(0,0,0, 0.5);
  882 +}
  883 +
  884 +.init-info-box {
  885 + position: fixed;
  886 + background-color: white;
  887 + border: 1px solid black;
  888 + border-radius: 5px;
  889 + width: 300px;
  890 + left: calc(50% - 150px);
  891 + bottom: calc(50% - 65px);
  892 +}
  893 +
  894 +.btn-yes {
  895 + margin-left: 10px;
  896 + margin-right: 5px;
  897 +}
  898 +
  899 +.btn-no {
  900 + margin-right: 10px;
  901 + margin-left: 5px;
  902 +}
  903 +.btn-yes, .btn-no {
  904 + display: inline;
  905 + width: 130px;
  906 + margin-top: 10px;
  907 + margin-bottom: 10px;
  908 + border: 1px solid black;
  909 + background-color: #eeeeee;
  910 +}
  911 +
  912 +.btn-yes:hover, .btn-no:hover {
  913 + transform: scale(1.05);
  914 +}
  915 +
822 916 .info {
823 917 position: fixed;
824 918 z-index: 30;
... ... @@ -829,26 +923,111 @@ ul li {
829 923 background-color: rgba(0, 0, 0, 0.8);
830 924 }
831 925  
  926 +#info {
  927 + font-size: 1.25em;
  928 + overflow-y: auto;
  929 + overflow-x: hidden;
  930 +}
  931 +
832 932 .infotext {
833   - position: absolute;
834   - top: 50%;
835   - left: 35%;
836   - font-size: 50px;
837 933 color: white;
  934 + margin-top: 5px;
  935 + float: left;
  936 + text-align: left;
  937 + font-size: 0.8em;
838 938 }
839 939  
840   -.close-info {
841   - position: absolute;
842   - top: 20px;
843   - right: 40px;
  940 +.close {
  941 + position: fixed;
  942 + top: 10px;
  943 + right: 25px;
  944 + z-index: 31;
844 945 font-size: 3em;
845 946 color: white;
846 947 cursor: pointer;
847 948 }
848 949  
849   -.btNextTip {
850   - position: absolute;
851   - right: 50px;
852   - top: 50%;
853   - width: 100px;
  950 +.close:hover {
  951 + color: white;
  952 +}
  953 +
  954 +.info-pole-buttons {
  955 + background-color: white;
  956 + border: 1px solid black;
  957 + border-radius: 5px;
  958 + height: 60px;
  959 + width: 60px;
  960 +}
  961 +
  962 +.element-row{
  963 + margin-top: 8px;
854 964 }
  965 +
  966 +.right {
  967 + float: right;
  968 +}
  969 +
  970 +.select-img {
  971 + height: 30px;
  972 + float: right;
  973 +}
  974 +
  975 +.scaled-img {
  976 + height: 60px;
  977 + float: right;
  978 + transform: scaleX(1.4);
  979 + padding-left: 40px;
  980 +}
  981 +
  982 +.glass-row {
  983 + margin-right: 20px;
  984 +}
  985 +
  986 +.img {
  987 + height: 30px;
  988 + background-color: rgba(255, 255, 255, 0.9);
  989 + border: 1px solid black;
  990 + border-radius: 5px;
  991 +}
  992 +
  993 +.shopping-cart {
  994 + height: 30px;
  995 + background-color: rgba(255, 255, 255, 0.9);
  996 + border: 1px solid black;
  997 + border-radius: 5px;
  998 + padding: 2px;
  999 +}
  1000 +
  1001 +.pdf {
  1002 + height: 55px;
  1003 + right: -30px;
  1004 +}
  1005 +
  1006 +.perspective {
  1007 + height: 45px;
  1008 +}
  1009 +
  1010 +.ruler {
  1011 + height: 40px;
  1012 +}
  1013 +
  1014 +.zoom {
  1015 + height: 30px;
  1016 + margin-bottom: 50px;
  1017 +}
  1018 +
  1019 +.offset5 {
  1020 + margin-top: 5px;
  1021 +}
  1022 +
  1023 +.offset10 {
  1024 + margin-top: 10px;
  1025 +}
  1026 +
  1027 +.offset15 {
  1028 + margin-top: 15px;
  1029 +}
  1030 +
  1031 +.offset20 {
  1032 + margin-top: 20px;
  1033 +}
855 1034 \ No newline at end of file
... ...
images/icons/close.png 0 → 100644

3.95 KB

images/icons/help.png

2.6 KB | W: | H:

2.6 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
images/icons/home.png 0 → 100644

759 Bytes

images/icons/pdf.png

4.79 KB | W: | H:

4.79 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
images/icons/pdf_2.png 0 → 100644

5.02 KB

images/icons/ruler_2.png

848 Bytes | W: | H:

848 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
images/icons/ruler_3.png 0 → 100644

10.6 KB

images/icons/ruler_inverted.png 0 → 100644

1.92 KB

images/icons/ruler_outlined.png 0 → 100644

3.38 KB

images/icons/type.png 0 → 100644

10.7 KB

images/icons/view.png

1.85 KB | W: | H:

1.85 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
images/icons/view_.png 0 → 100644

2.01 KB

images/icons/view_inverted.png 0 → 100644

2.04 KB

images/icons/view_outlined.png 0 → 100644

7 KB

images/icons/width.png 0 → 100644

11.8 KB

images/icons/zoom_in.png 0 → 100644

2.73 KB

images/icons/zoom_in_inverted.png 0 → 100644

2.2 KB

images/icons/zoom_out.png 0 → 100644

2.6 KB

images/icons/zoom_out_inverted.png 0 → 100644

2.18 KB

images/menu_terrace_texture_9.png 0 → 100644

76.7 KB

images/psd/terrace_diamond_labeled.psd 0 → 100644
No preview for this file type
images/psd/terrace_l_shape_labeled.psd 0 → 100644
No preview for this file type
images/psd/terrace_square_labeled.psd 0 → 100644
No preview for this file type
images/psd/terrace_triangle_labeled.psd 0 → 100644
No preview for this file type
images/references.txt
... ... @@ -8,11 +8,19 @@ ruler.png https://www.iconfinder.com/icons/296913/design_ruler_icon#si
8 8 plus.png https://www.iconfinder.com/icons/126583/add_plus_icon#size=128
9 9 shoppingcart.png https://www.iconfinder.com/icons/1608412/cart_shopping_icon#size=128
10 10 view.png https://www.iconfinder.com/icons/216550/view_icon#size=128
11   -help.png https://www.iconfinder.com/icons/40797/blue_help_icon#size=128
  11 +help.png https://www.iconfinder.com/icons/183285/help_mark_question_icon#size=128
12 12 double_arrow.png https://www.iconfinder.com/icons/383079/arrow_double_right_icon#size=128
13 13 cancel.png https://www.iconfinder.com/icons/646197/cancel_close_cross_delete_remove_stop_wrong_icon#size=128
14 14 finished.png https://www.iconfinder.com/icons/646195/done_ok_right_success_tick_valid_yes_icon#size=128
15   -pdf.png https://www.iconfinder.com/icons/511559/document_download_file_files_pdf_icon#size=128
  15 +pdf.png https://www.iconfinder.com/icons/511559/document_download_file_files_pdf_icon#size=128
  16 +close.png https://www.iconfinder.com/icons/216470/close_icon#size=128
  17 +zoom_out.png https://www.iconfinder.com/icons/106233/out_zoom_icon#size=128
  18 +zoom_in.png https://www.iconfinder.com/icons/106237/in_zoom_icon#size=128
  19 +camera.png https://www.iconfinder.com/icons/211634/camera_icon#size=128
  20 +home.png https://www.iconfinder.com/icons/183566/home_icon#size=128
16 21  
17 22  
18   -graySpecularHDR.dds https://github.com/sbtron/BabylonJS-glTFLoader/blob/master/src/images/graySpecularHDR.dds
19 23 \ No newline at end of file
  24 +graySpecularHDR.dds https://github.com/sbtron/BabylonJS-glTFLoader/blob/master/src/images/graySpecularHDR.dds
  25 +
  26 +terrace texture https://www.sketchuptextureclub.com/textures/architecture/wood-planks/wood-decking/laminated-beech-wood-decking-texture-seamless-09323
  27 +funky lines https://www.toptal.com/designers/subtlepatterns/funky-lines/
20 28 \ No newline at end of file
... ...
images/terrace_diamond_labeled.png

24.2 KB | W: | H:

24.2 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
images/terrace_l_shape_labeled.png

18.2 KB | W: | H:

18.2 KB | W: | H: