Skip to content

Commit 549e5a4

Browse files
Alban BaillyGitHub Enterprise
authored andcommitted
Merge pull request linode#10 from abailly/changes-for-base-theme-ready
WIP - changes for base theme ready
2 parents 0bef5d2 + c543ece commit 549e5a4

File tree

5 files changed

+46
-114
lines changed

5 files changed

+46
-114
lines changed

themes/dlc/gulpfile.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ class TailwindExtractor {
2626

2727
const plugins = [
2828
atImport,
29+
tailwindcss('../linode-hugo-base-theme/tailwind.js'),
2930
tailwindcss('./tailwind.js'),
3031
autoprefixer({
3132
browsers: ['last 2 versions', '> 2%']

themes/dlc/layouts/_default/baseof.html

Lines changed: 0 additions & 42 deletions
This file was deleted.

themes/dlc/layouts/partials/3_organisms/footer-nav.html

Lines changed: 0 additions & 60 deletions
This file was deleted.

themes/dlc/static/assets/css/main.css

Lines changed: 43 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ html {
381381
h1,
382382
h2,
383383
h3,
384-
h5,
384+
h4,
385385
p {
386386
margin: 0;
387387
}
@@ -488,6 +488,12 @@ button,
488488
width: 100%;
489489
}
490490

491+
@media (min-width: 400px) {
492+
.container {
493+
max-width: 400px;
494+
}
495+
}
496+
491497
@media (min-width: 576px) {
492498
.container {
493499
max-width: 576px;
@@ -512,8 +518,17 @@ button,
512518
}
513519
}
514520

521+
.list-reset {
522+
list-style: none;
523+
padding: 0;
524+
}
525+
526+
.bg-l-full-black {
527+
background-color: #000;
528+
}
529+
515530
.bg-black {
516-
background-color: #22292f;
531+
background-color: #161616;
517532
}
518533

519534
.bg-light-black {
@@ -572,12 +587,6 @@ button,
572587
justify-content: space-between;
573588
}
574589

575-
.flex-1 {
576-
-webkit-box-flex: 1;
577-
-ms-flex: 1;
578-
flex: 1;
579-
}
580-
581590
.h-12 {
582591
height: 3rem;
583592
}
@@ -604,6 +613,10 @@ button,
604613
margin-right: .5rem;
605614
}
606615

616+
.mb-2 {
617+
margin-bottom: .5rem;
618+
}
619+
607620
.ml-2 {
608621
margin-left: .5rem;
609622
}
@@ -685,6 +698,10 @@ button,
685698
color: #fff;
686699
}
687700

701+
.text-sm {
702+
font-size: .875rem;
703+
}
704+
688705
.text-xl {
689706
font-size: 1.25rem;
690707
}
@@ -746,7 +763,7 @@ body {
746763
h1,
747764
h2,
748765
h3,
749-
h5 {
766+
h4 {
750767
font-family: Lato, sans-serif;
751768
font-weight: var(--heading-font-weight);
752769
line-height: var(--heading-line-height);
@@ -777,8 +794,8 @@ h3 {
777794
font-size: var(--h3);
778795
}
779796

780-
h5 {
781-
font-size: var(--h5);
797+
h4 {
798+
font-size: var(--h4);
782799
}
783800

784801
a {
@@ -815,6 +832,10 @@ a.active {
815832
width: 150px;
816833
}
817834

835+
.footer-nav a {
836+
color: #fff;
837+
}
838+
818839
.menu-icon {
819840
position: absolute;
820841
right: 2rem;
@@ -930,12 +951,23 @@ a.active {
930951
width: fit-content;
931952
}
932953

954+
@media (min-width: 400px) {
955+
956+
.xs\:w-1\/2 {
957+
width: 50%;
958+
}
959+
}
960+
933961
@media (min-width: 768px) {
934962

935963
.md\:mb-8 {
936964
margin-bottom: 2rem;
937965
}
938966

967+
.md\:w-auto {
968+
width: auto;
969+
}
970+
939971
.md\:w-1\/2 {
940972
width: 50%;
941973
}

themes/dlc/tailwind.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ let colors = {
5151
// Standard Colors
5252
'transparent': 'transparent',
5353

54-
'black': '#22292f',
54+
'black': '#161616',
5555
'light-black': '#323232',
5656
'grey-darkest': '#3d4852',
5757
'grey-darker': '#606f7b',
@@ -173,6 +173,7 @@ module.exports = {
173173
*/
174174

175175
screens: {
176+
'xs': '400px',
176177
'sm': '576px',
177178
'md': '768px',
178179
'lg': '992px',

0 commit comments

Comments
 (0)