diff options
author | tcit <tcit@tcit.fr> | 2014-10-31 18:48:02 +0100 |
---|---|---|
committer | tcit <tcit@tcit.fr> | 2014-10-31 18:48:02 +0100 |
commit | 9cf370cfb683deebf8b479bc2ee976d5ac93be00 (patch) | |
tree | 5813f84ccfa8c4458dff69562f577b8e26b4902e /themes/baggy/css/main.css | |
parent | 224528f1debb06b40524fd84ed9a324c0b6131e2 (diff) | |
parent | ccaefcf69a5e2e9404a40b7377fbdfe9627c0320 (diff) | |
download | wallabag-9cf370cfb683deebf8b479bc2ee976d5ac93be00.tar.gz wallabag-9cf370cfb683deebf8b479bc2ee976d5ac93be00.tar.zst wallabag-9cf370cfb683deebf8b479bc2ee976d5ac93be00.zip |
Merge branch 'jsit-duplicateformstyles' into dev
Diffstat (limited to 'themes/baggy/css/main.css')
-rwxr-xr-x | themes/baggy/css/main.css | 65 |
1 files changed, 14 insertions, 51 deletions
diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css index 4e3404c1..93294359 100755 --- a/themes/baggy/css/main.css +++ b/themes/baggy/css/main.css | |||
@@ -540,7 +540,7 @@ footer a { | |||
540 | 2.1 = "save a link" related styles | 540 | 2.1 = "save a link" related styles |
541 | ========================================================================== */ | 541 | ========================================================================== */ |
542 | 542 | ||
543 | #bagit-form, #search-form { | 543 | .popup-form { |
544 | background: rgba(0,0,0,0.5); | 544 | background: rgba(0,0,0,0.5); |
545 | position: absolute; | 545 | position: absolute; |
546 | top: 0; | 546 | top: 0; |
@@ -549,24 +549,23 @@ footer a { | |||
549 | height: 100%; | 549 | height: 100%; |
550 | width: 100%; | 550 | width: 100%; |
551 | margin: 0; | 551 | margin: 0; |
552 | margin-top: -30%; | 552 | margin-top: -30% !important; /* TODO: get rid of !important here; overridden by .messages selector */ |
553 | padding: 2em; | 553 | padding: 2em; |
554 | display: none; | 554 | display: none; |
555 | border-left: 1px #EEE solid; | 555 | border-left: 1px #EEE solid; |
556 | } | 556 | } |
557 | 557 | ||
558 | #bagit-form form, #search-form form { | 558 | .popup-form form { |
559 | background: #FFF; | 559 | background: #FFF; |
560 | position: absolute; | 560 | position: absolute; |
561 | top: 0; | 561 | top: 0; |
562 | left: 0; | 562 | left: 0; |
563 | z-index: 20; | 563 | z-index: 20; |
564 | border: 10px solid #000; | 564 | border: 10px solid #000; |
565 | width: 400px; | 565 | width: 400px; |
566 | height: 200px; | 566 | height: 200px; |
567 | /* margin: -150px 0 0 -300px; */ | 567 | padding: 2em; |
568 | padding: 2em; | 568 | } |
569 | } | ||
570 | 569 | ||
571 | #bagit-form-form .addurl { | 570 | #bagit-form-form .addurl { |
572 | margin-left: 0; | 571 | margin-left: 0; |
@@ -651,42 +650,6 @@ a.add-to-wallabag-link-after:after { | |||
651 | } | 650 | } |
652 | 651 | ||
653 | /* ========================================================================== | 652 | /* ========================================================================== |
654 | 2.2 = "search for articles" popup div related styles | ||
655 | ========================================================================== */ | ||
656 | #search-form { | ||
657 | background: rgba(0,0,0,0.5); | ||
658 | position: absolute; | ||
659 | top: 0; | ||
660 | left: 10em; | ||
661 | z-index: 20; | ||
662 | height: 100%; | ||
663 | width: 100%; | ||
664 | margin: 0; | ||
665 | margin-top: -30%; | ||
666 | padding: 2em; | ||
667 | display: none; | ||
668 | border-left: 1px #EEE solid; | ||
669 | } | ||
670 | |||
671 | #search-form form { | ||
672 | background: #FFF; | ||
673 | position: absolute; | ||
674 | top: 0; | ||
675 | left: 0; | ||
676 | z-index: 20; | ||
677 | border: 10px solid #000; | ||
678 | width: 400px; | ||
679 | height: 200px; | ||
680 | /* margin: -150px 0 0 -300px; */ | ||
681 | padding: 2em; | ||
682 | } | ||
683 | |||
684 | #submit-search{ | ||
685 | margin-left: 4em; | ||
686 | margin-top:1em; | ||
687 | } | ||
688 | |||
689 | /* ========================================================================== | ||
690 | 3 = Pictos | 653 | 3 = Pictos |
691 | ========================================================================== */ | 654 | ========================================================================== */ |
692 | 655 | ||
@@ -1053,7 +1016,7 @@ pre code { | |||
1053 | display: none; | 1016 | display: none; |
1054 | } | 1017 | } |
1055 | 1018 | ||
1056 | .popup-form, #bagit-form, #search-form { | 1019 | .popup-form { |
1057 | left: 0; | 1020 | left: 0; |
1058 | width: 100%; | 1021 | width: 100%; |
1059 | border-left: none; | 1022 | border-left: none; |