git.iko.soy/urbit.org
on master help sign in
Resolving conflict from a453a1c9
commitdb9dfaa6aed7c4a2ac3038ec5a659a22c10fdac0 authorMatilde Park <matilde@tlon.io> dateFri 30 Aug 2019, 18:09 (7 years ago) parentf55ddfb
3 files changed+6−12
compare with master
unifiedsplit
sass/_main.scss+5−2 sass/primer.scss−9 templates/primer.html+1−1
sass/_main.scss+5−2
@@ -4,9 +4,12 @@
44// layout
55
66body {
7− @extend .sans, .grid12;
7+ @extend .sans;
8+ &:not(.primer) {
9+ @extend .grid12;
10+ margin: 0 32px;
11+ }
812 font-size: 1rem;
9− margin: 0 32px;
1013 color: #000;
1114}
1215
sass/primer.scss−9
@@ -13548,7 +13548,6 @@ must add span in markup to display icon
1354813548
1354913549/*Responsive Variables */
1355013550/*Responsive Spacing */
13551−
1355213551@media only screen and (max-width: 480px) {
1355313552 .sm-m-0 {
1355413553 margin: (0rem / 4); }
@@ -16751,14 +16750,6 @@ must add span in markup to display icon
1675116750 padding-top: (99rem / 4);
1675216751 padding-bottom: (99rem / 4); } }
1675316752
16754− @media only screen and (max-width: 330px) {
16755− .xs-mb-10 {
16756− margin-bottom: (10rem / 4);
16757− }
16758− .xs-mb-28 {
16759− margin-bottom: (28rem / 4);
16760− }
16761−}
1676216753/*Responsive Typography */
1676316754/** Responsive for Mobile **/
1676416755@media only screen and (max-width: 480px) {
templates/primer.html+1−1
@@ -24,7 +24,7 @@
2424 })();
2525 </script>
2626</head>
27−<body>
27+<body class="primer">
2828 <div class="bg-black pt-30 mb-30">
2929 <div class="primer-container white">
3030 <div class="row">