Skip to content

Commit a014593

Browse files
committed
General cleanup
1 parent 831b9c3 commit a014593

File tree

11 files changed

+19
-37
lines changed

11 files changed

+19
-37
lines changed

.gitignore

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
node_modules/
2-
build/
2+
build/
3+
dist/css/style.min.css
4+
dist/css/bootstrap.min.css

partials/_footer.ascx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<footer>
1+
<footer class="bg-light-grey">
22
<div class="container upper">
3-
<div class="row">
3+
<div class="row py-5">
44
<div id="FooterPaneOne" class="col-md-4" runat="server"></div>
55
<div id="FooterPaneTwo" class="col-md-4" runat="server"></div>
66
<div id="FooterPaneThree" class="col-md-4" runat="server"></div>

partials/_header.ascx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<header>
2-
<div class="container-fluid user-controls">
1+
<header class="bg-light-grey">
2+
<div class="container-fluid user-controls bg-tertiary">
33
<div class="container">
44
<div class="row justify-content-end">
55
<ul>

src/scss/_base.scss

+1-4
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,7 @@ body {
1919
-webkit-font-smoothing: antialiased;
2020
}
2121

22-
h1, h2, h3, {
23-
font-family: $open-sans;
24-
}
25-
h4, h5 {
22+
h1, h2, h3, h4, h5 {
2623
font-family: $open-sans;
2724
}
2825

src/scss/components/_components.scss

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
@import 'dnn';
22
@import 'buttons';
33
@import 'fonts';
4-
@import 'forms';
54
@import 'grid';
65
@import 'helpers';
76
@import 'nav';

src/scss/components/_dnn.scss

+1-2
Original file line numberDiff line numberDiff line change
@@ -3304,9 +3304,8 @@ div.actionMenu .dnn_mact {
33043304

33053305
/* On Page Editor */
33063306
.eipbackimg {
3307-
margin-top:-41px !important;
3308-
margin-left:-9px !important;
33093307
height:30px !important;
3308+
z-index:1250;
33103309

33113310
&.editMode {
33123311
border:none !important;

src/scss/components/_forms.scss

Whitespace-only changes.

src/scss/mixins/_mixins.scss

+5-8
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,20 @@
22
@return $num / ($num * 0 + 1);
33
}
44

5-
// REM Font-size with PX falleback
6-
// usage
7-
// @include font-size(13);
8-
// Output: font-size: 13px;
9-
// font-size: 1.3rem;
5+
// rem font-size with px fallback
6+
// usage: @include font-size(16)
107
@mixin font-size($sizeValue) {
118
font-size: $sizeValue + px;
129
font-size: ($sizeValue / 16) + rem;
1310
}
1411

15-
// Vertical rhythm
16-
// @include font-baseline(16,24);
12+
// vertical rhythm
13+
// usage: @include font-baseline(16,24);
1714
@mixin font-baseline($font-size, $lineheight){
1815
font-size: $font-size + px;
1916
font-size: ($font-size / $base-font-size ) + rem;
2017
line-height: ( $lineheight / $font-size / 1 );
21-
margin: 0 0 ( ($lineheight / $font-size * ( 1 / ( $lineheight / $defaultlineheight))) * .5em ) 0;
18+
margin: 0 0 ( ($lineheight / $font-size * ( 1 / ( $lineheight / $defaultlineheight))) * .5em ) 0;
2219
}
2320

2421
@mixin background-cover(){

src/scss/pages/_globals.scss

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
main div.container, main div.container-fluid {
2+
margin-bottom: 4rem;
3+
}

src/scss/sections/_footer.scss

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
footer {
2-
background-color:$light-grey;
32

43
.upper {
54
margin-bottom:0;
6-
padding-top:$ygutter;
7-
padding-bottom:$ygutter;
5+
86
}
97
a {
108
font-weight:400;
119
}
1210

1311
.disclaimer {
14-
font-size:12px;
12+
@include font-size(12);
1513
padding-top:1rem;
1614
padding-bottom:1rem;
1715
margin-bottom:0;

src/scss/sections/_header.scss

-13
Original file line numberDiff line numberDiff line change
@@ -1,13 +0,0 @@
1-
header {
2-
background-color:$light-grey;
3-
4-
.user-controls {
5-
background-color:$tertiary-color;
6-
}
7-
}
8-
9-
@include mq-max-width(576) {
10-
a#dnn_dnnLOGO_hypLogo {
11-
padding-left:0;
12-
}
13-
}

0 commit comments

Comments
 (0)