on master help sign in
Resolving conflict from a453a1c9
db9dfaaMatilde Park
sass/_main.scss+5−2
@@ -4,9 +4,12 @@
4// layout
4// layout
5
5
6body {
6body {
7− @extend .sans, .grid12;
7+ @extend .sans;
8+ &:not(.primer) {
9+ @extend .grid12;
10+ margin: 0 32px;
11+ }
8 font-size: 1rem;
12 font-size: 1rem;
9− margin: 0 32px;
10 color: #000;
13 color: #000;
11}
14}
12
15
sass/primer.scss−9
@@ -13548,7 +13548,6 @@ must add span in markup to display icon
13548
13548
13549/*Responsive Variables */
13549/*Responsive Variables */
13550/*Responsive Spacing */
13550/*Responsive Spacing */
13551−
13552@media only screen and (max-width: 480px) {
13551@media only screen and (max-width: 480px) {
13553 .sm-m-0 {
13552 .sm-m-0 {
13554 margin: (0rem / 4); }
13553 margin: (0rem / 4); }
@@ -16751,14 +16750,6 @@ must add span in markup to display icon
16751 padding-top: (99rem / 4);
16750 padding-top: (99rem / 4);
16752 padding-bottom: (99rem / 4); } }
16751 padding-bottom: (99rem / 4); } }
16753
16752
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−}
16762/*Responsive Typography */
16753/*Responsive Typography */
16763/** Responsive for Mobile **/
16754/** Responsive for Mobile **/
16764@media only screen and (max-width: 480px) {
16755@media only screen and (max-width: 480px) {
templates/primer.html+1−1
@@ -24,7 +24,7 @@
24 })();
24 })();
25 </script>
25 </script>
26</head>
26</head>
27−<body>
27+<body class="primer">
28 <div class="bg-black pt-30 mb-30">
28 <div class="bg-black pt-30 mb-30">
29 <div class="primer-container white">
29 <div class="primer-container white">
30 <div class="row">
30 <div class="row">