Changeset 2696:5c52fa11df28
- Timestamp:
- 03/04/14 14:31:53 (12 years ago)
- Branch:
- default
- Parents:
- 2695:0af47a71595a (diff), 2678:ef52d81a5941 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent. - Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
themes/berlin/style.css
r2673 r2696 886 886 border-radius: 0.5714286em; 887 887 padding: 0.5714286em 1.1428571em; 888 margin-bottom: 1.7142857em; } 888 margin-bottom: 1.7142857em; 889 clear: both; } 889 890 890 891 .post-info { … … 979 980 .post-feedback { 980 981 max-width: 42em; 981 margin: 3em auto; } 982 margin: 3em auto; 983 clear: both; } 982 984 983 985 .post-feedback h3 { -
themes/berlin/style.css
r2695 r2696 644 644 .site-title { 645 645 font-size: 1.8em; } } 646 #sidebar { 646 .footer__widgets { 647 padding: 1em; 648 background-color: white; 649 text-align: center; 650 line-height: 2; } 651 652 .blogcustom__title { 653 border: 0; 654 clip: rect(0 0 0 0); 655 height: 1px; 656 margin: -1px; 657 overflow: hidden; 658 padding: 0; 659 position: absolute; 660 width: 1px; } 661 662 .footer__widgets .widget { 663 margin-top: 1em; } 664 665 .footer__widgets h3 { 666 margin-bottom: 0; 667 font-size: 1em; 668 font-weight: bold; } 669 670 .footer__widgets ul { 671 margin: 0; 672 padding: 0; 673 border: 0; 674 overflow: hidden; 675 *zoom: 1; } 676 .footer__widgets ul li { 677 list-style-image: none; 678 list-style-type: none; 679 margin-left: 0; 680 display: -moz-inline-stack; 681 display: inline-block; 682 vertical-align: middle; 683 *vertical-align: auto; 684 zoom: 1; 685 *display: inline; 686 white-space: nowrap; 687 padding-left: 0.5em; 688 padding-right: 0.5em; } 689 690 .sidebar { 647 691 *zoom: 1; 648 692 padding-top: 2em; … … 650 694 color: white; 651 695 text-shadow: #373737 0px -1px 0px; } 652 #sidebar:after {696 .sidebar:after { 653 697 content: ""; 654 698 display: table; 655 699 clear: both; } 656 #sidebar a:link, #sidebar a:visited {700 .sidebar a:link, .sidebar a:visited { 657 701 color: #f9f9f9; 658 702 border: none; } 659 #sidebar a:hover, #sidebar a:focus, #sidebar a:active,660 #sidebar li:hover, #sidebar li:focus {703 .sidebar a:hover, .sidebar a:focus, .sidebar a:active, 704 .sidebar li:hover, .sidebar li:focus { 661 705 background-color: #d52125; } 662 706 663 #sidebar h2, #sidebar h3 { 707 .blognav__title, 708 .blogextra__title { 709 border: 0; 710 clip: rect(0 0 0 0); 711 height: 1px; 712 margin: -1px; 713 overflow: hidden; 714 padding: 0; 715 position: absolute; 716 width: 1px; } 717 718 .blognav__widgets h3, 719 .blognav__widgets h4, 720 .blogextra__widgets h3, 721 .blogextra__widgets h4 { 664 722 font-size: 1em; 665 723 color: white; 666 724 font-weight: bold; } 667 725 668 #sidebar h2 { 726 .blognav__widgets h3, 727 .blogextra__widgets h3 { 669 728 text-transform: uppercase; } 670 729 671 #sidebar h3 { 730 .blognav__widgets h4, 731 .blogextra__widgets h4 { 672 732 margin-top: 1.5em; 673 733 margin-bottom: 0; } 674 734 675 #blognav > div, #blogextra > div{735 .blognav__widgets .widget, .blogextra__widgets .widget { 676 736 padding: 1em; 677 737 font-size: .875em; 678 738 line-height: 1.71429; } 679 680 #blognav div > ul, #blogextra div > ul { 681 list-style: none; 682 padding-left: 0; 683 line-height: 2.28571; } 684 #blognav div > ul li, #blogextra div > ul li { 685 list-style-image: none; 686 list-style-type: none; 687 margin-left: 0; } 688 689 #blognav ul, #blogextra ul { 739 .blognav__widgets .widget > ul, .blogextra__widgets .widget > ul { 740 list-style: none; 741 padding-left: 0; } 742 .blognav__widgets .widget > ul li, .blogextra__widgets .widget > ul li { 743 list-style-image: none; 744 list-style-type: none; 745 margin-left: 0; } 746 747 .blognav__widgets ul, .blogextra__widgets ul { 690 748 margin: 0; } 691 #blognav li, #blogextrali {749 .blognav__widgets li, .blogextra__widgets li { 692 750 display: block; 693 padding -left: .25em;751 padding: .25em; 694 752 border-bottom: 1px solid gainsboro; } 695 #blognav li ul, #blogextrali ul {753 .blognav__widgets li ul, .blogextra__widgets li ul { 696 754 margin-left: -.25em; } 697 #blognav li li, #blogextrali li {755 .blognav__widgets li li, .blogextra__widgets li li { 698 756 border-top: 1px solid gainsboro; } 699 #blognav li li:last-child, #blogextrali li:last-child {757 .blognav__widgets li li:last-child, .blogextra__widgets li li:last-child { 700 758 border-bottom: none; } 701 759 … … 710 768 background-color: #373737; } 711 769 712 #sidebar li:hover ul {770 .sidebar li:hover ul { 713 771 background-color: #373737; } 714 772 715 773 @media screen and (min-width: 30.1em) and (max-width: 60em) { 716 #blognav div, #blogextra div{774 .blognav__widgets .widget, .blogextra__widgets .widget { 717 775 width: 50%; 718 776 float: left; } } 719 777 @media screen and (min-width: 60.1em) and (max-width: 80em) { 720 #blognav > div, #blogextra > div{778 .blognav__widgets .widget, .blogextra__widgets .widget { 721 779 width: 33.33%; 722 780 float: left; } } … … 1235 1293 display: none; } 1236 1294 1237 #sidebar, #main {1295 .sidebar, #main { 1238 1296 -webkit-transition: 0.3s all linear; 1239 1297 -moz-transition: 0.3s all linear; … … 1281 1339 position: relative; } 1282 1340 1283 .off-canvas #main {1341 .off-canvas #main, .footer.off-canvas { 1284 1342 float: left; 1285 1343 margin-left: -66.6666667%; } 1286 1344 1287 .off-canvas #sidebar {1345 .off-canvas .sidebar { 1288 1346 position: relative; 1289 1347 float: right;
Note: See TracChangeset
for help on using the changeset viewer.